From 2089b51829ceca6aada08eae925a3050671313db Mon Sep 17 00:00:00 2001 From: Alex Oleshkevich Date: Wed, 27 Apr 2016 19:33:29 +0300 Subject: [PATCH 01/35] Update ZDT for use with modern ZF components --- composer.json | 18 ++++++------- .../EventLoggingListenerAggregate.php | 13 ++++----- .../Listener/FirePhpListener.php | 2 +- .../Listener/FlushListener.php | 2 +- .../Listener/ProfilerListener.php | 2 +- .../Listener/StorageListener.php | 2 +- .../Listener/ToolbarListener.php | 10 +++---- src/ZendDeveloperTools/Module.php | 27 ++++++++++++++++--- src/ZendDeveloperTools/Profiler.php | 4 ++- 9 files changed, 49 insertions(+), 31 deletions(-) diff --git a/composer.json b/composer.json index 3e0a255..d66e5c5 100644 --- a/composer.json +++ b/composer.json @@ -22,15 +22,15 @@ } ], "require": { - "php": ">=5.3.3", - "zendframework/zend-mvc": "2.*", - "zendframework/zend-eventmanager": "2.*", - "zendframework/zend-stdlib": "2.*", - "zendframework/zend-servicemanager": "2.*", - "zendframework/zend-modulemanager": "2.*", - "zendframework/zend-version": "2.*", - "zendframework/zend-debug": "2.*", - "zendframework/zend-view": "2.*" + "php": "^5.5 || ^7.0", + "zendframework/zend-mvc": "^2.7", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-modulemanager": "^2.7", + "zendframework/zend-version": "^2.5", + "zendframework/zend-debug": "^2.5 || ^3.0", + "zendframework/zend-view": "^2.6" }, "require-dev": { "phpunit/phpunit": "~4" diff --git a/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php b/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php index 57b5ae0..9eba555 100644 --- a/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php +++ b/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php @@ -11,9 +11,8 @@ use Zend\EventManager\Event; use Zend\EventManager\SharedEventManagerInterface; -use Zend\EventManager\SharedListenerAggregateInterface; -use Zend\ServiceManager\Exception\ServiceNotFoundException; use ZendDeveloperTools\Collector\CollectorInterface; +use ZendDeveloperTools\Collector\EventCollectorInterface; use ZendDeveloperTools\Profiler; /** @@ -22,10 +21,10 @@ * @author Mark Garrett * @since 0.0.3 */ -class EventLoggingListenerAggregate implements SharedListenerAggregateInterface +class EventLoggingListenerAggregate { /** - * @var \ZendDeveloperTools\Collector\EventCollectorInterface[] + * @var EventCollectorInterface[] */ protected $collectors; @@ -37,7 +36,7 @@ class EventLoggingListenerAggregate implements SharedListenerAggregateInterface /** * Constructor. * - * @param \ZendDeveloperTools\Collector\EventCollectorInterface[] $collectors + * @param EventCollectorInterface[] $collectors * @param string[] $identifiers */ public function __construct(array $collectors, array $identifiers) @@ -61,7 +60,9 @@ function ($identifier) { */ public function attachShared(SharedEventManagerInterface $events) { - $events->attach($this->identifiers, '*', array($this,'onCollectEvent'), Profiler::PRIORITY_EVENT_COLLECTOR); + foreach ($this->identifiers as $id) { + $events->attach($id, '*', array($this,'onCollectEvent'), Profiler::PRIORITY_EVENT_COLLECTOR); + } } /** diff --git a/src/ZendDeveloperTools/Listener/FirePhpListener.php b/src/ZendDeveloperTools/Listener/FirePhpListener.php index f121670..dbf19c9 100644 --- a/src/ZendDeveloperTools/Listener/FirePhpListener.php +++ b/src/ZendDeveloperTools/Listener/FirePhpListener.php @@ -44,7 +44,7 @@ public function __construct(ServiceLocatorInterface $serviceLocator) /** * {@inheritdoc} */ - public function attach(EventManagerInterface $events) + public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( ProfilerEvent::EVENT_COLLECTED, diff --git a/src/ZendDeveloperTools/Listener/FlushListener.php b/src/ZendDeveloperTools/Listener/FlushListener.php index 1886508..e2c9a38 100644 --- a/src/ZendDeveloperTools/Listener/FlushListener.php +++ b/src/ZendDeveloperTools/Listener/FlushListener.php @@ -31,7 +31,7 @@ class FlushListener implements ListenerAggregateInterface /** * {@inheritdoc} */ - public function attach(EventManagerInterface $events) + public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( MvcEvent::EVENT_FINISH, diff --git a/src/ZendDeveloperTools/Listener/ProfilerListener.php b/src/ZendDeveloperTools/Listener/ProfilerListener.php index e8fd301..3c02d90 100644 --- a/src/ZendDeveloperTools/Listener/ProfilerListener.php +++ b/src/ZendDeveloperTools/Listener/ProfilerListener.php @@ -55,7 +55,7 @@ public function __construct(ServiceLocatorInterface $serviceLocator, Options $op /** * {@inheritdoc} */ - public function attach(EventManagerInterface $events) + public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( MvcEvent::EVENT_FINISH, diff --git a/src/ZendDeveloperTools/Listener/StorageListener.php b/src/ZendDeveloperTools/Listener/StorageListener.php index 78b0ae9..3cc8c1a 100644 --- a/src/ZendDeveloperTools/Listener/StorageListener.php +++ b/src/ZendDeveloperTools/Listener/StorageListener.php @@ -44,7 +44,7 @@ public function __construct(ServiceLocatorInterface $serviceLocator) /** * {@inheritdoc} */ - public function attach(EventManagerInterface $events) + public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( ProfilerEvent::EVENT_COLLECTED, diff --git a/src/ZendDeveloperTools/Listener/ToolbarListener.php b/src/ZendDeveloperTools/Listener/ToolbarListener.php index b665ceb..034223f 100644 --- a/src/ZendDeveloperTools/Listener/ToolbarListener.php +++ b/src/ZendDeveloperTools/Listener/ToolbarListener.php @@ -89,15 +89,11 @@ public function __construct($viewRenderer, Options $options) /** * {@inheritdoc} */ - public function attach(EventManagerInterface $events) + public function attach(EventManagerInterface $events, $priority = 1) { - $this->listeners[] = $events->attach( - ProfilerEvent::EVENT_COLLECTED, - array($this, 'onCollected'), - Profiler::PRIORITY_TOOLBAR - ); + $this->listeners[] = $events->getSharedManager()->attach('profiler', ProfilerEvent::EVENT_COLLECTED, array($this, 'onCollected'), Profiler::PRIORITY_TOOLBAR); } - + /** * {@inheritdoc} */ diff --git a/src/ZendDeveloperTools/Module.php b/src/ZendDeveloperTools/Module.php index 12f5029..cc75943 100644 --- a/src/ZendDeveloperTools/Module.php +++ b/src/ZendDeveloperTools/Module.php @@ -91,7 +91,8 @@ public function onBootstrap(EventInterface $event) $report = $sm->get('ZendDeveloperTools\Report'); if ($options->canFlushEarly()) { - $em->attachAggregate($sm->get('ZendDeveloperTools\FlushListener')); + $flushListener = $sm->get('ZendDeveloperTools\FlushListener'); + $flushListener->attach($em); } if ($options->isStrict() && $report->hasErrors()) { @@ -99,13 +100,16 @@ public function onBootstrap(EventInterface $event) } if ($options->eventCollectionEnabled()) { - $sem->attachAggregate($sm->get('ZendDeveloperTools\EventLoggingListenerAggregate')); + $eventLoggingListener = $sm->get('ZendDeveloperTools\EventLoggingListenerAggregate'); + $eventLoggingListener->attachShared($sem); } - $em->attachAggregate($sm->get('ZendDeveloperTools\ProfilerListener')); + $profilerListener = $sm->get('ZendDeveloperTools\ProfilerListener'); + $profilerListener->attach($em); if ($options->isToolbarEnabled()) { - $sem->attach('profiler', $sm->get('ZendDeveloperTools\ToolbarListener'), null); + $toolbarListener = $sm->get('ZendDeveloperTools\ToolbarListener'); + $toolbarListener->attach($em); } if ($options->isStrict() && $report->hasErrors()) { @@ -213,4 +217,19 @@ public function getServiceConfig() ), ); } + + /** + * + * @return array + */ + public function getAutoloaderConfig() + { + return array( + 'Zend\Loader\StandardAutoloader' => array( + 'namespaces' => array( + __NAMESPACE__ => __DIR__, + ), + ), + ); + } } diff --git a/src/ZendDeveloperTools/Profiler.php b/src/ZendDeveloperTools/Profiler.php index 86f4902..4224c80 100644 --- a/src/ZendDeveloperTools/Profiler.php +++ b/src/ZendDeveloperTools/Profiler.php @@ -212,7 +212,9 @@ public function collect(MvcEvent $mvcEvent) $this->report->addCollector($collector); } - $this->eventManager->trigger(ProfilerEvent::EVENT_COLLECTED, $this->getEvent()); + $event = $this->getEvent(); + $event->setName(ProfilerEvent::EVENT_COLLECTED); + $this->eventManager->triggerEvent($event); return $this; } From 07fc76c329e7957da24eab75868d16b7c964a226 Mon Sep 17 00:00:00 2001 From: Alex Oleshkevich Date: Wed, 27 Apr 2016 19:38:58 +0300 Subject: [PATCH 02/35] use PSR4 autoloader --- composer.json | 18 ++++++------- phpunit.xml | 22 +++++++++++++++ .../EventLoggingListenerAggregate.php | 13 ++++----- .../Listener/FirePhpListener.php | 2 +- .../Listener/FlushListener.php | 2 +- .../Listener/ProfilerListener.php | 2 +- .../Listener/StorageListener.php | 2 +- .../Listener/ToolbarListener.php | 10 +++---- src/ZendDeveloperTools/Module.php | 27 ++++++++++++++++--- src/ZendDeveloperTools/Profiler.php | 4 ++- 10 files changed, 71 insertions(+), 31 deletions(-) create mode 100644 phpunit.xml diff --git a/composer.json b/composer.json index 3e0a255..d66e5c5 100644 --- a/composer.json +++ b/composer.json @@ -22,15 +22,15 @@ } ], "require": { - "php": ">=5.3.3", - "zendframework/zend-mvc": "2.*", - "zendframework/zend-eventmanager": "2.*", - "zendframework/zend-stdlib": "2.*", - "zendframework/zend-servicemanager": "2.*", - "zendframework/zend-modulemanager": "2.*", - "zendframework/zend-version": "2.*", - "zendframework/zend-debug": "2.*", - "zendframework/zend-view": "2.*" + "php": "^5.5 || ^7.0", + "zendframework/zend-mvc": "^2.7", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-modulemanager": "^2.7", + "zendframework/zend-version": "^2.5", + "zendframework/zend-debug": "^2.5 || ^3.0", + "zendframework/zend-view": "^2.6" }, "require-dev": { "phpunit/phpunit": "~4" diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 0000000..f703ddb --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,22 @@ + + + + ./tests + + + + ./src + + + diff --git a/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php b/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php index 57b5ae0..9eba555 100644 --- a/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php +++ b/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php @@ -11,9 +11,8 @@ use Zend\EventManager\Event; use Zend\EventManager\SharedEventManagerInterface; -use Zend\EventManager\SharedListenerAggregateInterface; -use Zend\ServiceManager\Exception\ServiceNotFoundException; use ZendDeveloperTools\Collector\CollectorInterface; +use ZendDeveloperTools\Collector\EventCollectorInterface; use ZendDeveloperTools\Profiler; /** @@ -22,10 +21,10 @@ * @author Mark Garrett * @since 0.0.3 */ -class EventLoggingListenerAggregate implements SharedListenerAggregateInterface +class EventLoggingListenerAggregate { /** - * @var \ZendDeveloperTools\Collector\EventCollectorInterface[] + * @var EventCollectorInterface[] */ protected $collectors; @@ -37,7 +36,7 @@ class EventLoggingListenerAggregate implements SharedListenerAggregateInterface /** * Constructor. * - * @param \ZendDeveloperTools\Collector\EventCollectorInterface[] $collectors + * @param EventCollectorInterface[] $collectors * @param string[] $identifiers */ public function __construct(array $collectors, array $identifiers) @@ -61,7 +60,9 @@ function ($identifier) { */ public function attachShared(SharedEventManagerInterface $events) { - $events->attach($this->identifiers, '*', array($this,'onCollectEvent'), Profiler::PRIORITY_EVENT_COLLECTOR); + foreach ($this->identifiers as $id) { + $events->attach($id, '*', array($this,'onCollectEvent'), Profiler::PRIORITY_EVENT_COLLECTOR); + } } /** diff --git a/src/ZendDeveloperTools/Listener/FirePhpListener.php b/src/ZendDeveloperTools/Listener/FirePhpListener.php index f121670..dbf19c9 100644 --- a/src/ZendDeveloperTools/Listener/FirePhpListener.php +++ b/src/ZendDeveloperTools/Listener/FirePhpListener.php @@ -44,7 +44,7 @@ public function __construct(ServiceLocatorInterface $serviceLocator) /** * {@inheritdoc} */ - public function attach(EventManagerInterface $events) + public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( ProfilerEvent::EVENT_COLLECTED, diff --git a/src/ZendDeveloperTools/Listener/FlushListener.php b/src/ZendDeveloperTools/Listener/FlushListener.php index 1886508..e2c9a38 100644 --- a/src/ZendDeveloperTools/Listener/FlushListener.php +++ b/src/ZendDeveloperTools/Listener/FlushListener.php @@ -31,7 +31,7 @@ class FlushListener implements ListenerAggregateInterface /** * {@inheritdoc} */ - public function attach(EventManagerInterface $events) + public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( MvcEvent::EVENT_FINISH, diff --git a/src/ZendDeveloperTools/Listener/ProfilerListener.php b/src/ZendDeveloperTools/Listener/ProfilerListener.php index e8fd301..3c02d90 100644 --- a/src/ZendDeveloperTools/Listener/ProfilerListener.php +++ b/src/ZendDeveloperTools/Listener/ProfilerListener.php @@ -55,7 +55,7 @@ public function __construct(ServiceLocatorInterface $serviceLocator, Options $op /** * {@inheritdoc} */ - public function attach(EventManagerInterface $events) + public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( MvcEvent::EVENT_FINISH, diff --git a/src/ZendDeveloperTools/Listener/StorageListener.php b/src/ZendDeveloperTools/Listener/StorageListener.php index 78b0ae9..3cc8c1a 100644 --- a/src/ZendDeveloperTools/Listener/StorageListener.php +++ b/src/ZendDeveloperTools/Listener/StorageListener.php @@ -44,7 +44,7 @@ public function __construct(ServiceLocatorInterface $serviceLocator) /** * {@inheritdoc} */ - public function attach(EventManagerInterface $events) + public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( ProfilerEvent::EVENT_COLLECTED, diff --git a/src/ZendDeveloperTools/Listener/ToolbarListener.php b/src/ZendDeveloperTools/Listener/ToolbarListener.php index b665ceb..034223f 100644 --- a/src/ZendDeveloperTools/Listener/ToolbarListener.php +++ b/src/ZendDeveloperTools/Listener/ToolbarListener.php @@ -89,15 +89,11 @@ public function __construct($viewRenderer, Options $options) /** * {@inheritdoc} */ - public function attach(EventManagerInterface $events) + public function attach(EventManagerInterface $events, $priority = 1) { - $this->listeners[] = $events->attach( - ProfilerEvent::EVENT_COLLECTED, - array($this, 'onCollected'), - Profiler::PRIORITY_TOOLBAR - ); + $this->listeners[] = $events->getSharedManager()->attach('profiler', ProfilerEvent::EVENT_COLLECTED, array($this, 'onCollected'), Profiler::PRIORITY_TOOLBAR); } - + /** * {@inheritdoc} */ diff --git a/src/ZendDeveloperTools/Module.php b/src/ZendDeveloperTools/Module.php index 12f5029..cc75943 100644 --- a/src/ZendDeveloperTools/Module.php +++ b/src/ZendDeveloperTools/Module.php @@ -91,7 +91,8 @@ public function onBootstrap(EventInterface $event) $report = $sm->get('ZendDeveloperTools\Report'); if ($options->canFlushEarly()) { - $em->attachAggregate($sm->get('ZendDeveloperTools\FlushListener')); + $flushListener = $sm->get('ZendDeveloperTools\FlushListener'); + $flushListener->attach($em); } if ($options->isStrict() && $report->hasErrors()) { @@ -99,13 +100,16 @@ public function onBootstrap(EventInterface $event) } if ($options->eventCollectionEnabled()) { - $sem->attachAggregate($sm->get('ZendDeveloperTools\EventLoggingListenerAggregate')); + $eventLoggingListener = $sm->get('ZendDeveloperTools\EventLoggingListenerAggregate'); + $eventLoggingListener->attachShared($sem); } - $em->attachAggregate($sm->get('ZendDeveloperTools\ProfilerListener')); + $profilerListener = $sm->get('ZendDeveloperTools\ProfilerListener'); + $profilerListener->attach($em); if ($options->isToolbarEnabled()) { - $sem->attach('profiler', $sm->get('ZendDeveloperTools\ToolbarListener'), null); + $toolbarListener = $sm->get('ZendDeveloperTools\ToolbarListener'); + $toolbarListener->attach($em); } if ($options->isStrict() && $report->hasErrors()) { @@ -213,4 +217,19 @@ public function getServiceConfig() ), ); } + + /** + * + * @return array + */ + public function getAutoloaderConfig() + { + return array( + 'Zend\Loader\StandardAutoloader' => array( + 'namespaces' => array( + __NAMESPACE__ => __DIR__, + ), + ), + ); + } } diff --git a/src/ZendDeveloperTools/Profiler.php b/src/ZendDeveloperTools/Profiler.php index 86f4902..4224c80 100644 --- a/src/ZendDeveloperTools/Profiler.php +++ b/src/ZendDeveloperTools/Profiler.php @@ -212,7 +212,9 @@ public function collect(MvcEvent $mvcEvent) $this->report->addCollector($collector); } - $this->eventManager->trigger(ProfilerEvent::EVENT_COLLECTED, $this->getEvent()); + $event = $this->getEvent(); + $event->setName(ProfilerEvent::EVENT_COLLECTED); + $this->eventManager->triggerEvent($event); return $this; } From 183d6e8eb52f32078c4ea20852df99fa735c3d7d Mon Sep 17 00:00:00 2001 From: Alex Oleshkevich Date: Wed, 27 Apr 2016 19:52:45 +0300 Subject: [PATCH 03/35] Remove phpunit.xml --- phpunit.xml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 phpunit.xml diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index f703ddb..0000000 --- a/phpunit.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - ./tests - - - - ./src - - - From f2dc619d71a2aacc532ebfcd31d0b2950b4e5255 Mon Sep 17 00:00:00 2001 From: Alex Oleshkevich Date: Wed, 27 Apr 2016 20:24:09 +0300 Subject: [PATCH 04/35] remove 5.3 and 5.4 versions of php from travis --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb19a13..f744004 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: php php: - - 5.3.3 - - 5.4 - 5.5 - 5.6 - 7 From bf4d652e4576bc9c62709cf8e62d25605bdfd08d Mon Sep 17 00:00:00 2001 From: Alex Oleshkevich Date: Wed, 4 May 2016 21:49:23 +0300 Subject: [PATCH 05/35] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d66e5c5..464a16f 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ ], "require": { "php": "^5.5 || ^7.0", - "zendframework/zend-mvc": "^2.7", + "zendframework/zend-mvc": "^2.7 || ^3.0.0@dev", "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", "zendframework/zend-stdlib": "^2.7 || ^3.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", From e063b7d2b0ffc141bd6a4e19eb1e053e09ed8fee Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 02:41:29 +0700 Subject: [PATCH 06/35] remove Module::getAutoloaderConfig() as https://github.com/zendframework/ZendDeveloperTools/pull/210#issuecomment-228249318 --- src/ZendDeveloperTools/Module.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/ZendDeveloperTools/Module.php b/src/ZendDeveloperTools/Module.php index cc75943..20bfdc4 100644 --- a/src/ZendDeveloperTools/Module.php +++ b/src/ZendDeveloperTools/Module.php @@ -217,19 +217,4 @@ public function getServiceConfig() ), ); } - - /** - * - * @return array - */ - public function getAutoloaderConfig() - { - return array( - 'Zend\Loader\StandardAutoloader' => array( - 'namespaces' => array( - __NAMESPACE__ => __DIR__, - ), - ), - ); - } } From 9aaca7d4167d4cbd0f062ce41027b8ec9f57d9ae Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 02:42:12 +0700 Subject: [PATCH 07/35] update zend-mvc dependency --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 464a16f..8d760ce 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ ], "require": { "php": "^5.5 || ^7.0", - "zendframework/zend-mvc": "^2.7 || ^3.0.0@dev", + "zendframework/zend-mvc": "^2.7 || ^3.0.1", "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", "zendframework/zend-stdlib": "^2.7 || ^3.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", From 3125403fd4630ee03b582d9e065e8166f57ae329 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 13:20:04 +0700 Subject: [PATCH 08/35] short array syntax --- .../Collector/ConfigCollector.php | 6 +-- .../Collector/ExceptionCollector.php | 4 +- .../Collector/MemoryCollector.php | 6 +-- .../Collector/RequestCollector.php | 10 ++--- .../Collector/TimeCollector.php | 6 +-- .../EventLogging/EventContextProvider.php | 2 +- .../Exception/SerializableException.php | 34 ++++++++--------- .../EventLoggingListenerAggregate.php | 2 +- .../Listener/FirePhpListener.php | 4 +- .../Listener/FlushListener.php | 6 +-- .../Listener/ProfilerListener.php | 4 +- .../Listener/StorageListener.php | 4 +- .../Listener/ToolbarListener.php | 38 +++++++++---------- src/ZendDeveloperTools/Module.php | 28 +++++++------- src/ZendDeveloperTools/Options.php | 30 +++++++-------- src/ZendDeveloperTools/Profiler.php | 2 +- src/ZendDeveloperTools/Report.php | 6 +-- .../View/Helper/DetailArray.php | 2 +- 18 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/ZendDeveloperTools/Collector/ConfigCollector.php b/src/ZendDeveloperTools/Collector/ConfigCollector.php index 147c150..6c56a34 100644 --- a/src/ZendDeveloperTools/Collector/ConfigCollector.php +++ b/src/ZendDeveloperTools/Collector/ConfigCollector.php @@ -91,7 +91,7 @@ public function getApplicationConfig() */ public function serialize() { - return serialize(array('config' => $this->config, 'applicationConfig' => $this->applicationConfig)); + return serialize(['config' => $this->config, 'applicationConfig' => $this->applicationConfig]); } /** @@ -113,7 +113,7 @@ public function unserialize($serialized) */ private function makeArraySerializable($data) { - $serializable = array(); + $serializable = []; foreach (ArrayUtils::iteratorToArray($data) as $key => $value) { if ($value instanceof Traversable || is_array($value)) { @@ -143,7 +143,7 @@ private function makeArraySerializable($data) */ private function unserializeArray(array $data) { - $unserialized = array(); + $unserialized = []; foreach (ArrayUtils::iteratorToArray($data) as $key => $value) { if ($value instanceof Traversable || is_array($value)) { diff --git a/src/ZendDeveloperTools/Collector/ExceptionCollector.php b/src/ZendDeveloperTools/Collector/ExceptionCollector.php index 8a846ad..16e8628 100644 --- a/src/ZendDeveloperTools/Collector/ExceptionCollector.php +++ b/src/ZendDeveloperTools/Collector/ExceptionCollector.php @@ -41,9 +41,9 @@ public function getPriority() public function collect(MvcEvent $mvcEvent) { if ($mvcEvent->getError() === Application::ERROR_EXCEPTION) { - $this->data = array( + $this->data = [ 'exception' => new SerializableException($mvcEvent->getParam('exception')) - ); + ]; } } diff --git a/src/ZendDeveloperTools/Collector/MemoryCollector.php b/src/ZendDeveloperTools/Collector/MemoryCollector.php index c968f63..c3a65ae 100644 --- a/src/ZendDeveloperTools/Collector/MemoryCollector.php +++ b/src/ZendDeveloperTools/Collector/MemoryCollector.php @@ -39,7 +39,7 @@ public function getPriority() public function collect(MvcEvent $mvcEvent) { if (!isset($this->data)) { - $this->data = array(); + $this->data = []; } $this->data['memory'] = memory_get_peak_usage(true); @@ -62,7 +62,7 @@ public function collectEvent($id, Event $event) $context['memory'] = memory_get_usage(true); if (!isset($this->data['event'][$id])) { - $this->data['event'][$id] = array(); + $this->data['event'][$id] = []; } $this->data['event'][$id][] = $context; @@ -95,7 +95,7 @@ public function hasEventMemory() */ public function getApplicationEventMemory() { - $result = array(); + $result = []; if (!isset($this->data['event']['application'])) { return $result; diff --git a/src/ZendDeveloperTools/Collector/RequestCollector.php b/src/ZendDeveloperTools/Collector/RequestCollector.php index 081f019..e6625dc 100644 --- a/src/ZendDeveloperTools/Collector/RequestCollector.php +++ b/src/ZendDeveloperTools/Collector/RequestCollector.php @@ -39,7 +39,7 @@ public function getPriority() */ public function collect(MvcEvent $mvcEvent) { - $views = array(); + $views = []; $match = $mvcEvent->getRouteMatch(); $viewModel = $mvcEvent->getViewModel(); @@ -55,23 +55,23 @@ public function collect(MvcEvent $mvcEvent) $var = $key . ': ' . (is_object($var) ? get_class($var) : gettype($var)); } sort($vars); - $views[] = array( + $views[] = [ 'template' => $child->getTemplate(), 'vars' => $vars, - ); + ]; }; $addToViewFromModel($viewModel); $this->addChildrenToView($viewModel, $addToViewFromModel); - $this->data = array( + $this->data = [ 'views' => $views, 'method' => $mvcEvent->getRequest()->getMethod(), 'status' => $mvcEvent->getResponse()->getStatusCode(), 'route' => ($match === null) ? 'N/A' : $match->getMatchedRouteName(), 'action' => ($match === null) ? 'N/A' : $match->getParam('action', 'N/A'), 'controller' => ($match === null) ? 'N/A' : $match->getParam('controller', 'N/A') - ); + ]; } /** diff --git a/src/ZendDeveloperTools/Collector/TimeCollector.php b/src/ZendDeveloperTools/Collector/TimeCollector.php index 5e9f8b1..50873bf 100644 --- a/src/ZendDeveloperTools/Collector/TimeCollector.php +++ b/src/ZendDeveloperTools/Collector/TimeCollector.php @@ -47,7 +47,7 @@ public function collect(MvcEvent $mvcEvent) } if (!isset($this->data)) { - $this->data = array(); + $this->data = []; } $this->data['start'] = $start; @@ -70,7 +70,7 @@ public function collectEvent($id, Event $event) $context['line'] = $contextProvider->getEventTriggerLine(); if (!isset($this->data['event'][$id])) { - $this->data['event'][$id] = array(); + $this->data['event'][$id] = []; } $this->data['event'][$id][] = $context; @@ -113,7 +113,7 @@ public function hasEventTimes() */ public function getApplicationEventTimes() { - $result = array(); + $result = []; if (!isset($this->data['event']['application'])) { return $result; diff --git a/src/ZendDeveloperTools/EventLogging/EventContextProvider.php b/src/ZendDeveloperTools/EventLogging/EventContextProvider.php index 2582473..93c3004 100644 --- a/src/ZendDeveloperTools/EventLogging/EventContextProvider.php +++ b/src/ZendDeveloperTools/EventLogging/EventContextProvider.php @@ -19,7 +19,7 @@ class EventContextProvider implements EventContextInterface * * @var array */ - private $debugBacktrace = array(); + private $debugBacktrace = []; /** * @param EventInterface $event (Optional) The event to provide context to. The event must be set either here or diff --git a/src/ZendDeveloperTools/Exception/SerializableException.php b/src/ZendDeveloperTools/Exception/SerializableException.php index 6a608b0..a252031 100644 --- a/src/ZendDeveloperTools/Exception/SerializableException.php +++ b/src/ZendDeveloperTools/Exception/SerializableException.php @@ -25,7 +25,7 @@ class SerializableException implements \Serializable */ public function __construct(\Exception $exception) { - $this->data = array( + $this->data = [ 'code' => $exception->getCode(), 'file' => $exception->getFile(), 'line' => $exception->getLine(), @@ -37,7 +37,7 @@ public function __construct(\Exception $exception) $exception->getFile(), $exception->getLine() ), - ); + ]; } /** @@ -109,9 +109,9 @@ public function getPrevious() */ protected function filterTrace($trace, $file, $line) { - $filteredTrace = array(); + $filteredTrace = []; - $filteredTrace[] = array( + $filteredTrace[] = [ 'namespace' => '', 'short_class' => '', 'class' => '', @@ -119,8 +119,8 @@ protected function filterTrace($trace, $file, $line) 'function' => '', 'file' => $file, 'line' => $line, - 'args' => array(), - ); + 'args' => [], + ]; foreach ($trace as $entry) { $class = ''; @@ -132,7 +132,7 @@ protected function filterTrace($trace, $file, $line) $namespace = implode('\\', $parts); } - $filteredTrace[] = array( + $filteredTrace[] = [ 'namespace' => $namespace, 'short_class' => $class, 'class' => isset($entry['class']) ? $entry['class'] : '', @@ -140,8 +140,8 @@ protected function filterTrace($trace, $file, $line) 'function' => $entry['function'], 'file' => isset($entry['file']) ? $entry['file'] : null, 'line' => isset($entry['line']) ? $entry['line'] : null, - 'args' => isset($entry['args']) ? $this->filterArgs($entry['args']) : array(), - ); + 'args' => isset($entry['args']) ? $this->filterArgs($entry['args']) : [], + ]; } return $filteredTrace; @@ -159,25 +159,25 @@ protected function filterTrace($trace, $file, $line) */ protected function filterArgs($args, $level = 0) { - $result = array(); + $result = []; foreach ($args as $key => $value) { if (is_object($value)) { - $result[$key] = array('object', get_class($value)); + $result[$key] = ['object', get_class($value)]; } elseif (is_array($value)) { if ($level > 10) { - $result[$key] = array('array', '*DEEP NESTED ARRAY*'); + $result[$key] = ['array', '*DEEP NESTED ARRAY*']; } else { - $result[$key] = array('array', $this->filterArgs($value, ++$level)); + $result[$key] = ['array', $this->filterArgs($value, ++$level)]; } } elseif (null === $value) { - $result[$key] = array('null', null); + $result[$key] = ['null', null]; } elseif (is_bool($value)) { - $result[$key] = array('boolean', $value); + $result[$key] = ['boolean', $value]; } elseif (is_resource($value)) { - $result[$key] = array('resource', get_resource_type($value)); + $result[$key] = ['resource', get_resource_type($value)]; } else { - $result[$key] = array('string', (string) $value); + $result[$key] = ['string', (string) $value]; } } diff --git a/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php b/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php index 9eba555..06d5220 100644 --- a/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php +++ b/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php @@ -61,7 +61,7 @@ function ($identifier) { public function attachShared(SharedEventManagerInterface $events) { foreach ($this->identifiers as $id) { - $events->attach($id, '*', array($this,'onCollectEvent'), Profiler::PRIORITY_EVENT_COLLECTOR); + $events->attach($id, '*', [$this,'onCollectEvent'], Profiler::PRIORITY_EVENT_COLLECTOR); } } diff --git a/src/ZendDeveloperTools/Listener/FirePhpListener.php b/src/ZendDeveloperTools/Listener/FirePhpListener.php index dbf19c9..a81a28a 100644 --- a/src/ZendDeveloperTools/Listener/FirePhpListener.php +++ b/src/ZendDeveloperTools/Listener/FirePhpListener.php @@ -29,7 +29,7 @@ class FirePhpListener implements ListenerAggregateInterface /** * @var array */ - protected $listeners = array(); + protected $listeners = []; /** * Constructor. @@ -48,7 +48,7 @@ public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( ProfilerEvent::EVENT_COLLECTED, - array($this, 'onCollected'), + [$this, 'onCollected'], Profiler::PRIORITY_FIREPHP ); } diff --git a/src/ZendDeveloperTools/Listener/FlushListener.php b/src/ZendDeveloperTools/Listener/FlushListener.php index e2c9a38..10be1d9 100644 --- a/src/ZendDeveloperTools/Listener/FlushListener.php +++ b/src/ZendDeveloperTools/Listener/FlushListener.php @@ -26,7 +26,7 @@ class FlushListener implements ListenerAggregateInterface /** * @var array */ - protected $listeners = array(); + protected $listeners = []; /** * {@inheritdoc} @@ -35,7 +35,7 @@ public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( MvcEvent::EVENT_FINISH, - array($this, 'onFinish'), + [$this, 'onFinish'], Profiler::PRIORITY_FLUSH ); } @@ -64,7 +64,7 @@ public function onFinish(MvcEvent $event) return; } - if(is_callable(array($response, 'send'))){ + if(is_callable([$response, 'send'])){ return $response->send(); } } diff --git a/src/ZendDeveloperTools/Listener/ProfilerListener.php b/src/ZendDeveloperTools/Listener/ProfilerListener.php index 3c02d90..9f91b22 100644 --- a/src/ZendDeveloperTools/Listener/ProfilerListener.php +++ b/src/ZendDeveloperTools/Listener/ProfilerListener.php @@ -38,7 +38,7 @@ class ProfilerListener implements ListenerAggregateInterface /** * @var array */ - protected $listeners = array(); + protected $listeners = []; /** * Constructor. @@ -59,7 +59,7 @@ public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( MvcEvent::EVENT_FINISH, - array($this, 'onFinish'), + [$this, 'onFinish'], Profiler::PRIORITY_PROFILER ); } diff --git a/src/ZendDeveloperTools/Listener/StorageListener.php b/src/ZendDeveloperTools/Listener/StorageListener.php index 3cc8c1a..771d909 100644 --- a/src/ZendDeveloperTools/Listener/StorageListener.php +++ b/src/ZendDeveloperTools/Listener/StorageListener.php @@ -29,7 +29,7 @@ class StorageListener implements ListenerAggregateInterface /** * @var array */ - protected $listeners = array(); + protected $listeners = []; /** * Constructor. @@ -48,7 +48,7 @@ public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->attach( ProfilerEvent::EVENT_COLLECTED, - array($this, 'onCollected'), + [$this, 'onCollected'], Profiler::PRIORITY_STORAGE ); } diff --git a/src/ZendDeveloperTools/Listener/ToolbarListener.php b/src/ZendDeveloperTools/Listener/ToolbarListener.php index 034223f..9c22a1a 100644 --- a/src/ZendDeveloperTools/Listener/ToolbarListener.php +++ b/src/ZendDeveloperTools/Listener/ToolbarListener.php @@ -72,7 +72,7 @@ class ToolbarListener implements ListenerAggregateInterface /** * @var array */ - protected $listeners = array(); + protected $listeners = []; /** * Constructor. @@ -91,7 +91,7 @@ public function __construct($viewRenderer, Options $options) */ public function attach(EventManagerInterface $events, $priority = 1) { - $this->listeners[] = $events->getSharedManager()->attach('profiler', ProfilerEvent::EVENT_COLLECTED, array($this, 'onCollected'), Profiler::PRIORITY_TOOLBAR); + $this->listeners[] = $events->getSharedManager()->attach('profiler', ProfilerEvent::EVENT_COLLECTED, [$this, 'onCollected'], Profiler::PRIORITY_TOOLBAR); } /** @@ -145,13 +145,13 @@ protected function injectToolbar(ProfilerEvent $event) $entries = $this->renderEntries($event); $response = $event->getApplication()->getResponse(); - $toolbarView = new ViewModel(array('entries' => $entries)); + $toolbarView = new ViewModel(['entries' => $entries]); $toolbarView->setTemplate('zend-developer-tools/toolbar/toolbar'); $toolbar = $this->renderer->render($toolbarView); - $toolbarCss = new ViewModel(array( + $toolbarCss = new ViewModel([ 'position' => $this->options->getToolbarPosition(), - )); + ]); $toolbarCss->setTemplate('zend-developer-tools/toolbar/style'); $style = $this->renderer->render($toolbarCss); @@ -175,7 +175,7 @@ protected function injectToolbar(ProfilerEvent $event) */ protected function renderEntries(ProfilerEvent $event) { - $entries = array(); + $entries = []; $report = $event->getReport(); list($isLatest, $latest) = $this->getLatestVersion(Version::VERSION); @@ -191,7 +191,7 @@ protected function renderEntries(ProfilerEvent $event) ); } - $zfEntry = new ViewModel(array( + $zfEntry = new ViewModel([ 'zf_version' => Version::VERSION, 'is_latest' => $isLatest, 'latest' => $latest, @@ -199,11 +199,11 @@ protected function renderEntries(ProfilerEvent $event) 'has_intl' => extension_loaded('intl'), 'doc_uri' => $docUri, 'modules' => $this->getModules($event), - )); + ]); $zfEntry->setTemplate('zend-developer-tools/toolbar/zendframework'); $entries[] = $this->renderer->render($zfEntry); - $errors = array(); + $errors = []; $collectors = $this->options->getCollectors(); $templates = $this->options->getToolbarEntries(); @@ -216,10 +216,10 @@ protected function renderEntries(ProfilerEvent $event) continue; } - $collector = new ViewModel(array( + $collector = new ViewModel([ 'report' => $report, 'collector' => $collectorInstance, - )); + ]); $collector->setTemplate($template); $entries[] = $this->renderer->render($collector); } catch (RuntimeException $e) { @@ -229,7 +229,7 @@ protected function renderEntries(ProfilerEvent $event) } if (!empty($errors) || $report->hasErrors()) { - $tmp = array(); + $tmp = []; foreach ($errors as $name => $template) { $cur = sprintf('Unable to render toolbar template %s (%s).', $name, $template); $tmp[] = $cur; @@ -242,7 +242,7 @@ protected function renderEntries(ProfilerEvent $event) } if ($report->hasErrors()) { - $errorTpl = new ViewModel(array('errors' => $report->getErrors())); + $errorTpl = new ViewModel(['errors' => $report->getErrors()]); $errorTpl->setTemplate('zend-developer-tools/toolbar/error'); $entries[] = $this->renderer->render($errorTpl); } @@ -260,7 +260,7 @@ protected function renderEntries(ProfilerEvent $event) protected function getLatestVersion($currentVersion) { if (!$this->options->isVersionCheckEnabled()) { - return array(true, ''); + return [true, '']; } $cacheDir = $this->options->getCacheDir(); @@ -268,7 +268,7 @@ protected function getLatestVersion($currentVersion) // exit early if the cache dir doesn't exist, // to prevent hitting the GitHub API for every request. if (!is_dir($cacheDir)) { - return array(true, ''); + return [true, '']; } if (file_exists($cacheDir . '/ZDT_ZF_Version.cache')) { @@ -278,13 +278,13 @@ protected function getLatestVersion($currentVersion) if ($cache[0] + self::VERSION_CACHE_TTL > time()) { // the cache file was written before the version was upgraded. if ($currentVersion === $cache[2] || $cache[2] === 'N/A') { - return array(true, ''); + return [true, '']; } - return array( + return [ ($cache[1] === 'yes') ? true : false, $cache[2] - ); + ]; } } @@ -301,7 +301,7 @@ protected function getLatestVersion($currentVersion) ) ); - return array($isLatest, $latest); + return [$isLatest, $latest]; } private function getModules(ProfilerEvent $event) diff --git a/src/ZendDeveloperTools/Module.php b/src/ZendDeveloperTools/Module.php index 20bfdc4..2486830 100644 --- a/src/ZendDeveloperTools/Module.php +++ b/src/ZendDeveloperTools/Module.php @@ -42,7 +42,7 @@ public function init(ModuleManagerInterface $manager) $eventManager = $manager->getEventManager(); $eventManager->attach( ModuleEvent::EVENT_LOAD_MODULES_POST, - array($this, 'onLoadModulesPost'), + [$this, 'onLoadModulesPost'], -1100 ); } @@ -127,13 +127,13 @@ public function getConfig() public function getViewHelperConfig() { - return array( - 'invokables' => array( + return [ + 'invokables' => [ 'ZendDeveloperToolsTime' => 'ZendDeveloperTools\View\Helper\Time', 'ZendDeveloperToolsMemory' => 'ZendDeveloperTools\View\Helper\Memory', 'ZendDeveloperToolsDetailArray' => 'ZendDeveloperTools\View\Helper\DetailArray', - ), - ); + ], + ]; } /** @@ -141,11 +141,11 @@ public function getViewHelperConfig() */ public function getServiceConfig() { - return array( - 'aliases' => array( + return [ + 'aliases' => [ 'ZendDeveloperTools\ReportInterface' => 'ZendDeveloperTools\Report', - ), - 'invokables' => array( + ], + 'invokables' => [ 'ZendDeveloperTools\Report' => 'ZendDeveloperTools\Report', 'ZendDeveloperTools\EventCollector' => 'ZendDeveloperTools\Collector\EventCollector', 'ZendDeveloperTools\ExceptionCollector' => 'ZendDeveloperTools\Collector\ExceptionCollector', @@ -156,8 +156,8 @@ public function getServiceConfig() 'ZendDeveloperTools\MemoryCollector' => 'ZendDeveloperTools\Collector\MemoryCollector', 'ZendDeveloperTools\TimeCollector' => 'ZendDeveloperTools\Collector\TimeCollector', 'ZendDeveloperTools\FlushListener' => 'ZendDeveloperTools\Listener\FlushListener', - ), - 'factories' => array( + ], + 'factories' => [ 'ZendDeveloperTools\Profiler' => function ($sm) { $a = new Profiler($sm->get('ZendDeveloperTools\Report')); $a->setEvent($sm->get('ZendDeveloperTools\Event')); @@ -190,7 +190,7 @@ public function getServiceConfig() $config = $sm->get('ZendDeveloperTools\Config'); return new Listener\EventLoggingListenerAggregate( - array_map(array($sm, 'get'), $config->getEventCollectors()), + array_map([$sm, 'get'], $config->getEventCollectors()), $config->getEventIdentifiers() ); }, @@ -214,7 +214,7 @@ public function getServiceConfig() return $db; }, - ), - ); + ], + ]; } } diff --git a/src/ZendDeveloperTools/Options.php b/src/ZendDeveloperTools/Options.php index 9f33077..2c18404 100644 --- a/src/ZendDeveloperTools/Options.php +++ b/src/ZendDeveloperTools/Options.php @@ -21,53 +21,53 @@ class Options extends AbstractOptions /** * @var array */ - protected $profiler = array( + protected $profiler = [ 'enabled' => false, 'strict' => true, 'flush_early' => false, 'cache_dir' => 'data/cache', - 'matcher' => array(), - 'collectors' => array( + 'matcher' => [], + 'collectors' => [ 'db' => 'ZendDeveloperTools\DbCollector', 'exception' => 'ZendDeveloperTools\ExceptionCollector', 'request' => 'ZendDeveloperTools\RequestCollector', 'config' => 'ZendDeveloperTools\ConfigCollector', 'memory' => 'ZendDeveloperTools\MemoryCollector', 'time' => 'ZendDeveloperTools\TimeCollector', - ), - ); + ], + ]; /** * Defaults for event-level logging * @var array */ - protected $events = array( + protected $events = [ 'enabled' => false, - 'collectors' => array( + 'collectors' => [ 'memory' => 'ZendDeveloperTools\MemoryCollector', 'time' => 'ZendDeveloperTools\TimeCollector', - ), - 'identifiers' => array( + ], + 'identifiers' => [ 'all' => '*' - ) - ); + ] + ]; /** * @var array */ - protected $toolbar = array( + protected $toolbar = [ 'enabled' => false, 'auto_hide' => false, 'position' => 'bottom', 'version_check' => false, - 'entries' => array( + 'entries' => [ 'request' => 'zend-developer-tools/toolbar/request', 'time' => 'zend-developer-tools/toolbar/time', 'memory' => 'zend-developer-tools/toolbar/memory', 'config' => 'zend-developer-tools/toolbar/config', 'db' => 'zend-developer-tools/toolbar/db', - ), - ); + ], + ]; /** * Overloading Constructor. diff --git a/src/ZendDeveloperTools/Profiler.php b/src/ZendDeveloperTools/Profiler.php index 4224c80..3ac8856 100644 --- a/src/ZendDeveloperTools/Profiler.php +++ b/src/ZendDeveloperTools/Profiler.php @@ -146,7 +146,7 @@ public function getEvent() */ public function setEventManager(EventManagerInterface $eventManager) { - $eventManager->addIdentifiers(array(__CLASS__, get_called_class(), 'profiler')); + $eventManager->addIdentifiers([__CLASS__, get_called_class(), 'profiler']); $this->eventManager = $eventManager; return $this; diff --git a/src/ZendDeveloperTools/Report.php b/src/ZendDeveloperTools/Report.php index 1555975..bd84597 100644 --- a/src/ZendDeveloperTools/Report.php +++ b/src/ZendDeveloperTools/Report.php @@ -44,7 +44,7 @@ class Report implements ReportInterface /** * @var array */ - protected $collectors = array(); + protected $collectors = []; /** * {@inheritdoc} @@ -124,7 +124,7 @@ public function getToken() public function addError($error) { if (!isset($this->errors)) { - $this->errors = array(); + $this->errors = []; } $this->errors[] = $error; @@ -227,6 +227,6 @@ public function addCollector(Collector\CollectorInterface $collector) */ public function __sleep() { - return array('ip', 'uri', 'time', 'token', 'errors', 'method', 'collectors'); + return ['ip', 'uri', 'time', 'token', 'errors', 'method', 'collectors']; } } diff --git a/src/ZendDeveloperTools/View/Helper/DetailArray.php b/src/ZendDeveloperTools/View/Helper/DetailArray.php index 6e8c8d2..62a0b5a 100644 --- a/src/ZendDeveloperTools/View/Helper/DetailArray.php +++ b/src/ZendDeveloperTools/View/Helper/DetailArray.php @@ -36,7 +36,7 @@ class DetailArray extends AbstractHelper */ public function __invoke($label, array $details, $redundant = false) { - $r = array(); + $r = []; $r[] = ' test}/Collector/ConfigCollectionTest.php | 0 {tests => test}/Collector/MemoryCollectorTest.php | 0 {tests => test}/ModuleTest.php | 0 {tests => test}/OptionsTest.php | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename {tests => test}/Collector/ConfigCollectionTest.php (100%) rename {tests => test}/Collector/MemoryCollectorTest.php (100%) rename {tests => test}/ModuleTest.php (100%) rename {tests => test}/OptionsTest.php (100%) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f703ddb..b2b05a0 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -12,7 +12,7 @@ syntaxCheck="true" > - ./tests + ./test diff --git a/tests/Collector/ConfigCollectionTest.php b/test/Collector/ConfigCollectionTest.php similarity index 100% rename from tests/Collector/ConfigCollectionTest.php rename to test/Collector/ConfigCollectionTest.php diff --git a/tests/Collector/MemoryCollectorTest.php b/test/Collector/MemoryCollectorTest.php similarity index 100% rename from tests/Collector/MemoryCollectorTest.php rename to test/Collector/MemoryCollectorTest.php diff --git a/tests/ModuleTest.php b/test/ModuleTest.php similarity index 100% rename from tests/ModuleTest.php rename to test/ModuleTest.php diff --git a/tests/OptionsTest.php b/test/OptionsTest.php similarity index 100% rename from tests/OptionsTest.php rename to test/OptionsTest.php From 50cf2f2595d32ed31e18d339de6b0c478f1c59d3 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 13:37:52 +0700 Subject: [PATCH 12/35] psr-4 autoloader --- composer.json | 5 +++-- src/{ZendDeveloperTools => }/Collector/AbstractCollector.php | 0 src/{ZendDeveloperTools => }/Collector/AutoHideInterface.php | 0 .../Collector/CollectorInterface.php | 0 src/{ZendDeveloperTools => }/Collector/ConfigCollector.php | 0 src/{ZendDeveloperTools => }/Collector/DbCollector.php | 0 .../Collector/EventCollectorInterface.php | 0 .../Collector/ExceptionCollector.php | 0 src/{ZendDeveloperTools => }/Collector/MailCollector.php | 0 src/{ZendDeveloperTools => }/Collector/MemoryCollector.php | 0 src/{ZendDeveloperTools => }/Collector/RequestCollector.php | 0 src/{ZendDeveloperTools => }/Collector/TimeCollector.php | 0 .../Controller/DeveloperToolsController.php | 0 .../EventLogging/EventContextInterface.php | 0 .../EventLogging/EventContextProvider.php | 0 .../Exception/CollectorException.php | 0 .../Exception/ExceptionInterface.php | 0 .../Exception/InvalidOptionException.php | 0 .../Exception/ParameterMissingException.php | 0 src/{ZendDeveloperTools => }/Exception/ProfilerException.php | 0 .../Exception/SerializableException.php | 0 .../Listener/EventLoggingListenerAggregate.php | 0 src/{ZendDeveloperTools => }/Listener/FirePhpListener.php | 0 src/{ZendDeveloperTools => }/Listener/FlushListener.php | 0 src/{ZendDeveloperTools => }/Listener/ProfilerListener.php | 0 src/{ZendDeveloperTools => }/Listener/StorageListener.php | 0 src/{ZendDeveloperTools => }/Listener/ToolbarListener.php | 0 src/{ZendDeveloperTools => }/Match/MatchInterface.php | 0 src/{ZendDeveloperTools => }/Module.php | 0 src/{ZendDeveloperTools => }/Options.php | 0 src/{ZendDeveloperTools => }/Profiler.php | 0 src/{ZendDeveloperTools => }/ProfilerEvent.php | 0 src/{ZendDeveloperTools => }/Report.php | 0 src/{ZendDeveloperTools => }/ReportInterface.php | 0 src/{ZendDeveloperTools => }/Storage/StorageInterface.php | 0 src/{ZendDeveloperTools => }/Stub/ClosureStub.php | 0 src/{ZendDeveloperTools => }/View/Helper/DetailArray.php | 0 src/{ZendDeveloperTools => }/View/Helper/Memory.php | 0 src/{ZendDeveloperTools => }/View/Helper/Time.php | 0 39 files changed, 3 insertions(+), 2 deletions(-) rename src/{ZendDeveloperTools => }/Collector/AbstractCollector.php (100%) rename src/{ZendDeveloperTools => }/Collector/AutoHideInterface.php (100%) rename src/{ZendDeveloperTools => }/Collector/CollectorInterface.php (100%) rename src/{ZendDeveloperTools => }/Collector/ConfigCollector.php (100%) rename src/{ZendDeveloperTools => }/Collector/DbCollector.php (100%) rename src/{ZendDeveloperTools => }/Collector/EventCollectorInterface.php (100%) rename src/{ZendDeveloperTools => }/Collector/ExceptionCollector.php (100%) rename src/{ZendDeveloperTools => }/Collector/MailCollector.php (100%) rename src/{ZendDeveloperTools => }/Collector/MemoryCollector.php (100%) rename src/{ZendDeveloperTools => }/Collector/RequestCollector.php (100%) rename src/{ZendDeveloperTools => }/Collector/TimeCollector.php (100%) rename src/{ZendDeveloperTools => }/Controller/DeveloperToolsController.php (100%) rename src/{ZendDeveloperTools => }/EventLogging/EventContextInterface.php (100%) rename src/{ZendDeveloperTools => }/EventLogging/EventContextProvider.php (100%) rename src/{ZendDeveloperTools => }/Exception/CollectorException.php (100%) rename src/{ZendDeveloperTools => }/Exception/ExceptionInterface.php (100%) rename src/{ZendDeveloperTools => }/Exception/InvalidOptionException.php (100%) rename src/{ZendDeveloperTools => }/Exception/ParameterMissingException.php (100%) rename src/{ZendDeveloperTools => }/Exception/ProfilerException.php (100%) rename src/{ZendDeveloperTools => }/Exception/SerializableException.php (100%) rename src/{ZendDeveloperTools => }/Listener/EventLoggingListenerAggregate.php (100%) rename src/{ZendDeveloperTools => }/Listener/FirePhpListener.php (100%) rename src/{ZendDeveloperTools => }/Listener/FlushListener.php (100%) rename src/{ZendDeveloperTools => }/Listener/ProfilerListener.php (100%) rename src/{ZendDeveloperTools => }/Listener/StorageListener.php (100%) rename src/{ZendDeveloperTools => }/Listener/ToolbarListener.php (100%) rename src/{ZendDeveloperTools => }/Match/MatchInterface.php (100%) rename src/{ZendDeveloperTools => }/Module.php (100%) rename src/{ZendDeveloperTools => }/Options.php (100%) rename src/{ZendDeveloperTools => }/Profiler.php (100%) rename src/{ZendDeveloperTools => }/ProfilerEvent.php (100%) rename src/{ZendDeveloperTools => }/Report.php (100%) rename src/{ZendDeveloperTools => }/ReportInterface.php (100%) rename src/{ZendDeveloperTools => }/Storage/StorageInterface.php (100%) rename src/{ZendDeveloperTools => }/Stub/ClosureStub.php (100%) rename src/{ZendDeveloperTools => }/View/Helper/DetailArray.php (100%) rename src/{ZendDeveloperTools => }/View/Helper/Memory.php (100%) rename src/{ZendDeveloperTools => }/View/Helper/Time.php (100%) diff --git a/composer.json b/composer.json index 8d760ce..c7456b9 100644 --- a/composer.json +++ b/composer.json @@ -45,8 +45,9 @@ "aist/aist-git-tools": "Show you informations about current GIT repository" }, "autoload": { - "psr-0": { - "ZendDeveloperTools": "src/" + "psr-4": { + "ZendDeveloperTools\\": "src/", + "ZendDeveloperToolsTest\\": "test/" } }, "autoload-dev": { diff --git a/src/ZendDeveloperTools/Collector/AbstractCollector.php b/src/Collector/AbstractCollector.php similarity index 100% rename from src/ZendDeveloperTools/Collector/AbstractCollector.php rename to src/Collector/AbstractCollector.php diff --git a/src/ZendDeveloperTools/Collector/AutoHideInterface.php b/src/Collector/AutoHideInterface.php similarity index 100% rename from src/ZendDeveloperTools/Collector/AutoHideInterface.php rename to src/Collector/AutoHideInterface.php diff --git a/src/ZendDeveloperTools/Collector/CollectorInterface.php b/src/Collector/CollectorInterface.php similarity index 100% rename from src/ZendDeveloperTools/Collector/CollectorInterface.php rename to src/Collector/CollectorInterface.php diff --git a/src/ZendDeveloperTools/Collector/ConfigCollector.php b/src/Collector/ConfigCollector.php similarity index 100% rename from src/ZendDeveloperTools/Collector/ConfigCollector.php rename to src/Collector/ConfigCollector.php diff --git a/src/ZendDeveloperTools/Collector/DbCollector.php b/src/Collector/DbCollector.php similarity index 100% rename from src/ZendDeveloperTools/Collector/DbCollector.php rename to src/Collector/DbCollector.php diff --git a/src/ZendDeveloperTools/Collector/EventCollectorInterface.php b/src/Collector/EventCollectorInterface.php similarity index 100% rename from src/ZendDeveloperTools/Collector/EventCollectorInterface.php rename to src/Collector/EventCollectorInterface.php diff --git a/src/ZendDeveloperTools/Collector/ExceptionCollector.php b/src/Collector/ExceptionCollector.php similarity index 100% rename from src/ZendDeveloperTools/Collector/ExceptionCollector.php rename to src/Collector/ExceptionCollector.php diff --git a/src/ZendDeveloperTools/Collector/MailCollector.php b/src/Collector/MailCollector.php similarity index 100% rename from src/ZendDeveloperTools/Collector/MailCollector.php rename to src/Collector/MailCollector.php diff --git a/src/ZendDeveloperTools/Collector/MemoryCollector.php b/src/Collector/MemoryCollector.php similarity index 100% rename from src/ZendDeveloperTools/Collector/MemoryCollector.php rename to src/Collector/MemoryCollector.php diff --git a/src/ZendDeveloperTools/Collector/RequestCollector.php b/src/Collector/RequestCollector.php similarity index 100% rename from src/ZendDeveloperTools/Collector/RequestCollector.php rename to src/Collector/RequestCollector.php diff --git a/src/ZendDeveloperTools/Collector/TimeCollector.php b/src/Collector/TimeCollector.php similarity index 100% rename from src/ZendDeveloperTools/Collector/TimeCollector.php rename to src/Collector/TimeCollector.php diff --git a/src/ZendDeveloperTools/Controller/DeveloperToolsController.php b/src/Controller/DeveloperToolsController.php similarity index 100% rename from src/ZendDeveloperTools/Controller/DeveloperToolsController.php rename to src/Controller/DeveloperToolsController.php diff --git a/src/ZendDeveloperTools/EventLogging/EventContextInterface.php b/src/EventLogging/EventContextInterface.php similarity index 100% rename from src/ZendDeveloperTools/EventLogging/EventContextInterface.php rename to src/EventLogging/EventContextInterface.php diff --git a/src/ZendDeveloperTools/EventLogging/EventContextProvider.php b/src/EventLogging/EventContextProvider.php similarity index 100% rename from src/ZendDeveloperTools/EventLogging/EventContextProvider.php rename to src/EventLogging/EventContextProvider.php diff --git a/src/ZendDeveloperTools/Exception/CollectorException.php b/src/Exception/CollectorException.php similarity index 100% rename from src/ZendDeveloperTools/Exception/CollectorException.php rename to src/Exception/CollectorException.php diff --git a/src/ZendDeveloperTools/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php similarity index 100% rename from src/ZendDeveloperTools/Exception/ExceptionInterface.php rename to src/Exception/ExceptionInterface.php diff --git a/src/ZendDeveloperTools/Exception/InvalidOptionException.php b/src/Exception/InvalidOptionException.php similarity index 100% rename from src/ZendDeveloperTools/Exception/InvalidOptionException.php rename to src/Exception/InvalidOptionException.php diff --git a/src/ZendDeveloperTools/Exception/ParameterMissingException.php b/src/Exception/ParameterMissingException.php similarity index 100% rename from src/ZendDeveloperTools/Exception/ParameterMissingException.php rename to src/Exception/ParameterMissingException.php diff --git a/src/ZendDeveloperTools/Exception/ProfilerException.php b/src/Exception/ProfilerException.php similarity index 100% rename from src/ZendDeveloperTools/Exception/ProfilerException.php rename to src/Exception/ProfilerException.php diff --git a/src/ZendDeveloperTools/Exception/SerializableException.php b/src/Exception/SerializableException.php similarity index 100% rename from src/ZendDeveloperTools/Exception/SerializableException.php rename to src/Exception/SerializableException.php diff --git a/src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php b/src/Listener/EventLoggingListenerAggregate.php similarity index 100% rename from src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php rename to src/Listener/EventLoggingListenerAggregate.php diff --git a/src/ZendDeveloperTools/Listener/FirePhpListener.php b/src/Listener/FirePhpListener.php similarity index 100% rename from src/ZendDeveloperTools/Listener/FirePhpListener.php rename to src/Listener/FirePhpListener.php diff --git a/src/ZendDeveloperTools/Listener/FlushListener.php b/src/Listener/FlushListener.php similarity index 100% rename from src/ZendDeveloperTools/Listener/FlushListener.php rename to src/Listener/FlushListener.php diff --git a/src/ZendDeveloperTools/Listener/ProfilerListener.php b/src/Listener/ProfilerListener.php similarity index 100% rename from src/ZendDeveloperTools/Listener/ProfilerListener.php rename to src/Listener/ProfilerListener.php diff --git a/src/ZendDeveloperTools/Listener/StorageListener.php b/src/Listener/StorageListener.php similarity index 100% rename from src/ZendDeveloperTools/Listener/StorageListener.php rename to src/Listener/StorageListener.php diff --git a/src/ZendDeveloperTools/Listener/ToolbarListener.php b/src/Listener/ToolbarListener.php similarity index 100% rename from src/ZendDeveloperTools/Listener/ToolbarListener.php rename to src/Listener/ToolbarListener.php diff --git a/src/ZendDeveloperTools/Match/MatchInterface.php b/src/Match/MatchInterface.php similarity index 100% rename from src/ZendDeveloperTools/Match/MatchInterface.php rename to src/Match/MatchInterface.php diff --git a/src/ZendDeveloperTools/Module.php b/src/Module.php similarity index 100% rename from src/ZendDeveloperTools/Module.php rename to src/Module.php diff --git a/src/ZendDeveloperTools/Options.php b/src/Options.php similarity index 100% rename from src/ZendDeveloperTools/Options.php rename to src/Options.php diff --git a/src/ZendDeveloperTools/Profiler.php b/src/Profiler.php similarity index 100% rename from src/ZendDeveloperTools/Profiler.php rename to src/Profiler.php diff --git a/src/ZendDeveloperTools/ProfilerEvent.php b/src/ProfilerEvent.php similarity index 100% rename from src/ZendDeveloperTools/ProfilerEvent.php rename to src/ProfilerEvent.php diff --git a/src/ZendDeveloperTools/Report.php b/src/Report.php similarity index 100% rename from src/ZendDeveloperTools/Report.php rename to src/Report.php diff --git a/src/ZendDeveloperTools/ReportInterface.php b/src/ReportInterface.php similarity index 100% rename from src/ZendDeveloperTools/ReportInterface.php rename to src/ReportInterface.php diff --git a/src/ZendDeveloperTools/Storage/StorageInterface.php b/src/Storage/StorageInterface.php similarity index 100% rename from src/ZendDeveloperTools/Storage/StorageInterface.php rename to src/Storage/StorageInterface.php diff --git a/src/ZendDeveloperTools/Stub/ClosureStub.php b/src/Stub/ClosureStub.php similarity index 100% rename from src/ZendDeveloperTools/Stub/ClosureStub.php rename to src/Stub/ClosureStub.php diff --git a/src/ZendDeveloperTools/View/Helper/DetailArray.php b/src/View/Helper/DetailArray.php similarity index 100% rename from src/ZendDeveloperTools/View/Helper/DetailArray.php rename to src/View/Helper/DetailArray.php diff --git a/src/ZendDeveloperTools/View/Helper/Memory.php b/src/View/Helper/Memory.php similarity index 100% rename from src/ZendDeveloperTools/View/Helper/Memory.php rename to src/View/Helper/Memory.php diff --git a/src/ZendDeveloperTools/View/Helper/Time.php b/src/View/Helper/Time.php similarity index 100% rename from src/ZendDeveloperTools/View/Helper/Time.php rename to src/View/Helper/Time.php From c47b1db3ff249108096027131f2fabc273d74c24 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 13:40:41 +0700 Subject: [PATCH 13/35] use phpunit: ~4 || ~5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c7456b9..f791c29 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "zendframework/zend-view": "^2.6" }, "require-dev": { - "phpunit/phpunit": "~4" + "phpunit/phpunit": "~4 || ~5" }, "suggest": { "bjyoungblood/bjy-profiler": "Version: dev-master, allows the usage of the (Zend) Db collector.", From a2554cfc888a5274b056c013b738461390527551 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 13:44:02 +0700 Subject: [PATCH 14/35] update include module.config.php path --- src/Module.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module.php b/src/Module.php index 2486830..e6d66ae 100644 --- a/src/Module.php +++ b/src/Module.php @@ -122,7 +122,7 @@ public function onBootstrap(EventInterface $event) */ public function getConfig() { - return include __DIR__ . '/../../config/module.config.php'; + return include __DIR__ . '/../config/module.config.php'; } public function getViewHelperConfig() From 75f6fb7fafbf21678cdce251ed4a85af535d8f10 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 13:47:15 +0700 Subject: [PATCH 15/35] use ZendDeveloperToolsTest for test --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f791c29..4fb51ca 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,11 @@ }, "autoload": { "psr-4": { - "ZendDeveloperTools\\": "src/", + "ZendDeveloperTools\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { "ZendDeveloperToolsTest\\": "test/" } }, From 498cb0ddd893f08e21dc40989d1490b4f213d3e5 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 13:47:44 +0700 Subject: [PATCH 16/35] one empty line at the end of .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4b8b8ed..6ad80ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,5 @@ before_install: - composer install --prefer-source script: - - ./vendor/bin/phpunit \ No newline at end of file + - ./vendor/bin/phpunit + \ No newline at end of file From 891d3e85c8ca4e2d9c47d7f6833e3e259dd79a42 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 13:48:27 +0700 Subject: [PATCH 17/35] remove whitespace in ToolbarListener --- src/Listener/ToolbarListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Listener/ToolbarListener.php b/src/Listener/ToolbarListener.php index 9c22a1a..295d5b4 100644 --- a/src/Listener/ToolbarListener.php +++ b/src/Listener/ToolbarListener.php @@ -93,7 +93,7 @@ public function attach(EventManagerInterface $events, $priority = 1) { $this->listeners[] = $events->getSharedManager()->attach('profiler', ProfilerEvent::EVENT_COLLECTED, [$this, 'onCollected'], Profiler::PRIORITY_TOOLBAR); } - + /** * {@inheritdoc} */ From 6981ee00e60aee3f0feaef240610abf8603692b5 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 13:50:53 +0700 Subject: [PATCH 18/35] another white character --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6ad80ce..7e71359 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,3 @@ before_install: script: - ./vendor/bin/phpunit - \ No newline at end of file From 8d0c9be12c73ca454a8875006d6bfa48c9e86329 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 13:51:38 +0700 Subject: [PATCH 19/35] remove duplicated autoload-dev --- composer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/composer.json b/composer.json index 4fb51ca..c1dc2fe 100644 --- a/composer.json +++ b/composer.json @@ -53,10 +53,5 @@ "psr-4": { "ZendDeveloperToolsTest\\": "test/" } - }, - "autoload-dev": { - "psr-0": { - "ZendDeveloperToolsTest": "tests/" - } } } From 219eb58bdaafb8ebbb496a568dd8aebb6c9028e9 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 19:05:32 +0700 Subject: [PATCH 20/35] added php-cs check and checks for lowest, locked, latest in .travis.yml --- .php_cs | 45 +++++++++++++++++++++++++++++++++++++++++++++ .travis.yml | 46 +++++++++++++++++++++++++++++++++++++++++++--- composer.json | 3 ++- 3 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 .php_cs diff --git a/.php_cs b/.php_cs new file mode 100644 index 0000000..8f4dd5a --- /dev/null +++ b/.php_cs @@ -0,0 +1,45 @@ +in('src') + ->in('test') + ->notPath('TestAsset') + ->notPath('_files') + ->filter(function (SplFileInfo $file) { + if (strstr($file->getPath(), 'compatibility')) { + return false; + } + }); +$config = Symfony\CS\Config\Config::create(); +$config->level(null); +$config->fixers( + array( + 'braces', + 'duplicate_semicolon', + 'elseif', + 'empty_return', + 'encoding', + 'eof_ending', + 'function_call_space', + 'function_declaration', + 'indentation', + 'join_function', + 'line_after_namespace', + 'linefeed', + 'lowercase_keywords', + 'parenthesis', + 'multiple_use', + 'method_argument_space', + 'object_operator', + 'php_closing_tag', + 'remove_lines_between_uses', + 'short_array_syntax', + 'short_tag', + 'standardize_not_equal', + 'trailing_spaces', + 'unused_use', + 'visibility', + 'whitespacy_lines', + ) +); +$config->finder($finder); +return $config; diff --git a/.travis.yml b/.travis.yml index 7e71359..006ded7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,50 @@ php: - 5.5 - 5.6 - 7 - + before_install: - - composer self-update - - composer install --prefer-source + - composer self-update + +install: + - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi + - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi + - travis_retry composer install $COMPOSER_ARGS + - composer show --installed + +matrix: + fast_finish: true + include: + - php: 5.5 + env: + - DEPS=lowest + - php: 5.5 + env: + - EXECUTE_CS_CHECK=true + - DEPS=locked + - php: 5.5 + env: + - DEPS=latest + - php: 5.6 + env: + - DEPS=lowest + - php: 5.6 + env: + - DEPS=locked + - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)" + - PATH="$HOME/.local/bin:$PATH" + - php: 5.6 + env: + - DEPS=latest + - php: 7 + env: + - DEPS=lowest + - php: 7 + env: + - DEPS=locked + - php: 7 + env: + - DEPS=latest script: - ./vendor/bin/phpunit + - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi diff --git a/composer.json b/composer.json index c1dc2fe..f42145d 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,8 @@ "zendframework/zend-view": "^2.6" }, "require-dev": { - "phpunit/phpunit": "~4 || ~5" + "phpunit/phpunit": "~4 || ~5", + "fabpot/php-cs-fixer": "1.7.*" }, "suggest": { "bjyoungblood/bjy-profiler": "Version: dev-master, allows the usage of the (Zend) Db collector.", From ca71be4d5353021e5f991ff92f8c3dae73d037b2 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 25 Jun 2016 19:12:10 +0700 Subject: [PATCH 21/35] cs fix --- .php_cs | 2 -- src/Collector/AbstractCollector.php | 2 +- src/Collector/AutoHideInterface.php | 2 +- src/Collector/CollectorInterface.php | 2 +- src/Collector/DbCollector.php | 2 +- src/Collector/ExceptionCollector.php | 2 +- src/Collector/MailCollector.php | 2 +- src/Collector/MemoryCollector.php | 2 +- src/Controller/DeveloperToolsController.php | 2 +- src/Exception/CollectorException.php | 3 +-- src/Exception/ExceptionInterface.php | 3 +-- src/Exception/InvalidOptionException.php | 3 +-- src/Exception/ParameterMissingException.php | 3 +-- src/Exception/ProfilerException.php | 3 +-- src/Exception/SerializableException.php | 2 +- src/Listener/EventLoggingListenerAggregate.php | 2 +- src/Listener/FirePhpListener.php | 3 +-- src/Listener/FlushListener.php | 4 ++-- src/Listener/StorageListener.php | 3 +-- src/Listener/ToolbarListener.php | 5 ++--- src/Options.php | 2 +- src/Report.php | 2 +- src/Storage/StorageInterface.php | 3 +-- src/View/Helper/DetailArray.php | 2 +- test/ModuleTest.php | 5 +---- 25 files changed, 26 insertions(+), 40 deletions(-) diff --git a/.php_cs b/.php_cs index 8f4dd5a..a00e27f 100644 --- a/.php_cs +++ b/.php_cs @@ -2,8 +2,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create() ->in('src') ->in('test') - ->notPath('TestAsset') - ->notPath('_files') ->filter(function (SplFileInfo $file) { if (strstr($file->getPath(), 'compatibility')) { return false; diff --git a/src/Collector/AbstractCollector.php b/src/Collector/AbstractCollector.php index 8bc1962..25fa123 100644 --- a/src/Collector/AbstractCollector.php +++ b/src/Collector/AbstractCollector.php @@ -37,4 +37,4 @@ public function unserialize($data) { $this->data = unserialize($data); } -} \ No newline at end of file +} diff --git a/src/Collector/AutoHideInterface.php b/src/Collector/AutoHideInterface.php index 4b745b3..c8ceec7 100644 --- a/src/Collector/AutoHideInterface.php +++ b/src/Collector/AutoHideInterface.php @@ -33,4 +33,4 @@ interface AutoHideInterface * @return bool */ public function canHide(); -} \ No newline at end of file +} diff --git a/src/Collector/CollectorInterface.php b/src/Collector/CollectorInterface.php index c49b229..45ebd93 100644 --- a/src/Collector/CollectorInterface.php +++ b/src/Collector/CollectorInterface.php @@ -37,4 +37,4 @@ public function getPriority(); * @param MvcEvent $mvcEvent */ public function collect(MvcEvent $mvcEvent); -} \ No newline at end of file +} diff --git a/src/Collector/DbCollector.php b/src/Collector/DbCollector.php index a97f79c..eef830f 100644 --- a/src/Collector/DbCollector.php +++ b/src/Collector/DbCollector.php @@ -143,4 +143,4 @@ public function unserialize($profiler) { $this->profiler = unserialize($profiler); } -} \ No newline at end of file +} diff --git a/src/Collector/ExceptionCollector.php b/src/Collector/ExceptionCollector.php index 16e8628..3679a43 100644 --- a/src/Collector/ExceptionCollector.php +++ b/src/Collector/ExceptionCollector.php @@ -166,4 +166,4 @@ public function getPreviousTrace() { return $this->data['exception']->getPrevious()->getTrace(); } -} \ No newline at end of file +} diff --git a/src/Collector/MailCollector.php b/src/Collector/MailCollector.php index f9d1494..a1780e1 100644 --- a/src/Collector/MailCollector.php +++ b/src/Collector/MailCollector.php @@ -58,4 +58,4 @@ public function getMailsSend() { return 0; } -} \ No newline at end of file +} diff --git a/src/Collector/MemoryCollector.php b/src/Collector/MemoryCollector.php index c3a65ae..2f37feb 100644 --- a/src/Collector/MemoryCollector.php +++ b/src/Collector/MemoryCollector.php @@ -104,7 +104,7 @@ public function getApplicationEventMemory() $app = $this->data['event']['application']; $previous = null; - while (list ($name, $context) = each($app)) { + while (list($name, $context) = each($app)) { $result[$name] = $context; $result[$name]['difference'] = ($previous) ? ($context['memory'] - $previous['memory']) diff --git a/src/Controller/DeveloperToolsController.php b/src/Controller/DeveloperToolsController.php index d311b8b..0be877e 100644 --- a/src/Controller/DeveloperToolsController.php +++ b/src/Controller/DeveloperToolsController.php @@ -18,4 +18,4 @@ public function indexAction() { return new ViewModel(); } -} \ No newline at end of file +} diff --git a/src/Exception/CollectorException.php b/src/Exception/CollectorException.php index 02c59fc..37dee19 100644 --- a/src/Exception/CollectorException.php +++ b/src/Exception/CollectorException.php @@ -11,5 +11,4 @@ class CollectorException extends \Exception implements ExceptionInterface { - -} \ No newline at end of file +} diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php index f67b8f8..4aa470d 100644 --- a/src/Exception/ExceptionInterface.php +++ b/src/Exception/ExceptionInterface.php @@ -11,5 +11,4 @@ interface ExceptionInterface { - -} \ No newline at end of file +} diff --git a/src/Exception/InvalidOptionException.php b/src/Exception/InvalidOptionException.php index 594d123..21c55f4 100644 --- a/src/Exception/InvalidOptionException.php +++ b/src/Exception/InvalidOptionException.php @@ -11,5 +11,4 @@ class InvalidOptionException extends \InvalidArgumentException implements ExceptionInterface { - -} \ No newline at end of file +} diff --git a/src/Exception/ParameterMissingException.php b/src/Exception/ParameterMissingException.php index ae7b9f5..7d7a575 100644 --- a/src/Exception/ParameterMissingException.php +++ b/src/Exception/ParameterMissingException.php @@ -18,5 +18,4 @@ */ class ParameterMissingException extends \Exception implements ExceptionInterface { - -} \ No newline at end of file +} diff --git a/src/Exception/ProfilerException.php b/src/Exception/ProfilerException.php index f12e75e..98ab0dd 100644 --- a/src/Exception/ProfilerException.php +++ b/src/Exception/ProfilerException.php @@ -11,5 +11,4 @@ class ProfilerException extends \Exception implements ExceptionInterface { - -} \ No newline at end of file +} diff --git a/src/Exception/SerializableException.php b/src/Exception/SerializableException.php index a252031..b3f15e6 100644 --- a/src/Exception/SerializableException.php +++ b/src/Exception/SerializableException.php @@ -199,4 +199,4 @@ public function unserialize($data) { $this->data = unserialize($data); } -} \ No newline at end of file +} diff --git a/src/Listener/EventLoggingListenerAggregate.php b/src/Listener/EventLoggingListenerAggregate.php index 06d5220..97f90b4 100644 --- a/src/Listener/EventLoggingListenerAggregate.php +++ b/src/Listener/EventLoggingListenerAggregate.php @@ -61,7 +61,7 @@ function ($identifier) { public function attachShared(SharedEventManagerInterface $events) { foreach ($this->identifiers as $id) { - $events->attach($id, '*', [$this,'onCollectEvent'], Profiler::PRIORITY_EVENT_COLLECTOR); + $events->attach($id, '*', [$this, 'onCollectEvent'], Profiler::PRIORITY_EVENT_COLLECTOR); } } diff --git a/src/Listener/FirePhpListener.php b/src/Listener/FirePhpListener.php index a81a28a..e8938c1 100644 --- a/src/Listener/FirePhpListener.php +++ b/src/Listener/FirePhpListener.php @@ -72,6 +72,5 @@ public function detach(EventManagerInterface $events) */ public function onCollected(ProfilerEvent $event) { - } -} \ No newline at end of file +} diff --git a/src/Listener/FlushListener.php b/src/Listener/FlushListener.php index 10be1d9..8b9ac1c 100644 --- a/src/Listener/FlushListener.php +++ b/src/Listener/FlushListener.php @@ -64,8 +64,8 @@ public function onFinish(MvcEvent $event) return; } - if(is_callable([$response, 'send'])){ + if (is_callable([$response, 'send'])) { return $response->send(); } } -} \ No newline at end of file +} diff --git a/src/Listener/StorageListener.php b/src/Listener/StorageListener.php index 771d909..5c74252 100644 --- a/src/Listener/StorageListener.php +++ b/src/Listener/StorageListener.php @@ -72,6 +72,5 @@ public function detach(EventManagerInterface $events) */ public function onCollected(ProfilerEvent $event) { - } -} \ No newline at end of file +} diff --git a/src/Listener/ToolbarListener.php b/src/Listener/ToolbarListener.php index 295d5b4..a894e02 100644 --- a/src/Listener/ToolbarListener.php +++ b/src/Listener/ToolbarListener.php @@ -28,7 +28,6 @@ use ZendDeveloperTools\Exception\InvalidOptionException; use Zend\EventManager\EventManagerInterface; use Zend\EventManager\ListenerAggregateInterface; -use Zend\ServiceManager\ServiceLocatorInterface; /** * Developer Toolbar Listener @@ -179,7 +178,7 @@ protected function renderEntries(ProfilerEvent $event) $report = $event->getReport(); list($isLatest, $latest) = $this->getLatestVersion(Version::VERSION); - + if (false === ($pos = strpos(Version::VERSION, 'dev'))) { $docUri = sprintf(self::DOC_URI_PATTERN, substr(Version::VERSION, 0, 3)); } else { // unreleased dev branch - compare minor part of versions @@ -307,7 +306,7 @@ protected function getLatestVersion($currentVersion) private function getModules(ProfilerEvent $event) { if (!$application = $event->getApplication()) { - return null; + return; } $serviceManager = $application->getServiceManager(); diff --git a/src/Options.php b/src/Options.php index 2c18404..d6f5817 100644 --- a/src/Options.php +++ b/src/Options.php @@ -48,7 +48,7 @@ class Options extends AbstractOptions 'time' => 'ZendDeveloperTools\TimeCollector', ], 'identifiers' => [ - 'all' => '*' + 'all' => '*' ] ]; diff --git a/src/Report.php b/src/Report.php index bd84597..b92f98e 100644 --- a/src/Report.php +++ b/src/Report.php @@ -183,7 +183,7 @@ public function getCollector($name) return $this->collectors[$name]; } - return null; + return; } /** diff --git a/src/Storage/StorageInterface.php b/src/Storage/StorageInterface.php index ee60e79..19396fd 100644 --- a/src/Storage/StorageInterface.php +++ b/src/Storage/StorageInterface.php @@ -11,5 +11,4 @@ interface StorageInterface { - -} \ No newline at end of file +} diff --git a/src/View/Helper/DetailArray.php b/src/View/Helper/DetailArray.php index 62a0b5a..4631fd6 100644 --- a/src/View/Helper/DetailArray.php +++ b/src/View/Helper/DetailArray.php @@ -67,4 +67,4 @@ public function __invoke($label, array $details, $redundant = false) return implode('', $r); } -} \ No newline at end of file +} diff --git a/test/ModuleTest.php b/test/ModuleTest.php index 13d5320..d4ccd3c 100644 --- a/test/ModuleTest.php +++ b/test/ModuleTest.php @@ -1,12 +1,9 @@ Date: Sat, 25 Jun 2016 19:14:47 +0700 Subject: [PATCH 22/35] whitespace fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 006ded7..35545a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ php: - 5.5 - 5.6 - 7 - + before_install: - composer self-update From f554d92fe9cb2ab17af07deeab64c7c12e3c4532 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 26 Jun 2016 04:34:06 +0700 Subject: [PATCH 23/35] commit composer.lock --- .gitignore | 1 - composer.lock | 2667 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 2667 insertions(+), 1 deletion(-) create mode 100644 composer.lock diff --git a/.gitignore b/.gitignore index 19bf006..4f13a2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ nbproject -composer.lock .idea .buildpath .project diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..be6a31d --- /dev/null +++ b/composer.lock @@ -0,0 +1,2667 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "87ab342d6ebcfcc269135860520dd95b", + "content-hash": "04fbcb216ceee404d06c521a86f090b4", + "packages": [ + { + "name": "container-interop/container-interop", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/container-interop/container-interop.git", + "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e", + "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e", + "shasum": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "Interop\\Container\\": "src/Interop/Container/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", + "time": "2014-12-30 15:22:37" + }, + { + "name": "zendframework/zend-config", + "version": "2.6.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-config.git", + "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", + "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-filter": "^2.6", + "zendframework/zend-i18n": "^2.5", + "zendframework/zend-json": "^2.6.1", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" + }, + "suggest": { + "zendframework/zend-filter": "Zend\\Filter component", + "zendframework/zend-i18n": "Zend\\I18n component", + "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes", + "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Config\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides a nested object property based user interface for accessing this configuration data within application code", + "homepage": "https://github.com/zendframework/zend-config", + "keywords": [ + "config", + "zf2" + ], + "time": "2016-02-04 23:01:10" + }, + { + "name": "zendframework/zend-debug", + "version": "2.5.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-debug.git", + "reference": "b6f9df59155391ca683c479a0d758f66ef73b3b3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-debug/zipball/b6f9df59155391ca683c479a0d758f66ef73b3b3", + "reference": "b6f9df59155391ca683c479a0d758f66ef73b3b3", + "shasum": "" + }, + "require": { + "php": ">=5.3.23" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-escaper": "2.*" + }, + "suggest": { + "ext/xdebug": "XDebug, for better backtrace output", + "zendframework/zend-escaper": "To support escaped output" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Debug\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-debug", + "keywords": [ + "debug", + "zf2" + ], + "time": "2015-06-03 14:05:35" + }, + { + "name": "zendframework/zend-escaper", + "version": "2.5.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-escaper.git", + "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73", + "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73", + "shasum": "" + }, + "require": { + "php": ">=5.3.23" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Escaper\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-escaper", + "keywords": [ + "escaper", + "zf2" + ], + "time": "2015-06-03 14:05:37" + }, + { + "name": "zendframework/zend-eventmanager", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-eventmanager.git", + "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/5c80bdee0e952be112dcec0968bad770082c3a6e", + "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0" + }, + "require-dev": { + "athletic/athletic": "^0.1", + "container-interop/container-interop": "^1.1.0", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "^2.0", + "zendframework/zend-stdlib": "^2.7.3 || ^3.0" + }, + "suggest": { + "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature", + "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\EventManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Trigger and listen to events within a PHP application", + "homepage": "https://github.com/zendframework/zend-eventmanager", + "keywords": [ + "event", + "eventmanager", + "events", + "zf2" + ], + "time": "2016-02-18 20:53:00" + }, + { + "name": "zendframework/zend-http", + "version": "2.5.4", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-http.git", + "reference": "7b920b4ec34b5ee58f76eb4e8c408b083121953c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-http/zipball/7b920b4ec34b5ee58f76eb4e8c408b083121953c", + "reference": "7b920b4ec34b5ee58f76eb4e8c408b083121953c", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-loader": "^2.5", + "zendframework/zend-stdlib": "^2.5 || ^3.0", + "zendframework/zend-uri": "^2.5", + "zendframework/zend-validator": "^2.5" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "^4.0", + "zendframework/zend-config": "^2.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Http\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", + "homepage": "https://github.com/zendframework/zend-http", + "keywords": [ + "http", + "zf2" + ], + "time": "2016-02-04 20:36:48" + }, + { + "name": "zendframework/zend-json", + "version": "2.6.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-json.git", + "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", + "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-server": "^2.6.1", + "zendframework/zend-stdlib": "^2.5 || ^3.0", + "zendframework/zendxml": "^1.0.2" + }, + "suggest": { + "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server", + "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server", + "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses", + "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Json\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", + "homepage": "https://github.com/zendframework/zend-json", + "keywords": [ + "json", + "zf2" + ], + "time": "2016-02-04 21:20:26" + }, + { + "name": "zendframework/zend-loader", + "version": "2.5.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-loader.git", + "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c", + "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c", + "shasum": "" + }, + "require": { + "php": ">=5.3.23" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Loader\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-loader", + "keywords": [ + "loader", + "zf2" + ], + "time": "2015-06-03 14:05:47" + }, + { + "name": "zendframework/zend-modulemanager", + "version": "2.7.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-modulemanager.git", + "reference": "2a59ab9a0dd7699a55050dff659ab0f28272b46e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/2a59ab9a0dd7699a55050dff659ab0f28272b46e", + "reference": "2a59ab9a0dd7699a55050dff659ab0f28272b46e", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-config": "^2.6", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-console": "^2.6", + "zendframework/zend-di": "^2.6", + "zendframework/zend-loader": "^2.5", + "zendframework/zend-mvc": "^2.7", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" + }, + "suggest": { + "zendframework/zend-config": "Zend\\Config component", + "zendframework/zend-console": "Zend\\Console component", + "zendframework/zend-loader": "Zend\\Loader component", + "zendframework/zend-mvc": "Zend\\Mvc component", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\ModuleManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-modulemanager", + "keywords": [ + "modulemanager", + "zf2" + ], + "time": "2016-05-16 21:21:11" + }, + { + "name": "zendframework/zend-mvc", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-mvc.git", + "reference": "dc9926ae85798c6765ae4124a19ec24a2e50f6cb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/dc9926ae85798c6765ae4124a19ec24a2e50f6cb", + "reference": "dc9926ae85798c6765ae4124a19ec24a2e50f6cb", + "shasum": "" + }, + "require": { + "container-interop/container-interop": "^1.1", + "php": "^5.6 || ^7.0", + "zendframework/zend-eventmanager": "^3.0", + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-modulemanager": "^2.7.1", + "zendframework/zend-router": "^3.0.1", + "zendframework/zend-servicemanager": "^3.0.3", + "zendframework/zend-stdlib": "^3.0", + "zendframework/zend-view": "^2.6.7" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "^4.5", + "zendframework/zend-json": "^2.6.1 || ^3.0", + "zendframework/zend-psr7bridge": "^0.2" + }, + "suggest": { + "zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable", + "zendframework/zend-mvc-console": "zend-mvc-console provides the ability to expose zend-mvc as a console application", + "zendframework/zend-mvc-i18n": "zend-mvc-i18n provides integration with zend-i18n, including a translation bridge and translatable route segments", + "zendframework/zend-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads", + "zendframework/zend-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests", + "zendframework/zend-mvc-plugin-identity": "To access the authenticated identity (per zend-authentication) in controllers", + "zendframework/zend-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers", + "zendframework/zend-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow", + "zendframework/zend-servicemanager-di": "zend-servicemanager-di provides utilities for integrating zend-di and zend-servicemanager in your zend-mvc application" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Mvc\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-mvc", + "keywords": [ + "mvc", + "zf2" + ], + "time": "2016-06-23 20:39:38" + }, + { + "name": "zendframework/zend-router", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-router.git", + "reference": "03763610632a9022aff22a0e8f340852e68392a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-router/zipball/03763610632a9022aff22a0e8f340852e68392a1", + "reference": "03763610632a9022aff22a0e8f340852e68392a1", + "shasum": "" + }, + "require": { + "container-interop/container-interop": "^1.1", + "php": "^5.5 || ^7.0", + "zendframework/zend-http": "^2.5", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-stdlib": "^2.7.5 || ^3.0" + }, + "conflict": { + "zendframework/zend-mvc": "<3.0.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.5", + "sebastian/version": "^1.0.4", + "squizlabs/php_codesniffer": "^2.3", + "zendframework/zend-i18n": "^2.6" + }, + "suggest": { + "zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" + }, + "zf": { + "component": "Zend\\Router", + "config-provider": "Zend\\Router\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\Router\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-router", + "keywords": [ + "mvc", + "routing", + "zf2" + ], + "time": "2016-05-31 20:47:48" + }, + { + "name": "zendframework/zend-servicemanager", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-servicemanager.git", + "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/90b88339a4b937c6bb0055ee04b2567e7e628f25", + "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25", + "shasum": "" + }, + "require": { + "container-interop/container-interop": "~1.0", + "php": "^5.5 || ^7.0" + }, + "provide": { + "container-interop/container-interop-implementation": "^1.1" + }, + "require-dev": { + "ocramius/proxy-manager": "^1.0 || ^2.0", + "phpbench/phpbench": "^0.10.0", + "phpunit/phpunit": "^4.6 || ^5.2.10", + "squizlabs/php_codesniffer": "^2.5.1" + }, + "suggest": { + "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services", + "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\ServiceManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-servicemanager", + "keywords": [ + "service-manager", + "servicemanager", + "zf" + ], + "time": "2016-06-01 16:50:58" + }, + { + "name": "zendframework/zend-stdlib", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-stdlib.git", + "reference": "8bafa58574204bdff03c275d1d618aaa601588ae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8bafa58574204bdff03c275d1d618aaa601588ae", + "reference": "8bafa58574204bdff03c275d1d618aaa601588ae", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0" + }, + "require-dev": { + "athletic/athletic": "~0.1", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Stdlib\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-stdlib", + "keywords": [ + "stdlib", + "zf2" + ], + "time": "2016-04-12 21:19:36" + }, + { + "name": "zendframework/zend-uri", + "version": "2.5.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-uri.git", + "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/0bf717a239432b1a1675ae314f7c4acd742749ed", + "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-escaper": "^2.5", + "zendframework/zend-validator": "^2.5" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Uri\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", + "homepage": "https://github.com/zendframework/zend-uri", + "keywords": [ + "uri", + "zf2" + ], + "time": "2016-02-17 22:38:51" + }, + { + "name": "zendframework/zend-validator", + "version": "2.8.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-validator.git", + "reference": "8ec9f57a717dd37340308aa632f148a2c2be1cfc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/8ec9f57a717dd37340308aa632f148a2c2be1cfc", + "reference": "8ec9f57a717dd37340308aa632f148a2c2be1cfc", + "shasum": "" + }, + "require": { + "container-interop/container-interop": "^1.1", + "php": "^5.5 || ^7.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "^4.0", + "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-config": "^2.6", + "zendframework/zend-db": "^2.7", + "zendframework/zend-filter": "^2.6", + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-i18n": "^2.6", + "zendframework/zend-math": "^2.6", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-session": "^2.6.2", + "zendframework/zend-uri": "^2.5" + }, + "suggest": { + "zendframework/zend-db": "Zend\\Db component", + "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator", + "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators", + "zendframework/zend-i18n-resources": "Translations of validator messages", + "zendframework/zend-math": "Zend\\Math component", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", + "zendframework/zend-session": "Zend\\Session component", + "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" + }, + "zf": { + "component": "Zend\\Validator", + "config-provider": "Zend\\Validator\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\Validator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides a set of commonly needed validators", + "homepage": "https://github.com/zendframework/zend-validator", + "keywords": [ + "validator", + "zf2" + ], + "time": "2016-06-23 13:44:31" + }, + { + "name": "zendframework/zend-version", + "version": "2.5.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-version.git", + "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-version/zipball/e30c55dc394eaf396f0347887af0a7bef471fe08", + "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08", + "shasum": "" + }, + "require": { + "php": ">=5.3.23", + "zendframework/zend-json": "~2.5" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-http": "~2.5" + }, + "suggest": { + "zendframework/zend-http": "Allows use of Zend\\Http\\Client to check version information", + "zendframework/zend-json": "To check latest version hosted in GitHub" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Version\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-version", + "keywords": [ + "version", + "zf2" + ], + "time": "2015-06-04 15:41:05" + }, + { + "name": "zendframework/zend-view", + "version": "2.8.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-view.git", + "reference": "1516805ed7f04afedbd4600d496437c49847a6cd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-view/zipball/1516805ed7f04afedbd4600d496437c49847a6cd", + "reference": "1516805ed7f04afedbd4600d496437c49847a6cd", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-loader": "^2.5", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "^4.5", + "zendframework/zend-authentication": "^2.5", + "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-config": "^2.6", + "zendframework/zend-console": "^2.6", + "zendframework/zend-escaper": "^2.5", + "zendframework/zend-feed": "^2.7", + "zendframework/zend-filter": "^2.6.1", + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-i18n": "^2.6", + "zendframework/zend-json": "^2.6.1", + "zendframework/zend-log": "^2.7", + "zendframework/zend-modulemanager": "^2.7.1", + "zendframework/zend-mvc": "^2.7", + "zendframework/zend-navigation": "^2.5", + "zendframework/zend-paginator": "^2.5", + "zendframework/zend-permissions-acl": "^2.6", + "zendframework/zend-router": "^3.0.1", + "zendframework/zend-serializer": "^2.6.1", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-session": "^2.6.2", + "zendframework/zend-uri": "^2.5" + }, + "suggest": { + "zendframework/zend-authentication": "Zend\\Authentication component", + "zendframework/zend-escaper": "Zend\\Escaper component", + "zendframework/zend-feed": "Zend\\Feed component", + "zendframework/zend-filter": "Zend\\Filter component", + "zendframework/zend-http": "Zend\\Http component", + "zendframework/zend-i18n": "Zend\\I18n component", + "zendframework/zend-json": "Zend\\Json component", + "zendframework/zend-mvc": "Zend\\Mvc component", + "zendframework/zend-navigation": "Zend\\Navigation component", + "zendframework/zend-paginator": "Zend\\Paginator component", + "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component", + "zendframework/zend-uri": "Zend\\Uri component" + }, + "bin": [ + "bin/templatemap_generator.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\View\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides a system of helpers, output filters, and variable escaping", + "homepage": "https://github.com/zendframework/zend-view", + "keywords": [ + "view", + "zf2" + ], + "time": "2016-06-21 20:58:34" + } + ], + "packages-dev": [ + { + "name": "doctrine/instantiator", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2015-06-14 21:17:01" + }, + { + "name": "fabpot/php-cs-fixer", + "version": "v1.7.1", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "8785276c44a36ca5235a3b6133e3ffbe989ee431" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/8785276c44a36ca5235a3b6133e3ffbe989ee431", + "reference": "8785276c44a36ca5235a3b6133e3ffbe989ee431", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.6", + "sebastian/diff": "~1.1", + "symfony/console": "~2.3", + "symfony/event-dispatcher": "~2.1", + "symfony/filesystem": "~2.1", + "symfony/finder": "~2.1", + "symfony/process": "~2.3", + "symfony/stopwatch": "~2.5" + }, + "require-dev": { + "satooshi/php-coveralls": "0.7.*@dev" + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "Symfony\\CS\\": "Symfony/CS/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "A script to automatically fix Symfony Coding Standard", + "abandoned": "friendsofphp/php-cs-fixer", + "time": "2015-05-04 16:56:09" + }, + { + "name": "myclabs/deep-copy", + "version": "1.5.1", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "a8773992b362b58498eed24bf85005f363c34771" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a8773992b362b58498eed24bf85005f363c34771", + "reference": "a8773992b362b58498eed24bf85005f363c34771", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "doctrine/collections": "1.*", + "phpunit/phpunit": "~4.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "homepage": "https://github.com/myclabs/DeepCopy", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2015-11-20 12:04:31" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "1.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "time": "2015-12-27 11:43:31" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0@dev", + "phpdocumentor/type-resolver": "^0.2.0", + "webmozart/assert": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^4.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "time": "2016-06-10 09:48:41" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "0.2", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443", + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^5.2||^4.8.24" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "time": "2016-06-10 07:14:17" + }, + { + "name": "phpspec/prophecy", + "version": "v1.6.1", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "58a8137754bc24b25740d4281399a4a3596058e0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0", + "reference": "58a8137754bc24b25740d4281399a4a3596058e0", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "sebastian/comparator": "^1.1", + "sebastian/recursion-context": "^1.0" + }, + "require-dev": { + "phpspec/phpspec": "^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2016-06-07 08:13:47" + }, + { + "name": "phpunit/php-code-coverage", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/900370c81280cc0d942ffbc5912d80464eaee7e9", + "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.2", + "phpunit/php-token-stream": "^1.4.2", + "sebastian/code-unit-reverse-lookup": "~1.0", + "sebastian/environment": "^1.3.2", + "sebastian/version": "~1.0|~2.0" + }, + "require-dev": { + "ext-xdebug": ">=2.1.4", + "phpunit/phpunit": "^5.4" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.4.0", + "ext-xmlwriter": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2016-06-03 05:03:56" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2015-06-21 13:08:43" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2015-06-21 13:50:34" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4|~5" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2016-05-12 18:03:57" + }, + { + "name": "phpunit/php-token-stream", + "version": "1.4.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2015-09-15 10:49:45" + }, + { + "name": "phpunit/phpunit", + "version": "5.4.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "2f1fc94b77ea6418bd6a06c64a1dac0645fbce59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2f1fc94b77ea6418bd6a06c64a1dac0645fbce59", + "reference": "2f1fc94b77ea6418bd6a06c64a1dac0645fbce59", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "myclabs/deep-copy": "~1.3", + "php": "^5.6 || ^7.0", + "phpspec/prophecy": "^1.3.1", + "phpunit/php-code-coverage": "^4.0", + "phpunit/php-file-iterator": "~1.4", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "^1.0.6", + "phpunit/phpunit-mock-objects": "^3.2", + "sebastian/comparator": "~1.1", + "sebastian/diff": "~1.2", + "sebastian/environment": "^1.3 || ^2.0", + "sebastian/exporter": "~1.2", + "sebastian/global-state": "~1.0", + "sebastian/object-enumerator": "~1.0", + "sebastian/resource-operations": "~1.0", + "sebastian/version": "~1.0|~2.0", + "symfony/yaml": "~2.1|~3.0" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "3.0.2" + }, + "suggest": { + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2016-06-16 06:01:15" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "3.2.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "b13d0d9426ced06958bd32104653526a6c998a52" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/b13d0d9426ced06958bd32104653526a6c998a52", + "reference": "b13d0d9426ced06958bd32104653526a6c998a52", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.6 || ^7.0", + "phpunit/php-text-template": "^1.2", + "sebastian/exporter": "^1.2" + }, + "conflict": { + "phpunit/phpunit": "<5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.4" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2016-06-12 07:37:26" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe", + "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "phpunit/phpunit": "~5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "time": "2016-02-13 06:45:14" + }, + { + "name": "sebastian/comparator", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2015-07-26 15:48:44" + }, + { + "name": "sebastian/diff", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2015-12-08 07:14:41" + }, + { + "name": "sebastian/environment", + "version": "1.3.7", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2016-05-17 03:18:57" + }, + { + "name": "sebastian/exporter", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/recursion-context": "~1.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2016-06-17 09:04:28" + }, + { + "name": "sebastian/global-state", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2015-10-12 03:26:01" + }, + { + "name": "sebastian/object-enumerator", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "d4ca2fb70344987502567bc50081c03e6192fb26" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26", + "reference": "d4ca2fb70344987502567bc50081c03e6192fb26", + "shasum": "" + }, + "require": { + "php": ">=5.6", + "sebastian/recursion-context": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "~5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2016-01-28 13:25:10" + }, + { + "name": "sebastian/recursion-context", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "913401df809e99e4f47b27cdd781f4a258d58791" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", + "reference": "913401df809e99e4f47b27cdd781f4a258d58791", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2015-11-11 19:50:13" + }, + { + "name": "sebastian/resource-operations", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "shasum": "" + }, + "require": { + "php": ">=5.6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2015-07-28 20:34:47" + }, + { + "name": "sebastian/version", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5", + "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2016-02-04 12:56:52" + }, + { + "name": "symfony/console", + "version": "v2.8.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3", + "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3", + "shasum": "" + }, + "require": { + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/process": "~2.1|~3.0.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "https://symfony.com", + "time": "2016-06-06 15:06:25" + }, + { + "name": "symfony/event-dispatcher", + "version": "v2.8.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "2a6b8713f8bdb582058cfda463527f195b066110" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2a6b8713f8bdb582058cfda463527f195b066110", + "reference": "2a6b8713f8bdb582058cfda463527f195b066110", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "https://symfony.com", + "time": "2016-06-06 11:11:27" + }, + { + "name": "symfony/filesystem", + "version": "v2.8.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "dee379131dceed90a429e951546b33edfe7dccbb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/dee379131dceed90a429e951546b33edfe7dccbb", + "reference": "dee379131dceed90a429e951546b33edfe7dccbb", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "https://symfony.com", + "time": "2016-04-12 18:01:21" + }, + { + "name": "symfony/finder", + "version": "v2.8.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "3ec095fab1800222732ca522a95dce8fa124007b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/3ec095fab1800222732ca522a95dce8fa124007b", + "reference": "3ec095fab1800222732ca522a95dce8fa124007b", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "https://symfony.com", + "time": "2016-06-06 11:11:27" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "dff51f72b0706335131b00a7f49606168c582594" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", + "reference": "dff51f72b0706335131b00a7f49606168c582594", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2016-05-18 14:26:46" + }, + { + "name": "symfony/process", + "version": "v2.8.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "115347d00c342198cdc52a7bd8bc15b5ab43500c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/115347d00c342198cdc52a7bd8bc15b5ab43500c", + "reference": "115347d00c342198cdc52a7bd8bc15b5ab43500c", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Process Component", + "homepage": "https://symfony.com", + "time": "2016-06-06 11:11:27" + }, + { + "name": "symfony/stopwatch", + "version": "v2.8.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "5e628055488bcc42dbace3af65be435d094e37e4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5e628055488bcc42dbace3af65be435d094e37e4", + "reference": "5e628055488bcc42dbace3af65be435d094e37e4", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "https://symfony.com", + "time": "2016-06-06 11:11:27" + }, + { + "name": "symfony/yaml", + "version": "v3.1.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c5a7e7fc273c758b92b85dcb9c46149ccda89623", + "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2016-06-14 11:18:07" + }, + { + "name": "webmozart/assert", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", + "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2015-08-24 13:29:44" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^5.5 || ^7.0" + }, + "platform-dev": [] +} From 3232f5161b4385ee633cdb3ec019f218b4492367 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 26 Jun 2016 04:44:27 +0700 Subject: [PATCH 24/35] remove DEPS=locked from php 5.5 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 35545a0..755fa43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ matrix: - php: 5.5 env: - EXECUTE_CS_CHECK=true - - DEPS=locked - php: 5.5 env: - DEPS=latest From fdaaf23ea349ef6103e2ec82090f99696b77b2d7 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 26 Jun 2016 05:06:08 +0700 Subject: [PATCH 25/35] re-update composer.lock --- .travis.yml | 1 + composer.lock | 2260 +++++++++++++++++++------------------------------ 2 files changed, 892 insertions(+), 1369 deletions(-) diff --git a/.travis.yml b/.travis.yml index 755fa43..35545a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ matrix: - php: 5.5 env: - EXECUTE_CS_CHECK=true + - DEPS=locked - php: 5.5 env: - DEPS=latest diff --git a/composer.lock b/composer.lock index be6a31d..497b907 100644 --- a/composer.lock +++ b/composer.lock @@ -35,64 +35,57 @@ "time": "2014-12-30 15:22:37" }, { - "name": "zendframework/zend-config", - "version": "2.6.0", + "name": "psr/http-message", + "version": "1.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-config.git", - "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d" + "url": "https://github.com/php-fig/http-message.git", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", - "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-filter": "^2.6", - "zendframework/zend-i18n": "^2.5", - "zendframework/zend-json": "^2.6.1", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" - }, - "suggest": { - "zendframework/zend-filter": "Zend\\Filter component", - "zendframework/zend-i18n": "Zend\\I18n component", - "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes", - "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-4": { - "Zend\\Config\\": "src/" + "Psr\\Http\\Message\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } ], - "description": "provides a nested object property based user interface for accessing this configuration data within application code", - "homepage": "https://github.com/zendframework/zend-config", + "description": "Common interface for HTTP messages", "keywords": [ - "config", - "zf2" + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" ], - "time": "2016-02-04 23:01:10" + "time": "2015-05-04 20:22:00" }, { "name": "zendframework/zend-debug", - "version": "2.5.1", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-debug.git", @@ -139,9 +132,59 @@ ], "time": "2015-06-03 14:05:35" }, + { + "name": "zendframework/zend-diactoros", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-diactoros.git", + "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/df65f70fc36f24d51a90ad706a09cd9b74fc4dd8", + "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "~1.0.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.6", + "squizlabs/php_codesniffer": "^2.3.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev", + "dev-develop": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Diactoros\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "description": "PSR HTTP Message implementations", + "homepage": "https://github.com/zendframework/zend-diactoros", + "keywords": [ + "http", + "psr", + "psr-7" + ], + "time": "2015-06-24 20:42:54" + }, { "name": "zendframework/zend-escaper", - "version": "2.5.1", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-escaper.git", @@ -185,37 +228,32 @@ }, { "name": "zendframework/zend-eventmanager", - "version": "3.0.1", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e" + "reference": "b4354f75f694504d32e7d080641854f830acb865" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/5c80bdee0e952be112dcec0968bad770082c3a6e", - "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/b4354f75f694504d32e7d080641854f830acb865", + "reference": "b4354f75f694504d32e7d080641854f830acb865", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0" + "php": ">=5.5", + "zendframework/zend-stdlib": "~2.5" }, "require-dev": { - "athletic/athletic": "^0.1", - "container-interop/container-interop": "^1.1.0", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.0", - "zendframework/zend-stdlib": "^2.7.3 || ^3.0" - }, - "suggest": { - "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature", - "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" + "athletic/athletic": "dev-master", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "dev-master": "2.6-dev", + "dev-develop": "3.0-dev" } }, "autoload": { @@ -227,141 +265,165 @@ "license": [ "BSD-3-Clause" ], - "description": "Trigger and listen to events within a PHP application", "homepage": "https://github.com/zendframework/zend-eventmanager", "keywords": [ - "event", "eventmanager", - "events", "zf2" ], - "time": "2016-02-18 20:53:00" + "time": "2016-01-12 23:08:36" }, { - "name": "zendframework/zend-http", - "version": "2.5.4", + "name": "zendframework/zend-filter", + "version": "2.6.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-http.git", - "reference": "7b920b4ec34b5ee58f76eb4e8c408b083121953c" + "url": "https://github.com/zendframework/zend-filter.git", + "reference": "8682c12e9870c431cf29cbb7010627f3fa88dec8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-http/zipball/7b920b4ec34b5ee58f76eb4e8c408b083121953c", - "reference": "7b920b4ec34b5ee58f76eb4e8c408b083121953c", + "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/8682c12e9870c431cf29cbb7010627f3fa88dec8", + "reference": "8682c12e9870c431cf29cbb7010627f3fa88dec8", "shasum": "" }, "require": { "php": "^5.5 || ^7.0", - "zendframework/zend-loader": "^2.5", - "zendframework/zend-stdlib": "^2.5 || ^3.0", - "zendframework/zend-uri": "^2.5", - "zendframework/zend-validator": "^2.5" + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.0", - "zendframework/zend-config": "^2.5" + "pear/archive_tar": "^1.4", + "phpunit/phpunit": "~4.0", + "zendframework/zend-crypt": "^2.6", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-uri": "^2.5" + }, + "suggest": { + "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters", + "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality", + "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload": { "psr-4": { - "Zend\\Http\\": "src/" + "Zend\\Filter\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", - "homepage": "https://github.com/zendframework/zend-http", + "description": "provides a set of commonly needed data filters", + "homepage": "https://github.com/zendframework/zend-filter", "keywords": [ - "http", + "filter", "zf2" ], - "time": "2016-02-04 20:36:48" + "time": "2016-02-04 19:52:41" }, { - "name": "zendframework/zend-json", - "version": "2.6.1", + "name": "zendframework/zend-form", + "version": "2.7.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-json.git", - "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28" + "url": "https://github.com/zendframework/zend-form.git", + "reference": "7c46b6a2d04d12aacd9c32bb021d0d9d0354d5d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", - "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", + "url": "https://api.github.com/repos/zendframework/zend-form/zipball/7c46b6a2d04d12aacd9c32bb021d0d9d0354d5d5", + "reference": "7c46b6a2d04d12aacd9c32bb021d0d9d0354d5d5", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0" + "php": "^5.5 || ^7.0", + "zendframework/zend-hydrator": "^1.1 || ^2.1", + "zendframework/zend-inputfilter": "^2.6", + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { + "doctrine/annotations": "~1.0", "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "~4.0", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-server": "^2.6.1", - "zendframework/zend-stdlib": "^2.5 || ^3.0", - "zendframework/zendxml": "^1.0.2" + "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-captcha": "^2.5", + "zendframework/zend-code": "^2.6", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-filter": "^2.6", + "zendframework/zend-i18n": "^2.6", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-session": "^2.5", + "zendframework/zend-text": "^2.6", + "zendframework/zend-validator": "^2.6", + "zendframework/zend-view": "^2.6.2", + "zendframework/zendservice-recaptcha": "*" }, "suggest": { - "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server", - "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server", - "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses", - "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage" + "zendframework/zend-captcha": "Zend\\Captcha component", + "zendframework/zend-code": "Zend\\Code component", + "zendframework/zend-eventmanager": "Zend\\EventManager component", + "zendframework/zend-filter": "Zend\\Filter component", + "zendframework/zend-i18n": "Zend\\I18n component", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component", + "zendframework/zend-validator": "Zend\\Validator component", + "zendframework/zend-view": "Zend\\View component", + "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" } }, "autoload": { "psr-4": { - "Zend\\Json\\": "src/" + "Zend\\Form\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", - "homepage": "https://github.com/zendframework/zend-json", + "homepage": "https://github.com/zendframework/zend-form", "keywords": [ - "json", + "form", "zf2" ], - "time": "2016-02-04 21:20:26" + "time": "2016-02-22 21:41:46" }, { - "name": "zendframework/zend-loader", + "name": "zendframework/zend-http", "version": "2.5.1", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-loader.git", - "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c" + "url": "https://github.com/zendframework/zend-http.git", + "reference": "6cc6dee9a27fc07e0167d8779ab2258747108ed5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c", - "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c", + "url": "https://api.github.com/repos/zendframework/zend-http/zipball/6cc6dee9a27fc07e0167d8779ab2258747108ed5", + "reference": "6cc6dee9a27fc07e0167d8779ab2258747108ed5", "shasum": "" }, "require": { - "php": ">=5.3.23" + "php": ">=5.3.23", + "zendframework/zend-loader": "~2.5", + "zendframework/zend-stdlib": "~2.5", + "zendframework/zend-uri": "~2.5", + "zendframework/zend-validator": "~2.5" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.0", + "zendframework/zend-config": "~2.5" }, "type": "library", "extra": { @@ -372,323 +434,553 @@ }, "autoload": { "psr-4": { - "Zend\\Loader\\": "src/" + "Zend\\Http\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-loader", + "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", + "homepage": "https://github.com/zendframework/zend-http", "keywords": [ - "loader", + "http", "zf2" ], - "time": "2015-06-03 14:05:47" + "time": "2015-06-03 15:32:01" }, { - "name": "zendframework/zend-modulemanager", - "version": "2.7.2", + "name": "zendframework/zend-hydrator", + "version": "1.1.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-modulemanager.git", - "reference": "2a59ab9a0dd7699a55050dff659ab0f28272b46e" + "url": "https://github.com/zendframework/zend-hydrator.git", + "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/2a59ab9a0dd7699a55050dff659ab0f28272b46e", - "reference": "2a59ab9a0dd7699a55050dff659ab0f28272b46e", + "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65", + "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65", "shasum": "" }, "require": { "php": "^5.5 || ^7.0", - "zendframework/zend-config": "^2.6", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "~4.0", - "zendframework/zend-console": "^2.6", - "zendframework/zend-di": "^2.6", - "zendframework/zend-loader": "^2.5", - "zendframework/zend-mvc": "^2.7", + "squizlabs/php_codesniffer": "^2.0@dev", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-filter": "^2.6", + "zendframework/zend-inputfilter": "^2.6", + "zendframework/zend-serializer": "^2.6.1", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" }, "suggest": { - "zendframework/zend-config": "Zend\\Config component", - "zendframework/zend-console": "Zend\\Console component", - "zendframework/zend-loader": "Zend\\Loader component", - "zendframework/zend-mvc": "Zend\\Mvc component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component" + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage", + "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage", + "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-release-1.0": "1.0-dev", + "dev-release-1.1": "1.1-dev", + "dev-master": "2.0-dev", + "dev-develop": "2.1-dev" } }, "autoload": { "psr-4": { - "Zend\\ModuleManager\\": "src/" + "Zend\\Hydrator\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-modulemanager", + "homepage": "https://github.com/zendframework/zend-hydrator", "keywords": [ - "modulemanager", + "hydrator", "zf2" ], - "time": "2016-05-16 21:21:11" + "time": "2016-02-18 22:38:26" }, { - "name": "zendframework/zend-mvc", - "version": "3.0.1", + "name": "zendframework/zend-inputfilter", + "version": "2.6.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-mvc.git", - "reference": "dc9926ae85798c6765ae4124a19ec24a2e50f6cb" + "url": "https://github.com/zendframework/zend-inputfilter.git", + "reference": "b3b043284b7eec2ae5a3c51e1f81db06f2e167a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/dc9926ae85798c6765ae4124a19ec24a2e50f6cb", - "reference": "dc9926ae85798c6765ae4124a19ec24a2e50f6cb", + "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/b3b043284b7eec2ae5a3c51e1f81db06f2e167a1", + "reference": "b3b043284b7eec2ae5a3c51e1f81db06f2e167a1", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.1", - "php": "^5.6 || ^7.0", - "zendframework/zend-eventmanager": "^3.0", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-router": "^3.0.1", - "zendframework/zend-servicemanager": "^3.0.3", - "zendframework/zend-stdlib": "^3.0", - "zendframework/zend-view": "^2.6.7" + "php": "^5.5 || ^7.0", + "zendframework/zend-filter": "^2.6", + "zendframework/zend-stdlib": "^2.7 || ^3.0", + "zendframework/zend-validator": "^2.6" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "^4.5", - "zendframework/zend-json": "^2.6.1 || ^3.0", - "zendframework/zend-psr7bridge": "^0.2" + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" }, "suggest": { - "zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable", - "zendframework/zend-mvc-console": "zend-mvc-console provides the ability to expose zend-mvc as a console application", - "zendframework/zend-mvc-i18n": "zend-mvc-i18n provides integration with zend-i18n, including a translation bridge and translatable route segments", - "zendframework/zend-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads", - "zendframework/zend-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests", - "zendframework/zend-mvc-plugin-identity": "To access the authenticated identity (per zend-authentication) in controllers", - "zendframework/zend-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers", - "zendframework/zend-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow", - "zendframework/zend-servicemanager-di": "zend-servicemanager-di provides utilities for integrating zend-di and zend-servicemanager in your zend-mvc application" + "zendframework/zend-servicemanager": "To support plugin manager support" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload": { "psr-4": { - "Zend\\Mvc\\": "src/" + "Zend\\InputFilter\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-mvc", + "homepage": "https://github.com/zendframework/zend-inputfilter", "keywords": [ - "mvc", + "inputfilter", "zf2" ], - "time": "2016-06-23 20:39:38" + "time": "2016-02-18 19:49:24" }, { - "name": "zendframework/zend-router", - "version": "3.0.2", + "name": "zendframework/zend-json", + "version": "2.5.1", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-router.git", - "reference": "03763610632a9022aff22a0e8f340852e68392a1" + "url": "https://github.com/zendframework/zend-json.git", + "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-router/zipball/03763610632a9022aff22a0e8f340852e68392a1", - "reference": "03763610632a9022aff22a0e8f340852e68392a1", + "url": "https://api.github.com/repos/zendframework/zend-json/zipball/c74eaf17d2dd37dc1e964be8dfde05706a821ebc", + "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.1", - "php": "^5.5 || ^7.0", - "zendframework/zend-http": "^2.5", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-stdlib": "^2.7.5 || ^3.0" - }, - "conflict": { - "zendframework/zend-mvc": "<3.0.0" + "php": ">=5.3.23", + "zendframework/zend-stdlib": "~2.5" }, "require-dev": { - "phpunit/phpunit": "^4.5", - "sebastian/version": "^1.0.4", - "squizlabs/php_codesniffer": "^2.3", - "zendframework/zend-i18n": "^2.6" + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-http": "~2.5", + "zendframework/zend-server": "~2.5", + "zendframework/zendxml": "~1.0" }, "suggest": { - "zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments" + "zendframework/zend-http": "Zend\\Http component", + "zendframework/zend-server": "Zend\\Server component", + "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" - }, - "zf": { - "component": "Zend\\Router", - "config-provider": "Zend\\Router\\ConfigProvider" + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" } }, "autoload": { "psr-4": { - "Zend\\Router\\": "src/" + "Zend\\Json\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-router", + "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", + "homepage": "https://github.com/zendframework/zend-json", "keywords": [ - "mvc", - "routing", + "json", "zf2" ], - "time": "2016-05-31 20:47:48" + "time": "2015-06-03 15:32:01" }, { - "name": "zendframework/zend-servicemanager", - "version": "3.1.0", + "name": "zendframework/zend-loader", + "version": "2.5.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-servicemanager.git", - "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25" + "url": "https://github.com/zendframework/zend-loader.git", + "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/90b88339a4b937c6bb0055ee04b2567e7e628f25", - "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25", + "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c", + "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c", "shasum": "" }, "require": { - "container-interop/container-interop": "~1.0", - "php": "^5.5 || ^7.0" - }, - "provide": { - "container-interop/container-interop-implementation": "^1.1" + "php": ">=5.3.23" }, "require-dev": { - "ocramius/proxy-manager": "^1.0 || ^2.0", - "phpbench/phpbench": "^0.10.0", - "phpunit/phpunit": "^4.6 || ^5.2.10", - "squizlabs/php_codesniffer": "^2.5.1" - }, - "suggest": { - "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services", - "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances" + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" } }, "autoload": { "psr-4": { - "Zend\\ServiceManager\\": "src/" + "Zend\\Loader\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-servicemanager", + "homepage": "https://github.com/zendframework/zend-loader", "keywords": [ - "service-manager", - "servicemanager", - "zf" + "loader", + "zf2" ], - "time": "2016-06-01 16:50:58" + "time": "2015-06-03 14:05:47" }, { - "name": "zendframework/zend-stdlib", - "version": "3.0.1", + "name": "zendframework/zend-modulemanager", + "version": "2.7.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "8bafa58574204bdff03c275d1d618aaa601588ae" + "url": "https://github.com/zendframework/zend-modulemanager.git", + "reference": "fe5a156df1ae4245c7b4a7b2b9067545761f59d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8bafa58574204bdff03c275d1d618aaa601588ae", - "reference": "8bafa58574204bdff03c275d1d618aaa601588ae", + "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/fe5a156df1ae4245c7b4a7b2b9067545761f59d7", + "reference": "fe5a156df1ae4245c7b4a7b2b9067545761f59d7", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0" + "php": "^5.5 || ^7.0", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "athletic/athletic": "~0.1", "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.0", + "zendframework/zend-config": "^2.6", + "zendframework/zend-console": "^2.6", + "zendframework/zend-di": "^2.6", + "zendframework/zend-loader": "^2.5", + "zendframework/zend-servicemanager": "^3.0.3" + }, + "suggest": { + "zendframework/zend-config": "Zend\\Config component", + "zendframework/zend-console": "Zend\\Console component", + "zendframework/zend-loader": "Zend\\Loader component", + "zendframework/zend-mvc": "Zend\\Mvc component", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" } }, "autoload": { "psr-4": { - "Zend\\Stdlib\\": "src/" + "Zend\\ModuleManager\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-stdlib", + "homepage": "https://github.com/zendframework/zend-modulemanager", "keywords": [ - "stdlib", + "modulemanager", "zf2" ], - "time": "2016-04-12 21:19:36" + "time": "2016-02-25 18:22:47" }, { - "name": "zendframework/zend-uri", - "version": "2.5.2", + "name": "zendframework/zend-mvc", + "version": "2.7.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-uri.git", - "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed" + "url": "https://github.com/zendframework/zend-mvc.git", + "reference": "073d391a4996ff0ad338fff3f92cadf5aeecda9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/0bf717a239432b1a1675ae314f7c4acd742749ed", - "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed", + "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/073d391a4996ff0ad338fff3f92cadf5aeecda9c", + "reference": "073d391a4996ff0ad338fff3f92cadf5aeecda9c", "shasum": "" }, "require": { + "container-interop/container-interop": "^1.1", "php": "^5.5 || ^7.0", - "zendframework/zend-escaper": "^2.5", - "zendframework/zend-validator": "^2.5" + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-form": "^2.7", + "zendframework/zend-hydrator": "^1.1 || ^2.1", + "zendframework/zend-psr7bridge": "^0.2", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-stdlib": "^2.7.5 || ^3.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-authentication": "^2.5.3", + "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-console": "^2.6", + "zendframework/zend-di": "^2.6", + "zendframework/zend-filter": "^2.6.1", + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-i18n": "^2.6", + "zendframework/zend-inputfilter": "^2.6", + "zendframework/zend-json": "^2.6.1", + "zendframework/zend-log": "^2.7.1", + "zendframework/zend-modulemanager": "^2.7.1", + "zendframework/zend-serializer": "^2.6.1", + "zendframework/zend-session": "^2.6.2", + "zendframework/zend-text": "^2.6", + "zendframework/zend-uri": "^2.5", + "zendframework/zend-validator": "^2.6", + "zendframework/zend-version": "^2.5", + "zendframework/zend-view": "^2.6.3" + }, + "suggest": { + "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin", + "zendframework/zend-config": "Zend\\Config component", + "zendframework/zend-console": "Zend\\Console component", + "zendframework/zend-di": "Zend\\Di component", + "zendframework/zend-filter": "Zend\\Filter component", + "zendframework/zend-http": "Zend\\Http component", + "zendframework/zend-i18n": "Zend\\I18n component for translatable segments", + "zendframework/zend-inputfilter": "Zend\\Inputfilter component", + "zendframework/zend-json": "Zend\\Json component", + "zendframework/zend-log": "Zend\\Log component", + "zendframework/zend-modulemanager": "Zend\\ModuleManager component", + "zendframework/zend-serializer": "Zend\\Serializer component", + "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins", + "zendframework/zend-text": "Zend\\Text component", + "zendframework/zend-uri": "Zend\\Uri component", + "zendframework/zend-validator": "Zend\\Validator component", + "zendframework/zend-version": "Zend\\Version component", + "zendframework/zend-view": "Zend\\View component" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Mvc\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-mvc", + "keywords": [ + "mvc", + "zf2" + ], + "time": "2016-03-01 19:19:37" + }, + { + "name": "zendframework/zend-psr7bridge", + "version": "0.2.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-psr7bridge.git", + "reference": "b7a819be28819a90c9d2c24656db00c880e12ed2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/b7a819be28819a90c9d2c24656db00c880e12ed2", + "reference": "b7a819be28819a90c9d2c24656db00c880e12ed2", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "psr/http-message": "^1.0", + "zendframework/zend-diactoros": "^1.1", + "zendframework/zend-http": "^2.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.7", + "squizlabs/php_codesniffer": "^2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev", + "dev-develop": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Psr7Bridge\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "PSR-7 <-> Zend\\Http bridge", + "homepage": "https://github.com/zendframework/zend-psr7bridge", + "keywords": [ + "http", + "psr", + "psr-7" + ], + "time": "2015-09-28 15:47:35" + }, + { + "name": "zendframework/zend-servicemanager", + "version": "2.7.5", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-servicemanager.git", + "reference": "fb5b54db5ead533b38e311f14e9c01a79218bf2b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/fb5b54db5ead533b38e311f14e9c01a79218bf2b", + "reference": "fb5b54db5ead533b38e311f14e9c01a79218bf2b", + "shasum": "" + }, + "require": { + "container-interop/container-interop": "~1.0", + "php": "^5.5 || ^7.0" + }, + "require-dev": { + "athletic/athletic": "dev-master", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-di": "~2.5", + "zendframework/zend-mvc": "~2.5" + }, + "suggest": { + "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services", + "zendframework/zend-di": "Zend\\Di component" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\ServiceManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-servicemanager", + "keywords": [ + "servicemanager", + "zf2" + ], + "time": "2016-02-02 14:11:46" + }, + { + "name": "zendframework/zend-stdlib", + "version": "2.7.5", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-stdlib.git", + "reference": "b894a85f3ef8a52e7aa62c3c5aa245e383c70cca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/b894a85f3ef8a52e7aa62c3c5aa245e383c70cca", + "reference": "b894a85f3ef8a52e7aa62c3c5aa245e383c70cca", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-hydrator": "~1.0" + }, + "require-dev": { + "athletic/athletic": "~0.1", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-config": "~2.5", + "zendframework/zend-eventmanager": "~2.5", + "zendframework/zend-filter": "~2.5", + "zendframework/zend-inputfilter": "~2.5", + "zendframework/zend-serializer": "~2.5", + "zendframework/zend-servicemanager": "~2.5" + }, + "suggest": { + "zendframework/zend-eventmanager": "To support aggregate hydrator usage", + "zendframework/zend-filter": "To support naming strategy hydrator usage", + "zendframework/zend-serializer": "Zend\\Serializer component", + "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-release-2.7": "2.7-dev", + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Stdlib\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-stdlib", + "keywords": [ + "stdlib", + "zf2" + ], + "time": "2016-02-16 18:25:48" + }, + { + "name": "zendframework/zend-uri", + "version": "2.5.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-uri.git", + "reference": "fe6c7f4c8d9037fe551898a538a2b6d39483f572" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/fe6c7f4c8d9037fe551898a538a2b6d39483f572", + "reference": "fe6c7f4c8d9037fe551898a538a2b6d39483f572", + "shasum": "" + }, + "require": { + "php": ">=5.3.23", + "zendframework/zend-escaper": "~2.5", + "zendframework/zend-validator": "~2.5" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", @@ -716,20 +1008,20 @@ "uri", "zf2" ], - "time": "2016-02-17 22:38:51" + "time": "2015-06-03 15:32:03" }, { "name": "zendframework/zend-validator", - "version": "2.8.1", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-validator.git", - "reference": "8ec9f57a717dd37340308aa632f148a2c2be1cfc" + "reference": "1315fead53358054e3f5fcf440c1a4cd5f0724db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/8ec9f57a717dd37340308aa632f148a2c2be1cfc", - "reference": "8ec9f57a717dd37340308aa632f148a2c2be1cfc", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/1315fead53358054e3f5fcf440c1a4cd5f0724db", + "reference": "1315fead53358054e3f5fcf440c1a4cd5f0724db", "shasum": "" }, "require": { @@ -742,13 +1034,13 @@ "phpunit/phpunit": "^4.0", "zendframework/zend-cache": "^2.6.1", "zendframework/zend-config": "^2.6", - "zendframework/zend-db": "^2.7", + "zendframework/zend-db": "^2.5", "zendframework/zend-filter": "^2.6", "zendframework/zend-http": "^2.5.4", "zendframework/zend-i18n": "^2.6", "zendframework/zend-math": "^2.6", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-session": "^2.6.2", + "zendframework/zend-session": "^2.5", "zendframework/zend-uri": "^2.5" }, "suggest": { @@ -764,12 +1056,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" - }, - "zf": { - "component": "Zend\\Validator", - "config-provider": "Zend\\Validator\\ConfigProvider" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload": { @@ -787,30 +1075,30 @@ "validator", "zf2" ], - "time": "2016-06-23 13:44:31" + "time": "2016-02-17 17:59:34" }, { "name": "zendframework/zend-version", - "version": "2.5.1", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-version.git", - "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08" + "reference": "4090b29643a4cc543486afabb941634d3c57fc00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-version/zipball/e30c55dc394eaf396f0347887af0a7bef471fe08", - "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08", + "url": "https://api.github.com/repos/zendframework/zend-version/zipball/4090b29643a4cc543486afabb941634d3c57fc00", + "reference": "4090b29643a4cc543486afabb941634d3c57fc00", "shasum": "" }, "require": { "php": ">=5.3.23", - "zendframework/zend-json": "~2.5" + "zendframework/zend-json": "~2.5.0" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "~4.0", - "zendframework/zend-http": "~2.5" + "zendframework/zend-http": "~2.5.0" }, "suggest": { "zendframework/zend-http": "Allows use of Zend\\Http\\Client to check version information", @@ -837,20 +1125,20 @@ "version", "zf2" ], - "time": "2015-06-04 15:41:05" + "time": "2015-06-03 14:06:03" }, { "name": "zendframework/zend-view", - "version": "2.8.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-view.git", - "reference": "1516805ed7f04afedbd4600d496437c49847a6cd" + "reference": "3c09c9e8477716ea539df4544d4bbbffdd8d6132" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-view/zipball/1516805ed7f04afedbd4600d496437c49847a6cd", - "reference": "1516805ed7f04afedbd4600d496437c49847a6cd", + "url": "https://api.github.com/repos/zendframework/zend-view/zipball/3c09c9e8477716ea539df4544d4bbbffdd8d6132", + "reference": "3c09c9e8477716ea539df4544d4bbbffdd8d6132", "shasum": "" }, "require": { @@ -861,7 +1149,7 @@ }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.5", + "phpunit/phpunit": "~4.0", "zendframework/zend-authentication": "^2.5", "zendframework/zend-cache": "^2.6.1", "zendframework/zend-config": "^2.6", @@ -873,15 +1161,13 @@ "zendframework/zend-i18n": "^2.6", "zendframework/zend-json": "^2.6.1", "zendframework/zend-log": "^2.7", - "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-mvc": "^2.7", + "zendframework/zend-mvc": "^2.6.1", "zendframework/zend-navigation": "^2.5", "zendframework/zend-paginator": "^2.5", "zendframework/zend-permissions-acl": "^2.6", - "zendframework/zend-router": "^3.0.1", "zendframework/zend-serializer": "^2.6.1", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-session": "^2.6.2", + "zendframework/zend-session": "^2.5", "zendframework/zend-uri": "^2.5" }, "suggest": { @@ -899,14 +1185,11 @@ "zendframework/zend-servicemanager": "Zend\\ServiceManager component", "zendframework/zend-uri": "Zend\\Uri component" }, - "bin": [ - "bin/templatemap_generator.php" - ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload": { @@ -924,76 +1207,22 @@ "view", "zf2" ], - "time": "2016-06-21 20:58:34" + "time": "2016-02-17 23:33:10" } ], "packages-dev": [ - { - "name": "doctrine/instantiator", - "version": "1.0.5", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", - "shasum": "" - }, - "require": { - "php": ">=5.3,<8.0-DEV" - }, - "require-dev": { - "athletic/athletic": "~0.1.8", - "ext-pdo": "*", - "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", - "keywords": [ - "constructor", - "instantiate" - ], - "time": "2015-06-14 21:17:01" - }, { "name": "fabpot/php-cs-fixer", - "version": "v1.7.1", + "version": "v1.7", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "8785276c44a36ca5235a3b6133e3ffbe989ee431" + "reference": "6425aeb97ab921371182712a18c280d546e7769b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/8785276c44a36ca5235a3b6133e3ffbe989ee431", - "reference": "8785276c44a36ca5235a3b6133e3ffbe989ee431", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/6425aeb97ab921371182712a18c280d546e7769b", + "reference": "6425aeb97ab921371182712a18c280d546e7769b", "shasum": "" }, "require": { @@ -1035,311 +1264,62 @@ ], "description": "A script to automatically fix Symfony Coding Standard", "abandoned": "friendsofphp/php-cs-fixer", - "time": "2015-05-04 16:56:09" + "time": "2015-04-16 07:21:30" }, { - "name": "myclabs/deep-copy", - "version": "1.5.1", + "name": "phpunit/php-code-coverage", + "version": "2.0.0", "source": { "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "a8773992b362b58498eed24bf85005f363c34771" + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "cbdd64d012c9b8c2e30850abd125001ed5db1eed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a8773992b362b58498eed24bf85005f363c34771", - "reference": "a8773992b362b58498eed24bf85005f363c34771", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cbdd64d012c9b8c2e30850abd125001ed5db1eed", + "reference": "cbdd64d012c9b8c2e30850abd125001ed5db1eed", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=5.3.3", + "phpunit/php-file-iterator": "~1.3.1", + "phpunit/php-text-template": "~1.2", + "phpunit/php-token-stream": "~1.1.3", + "sebastian/environment": "~1.0", + "sebastian/version": "~1.0" }, "require-dev": { - "doctrine/collections": "1.*", - "phpunit/phpunit": "~4.1" + "ext-xdebug": ">=2.1.4", + "phpunit/phpunit": ">=4.0.0,<4.1.0" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.2.1" }, "type": "library", - "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" } }, + "autoload": { + "classmap": [ + "src/" + ] + }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], "license": [ - "MIT" + "BSD-3-Clause" ], - "description": "Create deep copies (clones) of your objects", - "homepage": "https://github.com/myclabs/DeepCopy", - "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" - ], - "time": "2015-11-20 12:04:31" - }, - { - "name": "phpdocumentor/reflection-common", - "version": "1.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2015-12-27 11:43:31" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", - "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", - "webmozart/assert": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-06-10 09:48:41" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "0.2", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443", - "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "time": "2016-06-10 07:14:17" - }, - { - "name": "phpspec/prophecy", - "version": "v1.6.1", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "58a8137754bc24b25740d4281399a4a3596058e0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0", - "reference": "58a8137754bc24b25740d4281399a4a3596058e0", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", - "sebastian/comparator": "^1.1", - "sebastian/recursion-context": "^1.0" - }, - "require-dev": { - "phpspec/phpspec": "^2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.6.x-dev" - } - }, - "autoload": { - "psr-0": { - "Prophecy\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "time": "2016-06-07 08:13:47" - }, - { - "name": "phpunit/php-code-coverage", - "version": "4.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/900370c81280cc0d942ffbc5912d80464eaee7e9", - "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.2", - "phpunit/php-token-stream": "^1.4.2", - "sebastian/code-unit-reverse-lookup": "~1.0", - "sebastian/environment": "^1.3.2", - "sebastian/version": "~1.0|~2.0" - }, - "require-dev": { - "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "^5.4" - }, - "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.4.0", - "ext-xmlwriter": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } ], "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", "homepage": "https://github.com/sebastianbergmann/php-code-coverage", @@ -1348,37 +1328,35 @@ "testing", "xunit" ], - "time": "2016-06-03 05:03:56" + "time": "2014-03-07 06:40:32" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.1", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" + "reference": "46b0610951db3a918ee7842bc0d471e72c1d0d46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", - "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/46b0610951db3a918ee7842bc0d471e72c1d0d46", + "reference": "46b0610951db3a918ee7842bc0d471e72c1d0d46", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.2.7" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, "autoload": { - "classmap": [ - "src/" + "files": [ + "File/Iterator/Autoload.php" ] }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], "license": [ "BSD-3-Clause" ], @@ -1390,25 +1368,25 @@ } ], "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "homepage": "http://www.phpunit.de/", "keywords": [ "filesystem", "iterator" ], - "time": "2015-06-21 13:08:43" + "time": "2012-09-22 00:00:00" }, { "name": "phpunit/php-text-template", - "version": "1.2.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", "shasum": "" }, "require": { @@ -1417,17 +1395,20 @@ "type": "library", "autoload": { "classmap": [ - "src/" + "Text/" ] }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", + "email": "sb@sebastian-bergmann.de", "role": "lead" } ], @@ -1436,35 +1417,35 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2014-01-30 17:20:04" }, { "name": "phpunit/php-timer", - "version": "1.0.8", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" + "reference": "5175e9bb35fc9cc430973ed83a3d62531c3c8698" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5175e9bb35fc9cc430973ed83a3d62531c3c8698", + "reference": "5175e9bb35fc9cc430973ed83a3d62531c3c8698", "shasum": "" }, "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4|~5" + "php": ">=5.2.7" }, "type": "library", "autoload": { - "classmap": [ - "src/" + "files": [ + "PHP/Timer/Autoload.php" ] }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], "license": [ "BSD-3-Clause" ], @@ -1476,103 +1457,92 @@ } ], "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", + "homepage": "http://www.phpunit.de/", "keywords": [ "timer" ], - "time": "2016-05-12 18:03:57" + "time": "2012-09-23 00:00:00" }, { "name": "phpunit/php-token-stream", - "version": "1.4.8", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" + "reference": "dd11f1b0c071dc46fe711a7dd331db1b2179b9be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", - "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/dd11f1b0c071dc46fe711a7dd331db1b2179b9be", + "reference": "dd11f1b0c071dc46fe711a7dd331db1b2179b9be", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.2" + "php": ">=5.2.7" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, "autoload": { - "classmap": [ - "src/" + "files": [ + "PHP/Token/Stream/Autoload.php" ] }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sb@sebastian-bergmann.de", + "role": "lead" } ], "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "homepage": "http://www.phpunit.de/", "keywords": [ "tokenizer" ], - "time": "2015-09-15 10:49:45" + "time": "2012-09-23 00:00:00" }, { "name": "phpunit/phpunit", - "version": "5.4.6", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "2f1fc94b77ea6418bd6a06c64a1dac0645fbce59" + "reference": "b3a7c58bc39f01577f89d63da1ec578e1e993f1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2f1fc94b77ea6418bd6a06c64a1dac0645fbce59", - "reference": "2f1fc94b77ea6418bd6a06c64a1dac0645fbce59", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b3a7c58bc39f01577f89d63da1ec578e1e993f1a", + "reference": "b3a7c58bc39f01577f89d63da1ec578e1e993f1a", "shasum": "" }, "require": { "ext-dom": "*", - "ext-json": "*", "ext-pcre": "*", "ext-reflection": "*", "ext-spl": "*", - "myclabs/deep-copy": "~1.3", - "php": "^5.6 || ^7.0", - "phpspec/prophecy": "^1.3.1", - "phpunit/php-code-coverage": "^4.0", - "phpunit/php-file-iterator": "~1.4", + "php": ">=5.3.3", + "phpunit/php-code-coverage": ">=2.0.0,<2.1.0", + "phpunit/php-file-iterator": "~1.3.1", "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^3.2", - "sebastian/comparator": "~1.1", - "sebastian/diff": "~1.2", - "sebastian/environment": "^1.3 || ^2.0", - "sebastian/exporter": "~1.2", - "sebastian/global-state": "~1.0", - "sebastian/object-enumerator": "~1.0", - "sebastian/resource-operations": "~1.0", - "sebastian/version": "~1.0|~2.0", - "symfony/yaml": "~2.1|~3.0" - }, - "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2" + "phpunit/php-timer": "~1.0.2", + "phpunit/phpunit-mock-objects": ">=2.0.0,<2.1.0", + "sebastian/diff": "~1.1", + "sebastian/environment": "~1.0", + "sebastian/exporter": "~1.0.1", + "sebastian/version": "~1.0", + "symfony/yaml": "~2.0" }, "suggest": { + "ext-json": "*", + "ext-simplexml": "*", + "ext-tokenizer": "*", "phpunit/php-invoker": "~1.1" }, "bin": [ @@ -1581,278 +1551,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ], - "time": "2016-06-16 06:01:15" - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "3.2.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "b13d0d9426ced06958bd32104653526a6c998a52" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/b13d0d9426ced06958bd32104653526a6c998a52", - "reference": "b13d0d9426ced06958bd32104653526a6c998a52", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.6 || ^7.0", - "phpunit/php-text-template": "^1.2", - "sebastian/exporter": "^1.2" - }, - "conflict": { - "phpunit/phpunit": "<5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.4" - }, - "suggest": { - "ext-soap": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ], - "time": "2016-06-12 07:37:26" - }, - { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe", - "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": "~5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2016-02-13 06:45:14" - }, - { - "name": "sebastian/comparator", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", - "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", - "keywords": [ - "comparator", - "compare", - "equality" - ], - "time": "2015-07-26 15:48:44" - }, - { - "name": "sebastian/diff", - "version": "1.4.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", - "keywords": [ - "diff" - ], - "time": "2015-12-08 07:14:41" - }, - { - "name": "sebastian/environment", - "version": "1.3.7", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", - "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -1861,118 +1560,57 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", - "keywords": [ - "Xdebug", - "environment", - "hhvm" + "include-path": [ + "", + "../../symfony/yaml/" ], - "time": "2016-05-17 03:18:57" - }, - { - "name": "sebastian/exporter", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", - "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~1.0" - }, - "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, + ], + "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", + "description": "The PHP Unit Testing framework.", + "homepage": "http://www.phpunit.de/", "keywords": [ - "export", - "exporter" + "phpunit", + "testing", + "xunit" ], - "time": "2016-06-17 09:04:28" + "time": "2014-03-07 07:00:44" }, { - "name": "sebastian/global-state", - "version": "1.1.1", + "name": "phpunit/phpunit-mock-objects", + "version": "2.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "f055539b22449034af4d232549c53b6cd49b9cff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/f055539b22449034af4d232549c53b6cd49b9cff", + "reference": "f055539b22449034af4d232549c53b6cd49b9cff", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.3", + "phpunit/php-text-template": "~1.2" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": ">=4.0.0,<4.1.0" }, "suggest": { - "ext-uopz": "*" + "ext-soap": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1981,47 +1619,48 @@ ] }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sb@sebastian-bergmann.de", + "role": "lead" } ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", "keywords": [ - "global state" + "mock", + "xunit" ], - "time": "2015-10-12 03:26:01" + "time": "2014-03-07 06:53:16" }, { - "name": "sebastian/object-enumerator", - "version": "1.0.0", + "name": "sebastian/diff", + "version": "1.1.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "d4ca2fb70344987502567bc50081c03e6192fb26" + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26", - "reference": "d4ca2fb70344987502567bc50081c03e6192fb26", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d", + "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d", "shasum": "" }, "require": { - "php": ">=5.6", - "sebastian/recursion-context": "~1.0" - }, - "require-dev": { - "phpunit/phpunit": "~5" + "php": ">=5.3.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2036,32 +1675,40 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" } ], - "description": "Traverses array structures and object graphs to enumerate all referenced objects", - "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2016-01-28 13:25:10" + "description": "Diff implementation", + "homepage": "http://www.github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2013-08-03 16:46:33" }, { - "name": "sebastian/recursion-context", - "version": "1.0.2", + "name": "sebastian/environment", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "913401df809e99e4f47b27cdd781f4a258d58791" + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", - "reference": "913401df809e99e4f47b27cdd781f4a258d58791", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/79517609ec01139cd7e9fded0dd7ce08c952ef6a", + "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "4.0.*@dev" }, "type": "library", "extra": { @@ -2079,39 +1726,40 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2015-11-11 19:50:13" + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2014-02-18 16:17:19" }, { - "name": "sebastian/resource-operations", - "version": "1.0.0", + "name": "sebastian/exporter", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529", + "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529", "shasum": "" }, "require": { - "php": ">=5.6.0" + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "4.0.*@dev" }, "type": "library", "extra": { @@ -2131,36 +1779,50 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net", + "role": "Lead" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" } ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28 20:34:47" + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2014-02-16 08:26:31" }, { "name": "sebastian/version", - "version": "2.0.0", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5" + "reference": "16b021aed448b654ae05846e394e057e9a6f04cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5", - "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/16b021aed448b654ae05846e394e057e9a6f04cb", + "reference": "16b021aed448b654ae05846e394e057e9a6f04cb", "shasum": "" }, - "require": { - "php": ">=5.6" - }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { "classmap": [ "src/" @@ -2179,49 +1841,42 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-02-04 12:56:52" + "time": "2013-01-05 14:27:32" }, { "name": "symfony/console", - "version": "v2.8.7", + "version": "v2.3.0", + "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3" + "reference": "36e238358617de042f7c1d93e012f06b3d7e5f40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3", - "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3", + "url": "https://api.github.com/repos/symfony/console/zipball/36e238358617de042f7c1d93e012f06b3d7e5f40", + "reference": "36e238358617de042f7c1d93e012f06b3d7e5f40", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=5.3.3" }, "require-dev": { - "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1|~3.0.0", - "symfony/process": "~2.1|~3.0.0" + "symfony/event-dispatcher": "~2.1" }, "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/process": "" + "symfony/event-dispatcher": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "2.3-dev" } }, "autoload": { - "psr-4": { + "psr-0": { "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2229,59 +1884,53 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], "description": "Symfony Console Component", - "homepage": "https://symfony.com", - "time": "2016-06-06 15:06:25" + "homepage": "http://symfony.com", + "time": "2013-05-30 05:11:26" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.7", + "version": "v2.1.0", + "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "2a6b8713f8bdb582058cfda463527f195b066110" + "reference": "421520fd35ace52106947b2d6c2d9db49cb5a866" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2a6b8713f8bdb582058cfda463527f195b066110", - "reference": "2a6b8713f8bdb582058cfda463527f195b066110", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/421520fd35ace52106947b2d6c2d9db49cb5a866", + "reference": "421520fd35ace52106947b2d6c2d9db49cb5a866", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.3" }, "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.0,>=2.0.5|~3.0.0", - "symfony/dependency-injection": "~2.6|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/stopwatch": "~2.3|~3.0.0" + "symfony/dependency-injection": "2.1.*" }, "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "symfony/dependency-injection": "v2.1.0", + "symfony/http-kernel": "v2.1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "2.1-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "psr-0": { + "Symfony\\Component\\EventDispatcher": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2289,48 +1938,46 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], "description": "Symfony EventDispatcher Component", - "homepage": "https://symfony.com", - "time": "2016-06-06 11:11:27" + "homepage": "http://symfony.com", + "time": "2012-08-22 13:48:41" }, { "name": "symfony/filesystem", - "version": "v2.8.7", + "version": "v2.1.0", + "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "dee379131dceed90a429e951546b33edfe7dccbb" + "reference": "57c95ad66231e75b63643df2bd5f6a8bc5603bef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/dee379131dceed90a429e951546b33edfe7dccbb", - "reference": "dee379131dceed90a429e951546b33edfe7dccbb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/57c95ad66231e75b63643df2bd5f6a8bc5603bef", + "reference": "57c95ad66231e75b63643df2bd5f6a8bc5603bef", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "2.1-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "psr-0": { + "Symfony\\Component\\Filesystem": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2338,48 +1985,46 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], "description": "Symfony Filesystem Component", - "homepage": "https://symfony.com", - "time": "2016-04-12 18:01:21" + "homepage": "http://symfony.com", + "time": "2012-08-22 13:48:41" }, { "name": "symfony/finder", - "version": "v2.8.7", + "version": "v2.1.0", + "target-dir": "Symfony/Component/Finder", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "3ec095fab1800222732ca522a95dce8fa124007b" + "reference": "e2e9f746294f60aed3bb5bc20da24e23b92f0479" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/3ec095fab1800222732ca522a95dce8fa124007b", - "reference": "3ec095fab1800222732ca522a95dce8fa124007b", + "url": "https://api.github.com/repos/symfony/finder/zipball/e2e9f746294f60aed3bb5bc20da24e23b92f0479", + "reference": "e2e9f746294f60aed3bb5bc20da24e23b92f0479", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "2.1-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "psr-0": { + "Symfony\\Component\\Finder": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2387,156 +2032,93 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], "description": "Symfony Finder Component", - "homepage": "https://symfony.com", - "time": "2016-06-06 11:11:27" + "homepage": "http://symfony.com", + "time": "2012-08-22 13:48:41" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.2.0", + "name": "symfony/process", + "version": "v2.3.0", + "target-dir": "Symfony/Component/Process", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "dff51f72b0706335131b00a7f49606168c582594" + "url": "https://github.com/symfony/process.git", + "reference": "bb721b29e033594512f8b08386e13593b0faaf0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", - "reference": "dff51f72b0706335131b00a7f49606168c582594", + "url": "https://api.github.com/repos/symfony/process/zipball/bb721b29e033594512f8b08386e13593b0faaf0f", + "reference": "bb721b29e033594512f8b08386e13593b0faaf0f", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "suggest": { - "ext-mbstring": "For best performance" - }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, - "files": [ - "bootstrap.php" - ] + "psr-0": { + "Symfony\\Component\\Process\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, { "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "time": "2016-05-18 14:26:46" - }, - { - "name": "symfony/process", - "version": "v2.8.7", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "115347d00c342198cdc52a7bd8bc15b5ab43500c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/115347d00c342198cdc52a7bd8bc15b5ab43500c", - "reference": "115347d00c342198cdc52a7bd8bc15b5ab43500c", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" + "homepage": "http://symfony.com/contributors" }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ { "name": "Fabien Potencier", "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Process Component", - "homepage": "https://symfony.com", - "time": "2016-06-06 11:11:27" + "homepage": "http://symfony.com", + "time": "2013-05-06 20:03:44" }, { "name": "symfony/stopwatch", - "version": "v2.8.7", + "version": "v2.5.0", + "target-dir": "Symfony/Component/Stopwatch", "source": { "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "5e628055488bcc42dbace3af65be435d094e37e4" + "url": "https://github.com/symfony/Stopwatch.git", + "reference": "724d73604ebe6c1c9bdf36533b556123bd9075a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5e628055488bcc42dbace3af65be435d094e37e4", - "reference": "5e628055488bcc42dbace3af65be435d094e37e4", + "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/724d73604ebe6c1c9bdf36533b556123bd9075a1", + "reference": "724d73604ebe6c1c9bdf36533b556123bd9075a1", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "2.5-dev" } }, "autoload": { - "psr-4": { + "psr-0": { "Symfony\\Component\\Stopwatch\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2545,121 +2127,61 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "homepage": "http://symfony.com/contributors" } ], "description": "Symfony Stopwatch Component", - "homepage": "https://symfony.com", - "time": "2016-06-06 11:11:27" + "homepage": "http://symfony.com", + "time": "2014-04-18 20:40:13" }, { "name": "symfony/yaml", - "version": "v3.1.1", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623" + "reference": "e60c0d68640e662e88d879f0df139e022335a92a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c5a7e7fc273c758b92b85dcb9c46149ccda89623", - "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e60c0d68640e662e88d879f0df139e022335a92a", + "reference": "e60c0d68640e662e88d879f0df139e022335a92a", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=5.3.2" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2016-06-14 11:18:07" - }, - { - "name": "webmozart/assert", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", - "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2015-08-24 13:29:44" + "homepage": "http://symfony.com", + "time": "2011-09-26 22:55:43" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, + "prefer-stable": true, + "prefer-lowest": true, "platform": { "php": "^5.5 || ^7.0" }, From 3ab4ee12f0e8a63bfe2861a2c2c925aebc5b465f Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 27 Jun 2016 14:18:04 -0500 Subject: [PATCH 26/35] Switch to phpcs - Switched to phpcs from php-cs-fixer - Updated PHP and PHPUnit dependencies - Fixed CS and testing issues encountered --- .php_cs | 43 - composer.json | 20 +- composer.lock | 1948 +++++++++++++++-------------- phpcs.xml | 21 + src/Collector/ConfigCollector.php | 3 +- src/Listener/ToolbarListener.php | 32 +- src/Module.php | 5 +- test/OptionsTest.php | 5 +- 8 files changed, 1088 insertions(+), 989 deletions(-) delete mode 100644 .php_cs create mode 100644 phpcs.xml diff --git a/.php_cs b/.php_cs deleted file mode 100644 index a00e27f..0000000 --- a/.php_cs +++ /dev/null @@ -1,43 +0,0 @@ -in('src') - ->in('test') - ->filter(function (SplFileInfo $file) { - if (strstr($file->getPath(), 'compatibility')) { - return false; - } - }); -$config = Symfony\CS\Config\Config::create(); -$config->level(null); -$config->fixers( - array( - 'braces', - 'duplicate_semicolon', - 'elseif', - 'empty_return', - 'encoding', - 'eof_ending', - 'function_call_space', - 'function_declaration', - 'indentation', - 'join_function', - 'line_after_namespace', - 'linefeed', - 'lowercase_keywords', - 'parenthesis', - 'multiple_use', - 'method_argument_space', - 'object_operator', - 'php_closing_tag', - 'remove_lines_between_uses', - 'short_array_syntax', - 'short_tag', - 'standardize_not_equal', - 'trailing_spaces', - 'unused_use', - 'visibility', - 'whitespacy_lines', - ) -); -$config->finder($finder); -return $config; diff --git a/composer.json b/composer.json index f42145d..762061d 100644 --- a/composer.json +++ b/composer.json @@ -22,19 +22,19 @@ } ], "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-mvc": "^2.7 || ^3.0.1", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0", + "php": "^5.6 || ^7.0", + "zendframework/zend-mvc": "^2.7 || ^3.0.1", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-modulemanager": "^2.7", - "zendframework/zend-version": "^2.5", - "zendframework/zend-debug": "^2.5 || ^3.0", - "zendframework/zend-view": "^2.6" + "zendframework/zend-modulemanager": "^2.7", + "zendframework/zend-version": "^2.5", + "zendframework/zend-debug": "^2.5 || ^3.0", + "zendframework/zend-view": "^2.6" }, "require-dev": { - "phpunit/phpunit": "~4 || ~5", - "fabpot/php-cs-fixer": "1.7.*" + "phpunit/phpunit": "^4.8 || ^5.0", + "squizlabs/php_codesniffer": "~2.3.1" }, "suggest": { "bjyoungblood/bjy-profiler": "Version: dev-master, allows the usage of the (Zend) Db collector.", diff --git a/composer.lock b/composer.lock index 497b907..c25a50c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "87ab342d6ebcfcc269135860520dd95b", - "content-hash": "04fbcb216ceee404d06c521a86f090b4", + "hash": "d3aac4379a034f0785d267d5f4b4c083", + "content-hash": "f4441c4e0a410a7a2d9b21f31641c717", "packages": [ { "name": "container-interop/container-interop", @@ -35,57 +35,64 @@ "time": "2014-12-30 15:22:37" }, { - "name": "psr/http-message", - "version": "1.0", + "name": "zendframework/zend-config", + "version": "2.6.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" + "url": "https://github.com/zendframework/zend-config.git", + "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", + "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^5.5 || ^7.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-filter": "^2.6", + "zendframework/zend-i18n": "^2.5", + "zendframework/zend-json": "^2.6.1", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" + }, + "suggest": { + "zendframework/zend-filter": "Zend\\Filter component", + "zendframework/zend-i18n": "Zend\\I18n component", + "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes", + "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload": { "psr-4": { - "Psr\\Http\\Message\\": "src/" + "Zend\\Config\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } + "BSD-3-Clause" ], - "description": "Common interface for HTTP messages", + "description": "provides a nested object property based user interface for accessing this configuration data within application code", + "homepage": "https://github.com/zendframework/zend-config", "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" + "config", + "zf2" ], - "time": "2015-05-04 20:22:00" + "time": "2016-02-04 23:01:10" }, { "name": "zendframework/zend-debug", - "version": "2.5.0", + "version": "2.5.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-debug.git", @@ -132,59 +139,9 @@ ], "time": "2015-06-03 14:05:35" }, - { - "name": "zendframework/zend-diactoros", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/df65f70fc36f24d51a90ad706a09cd9b74fc4dd8", - "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8", - "shasum": "" - }, - "require": { - "php": ">=5.4", - "psr/http-message": "~1.0" - }, - "provide": { - "psr/http-message-implementation": "~1.0.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.6", - "squizlabs/php_codesniffer": "^2.3.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Diactoros\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "description": "PSR HTTP Message implementations", - "homepage": "https://github.com/zendframework/zend-diactoros", - "keywords": [ - "http", - "psr", - "psr-7" - ], - "time": "2015-06-24 20:42:54" - }, { "name": "zendframework/zend-escaper", - "version": "2.5.0", + "version": "2.5.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-escaper.git", @@ -228,32 +185,37 @@ }, { "name": "zendframework/zend-eventmanager", - "version": "2.6.2", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "b4354f75f694504d32e7d080641854f830acb865" + "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/b4354f75f694504d32e7d080641854f830acb865", - "reference": "b4354f75f694504d32e7d080641854f830acb865", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/5c80bdee0e952be112dcec0968bad770082c3a6e", + "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e", "shasum": "" }, "require": { - "php": ">=5.5", - "zendframework/zend-stdlib": "~2.5" + "php": "^5.5 || ^7.0" }, "require-dev": { - "athletic/athletic": "dev-master", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" + "athletic/athletic": "^0.1", + "container-interop/container-interop": "^1.1.0", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "^2.0", + "zendframework/zend-stdlib": "^2.7.3 || ^3.0" + }, + "suggest": { + "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature", + "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "3.0-dev" + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" } }, "autoload": { @@ -265,165 +227,141 @@ "license": [ "BSD-3-Clause" ], + "description": "Trigger and listen to events within a PHP application", "homepage": "https://github.com/zendframework/zend-eventmanager", "keywords": [ + "event", "eventmanager", + "events", "zf2" ], - "time": "2016-01-12 23:08:36" + "time": "2016-02-18 20:53:00" }, { - "name": "zendframework/zend-filter", - "version": "2.6.0", + "name": "zendframework/zend-http", + "version": "2.5.4", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-filter.git", - "reference": "8682c12e9870c431cf29cbb7010627f3fa88dec8" + "url": "https://github.com/zendframework/zend-http.git", + "reference": "7b920b4ec34b5ee58f76eb4e8c408b083121953c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/8682c12e9870c431cf29cbb7010627f3fa88dec8", - "reference": "8682c12e9870c431cf29cbb7010627f3fa88dec8", + "url": "https://api.github.com/repos/zendframework/zend-http/zipball/7b920b4ec34b5ee58f76eb4e8c408b083121953c", + "reference": "7b920b4ec34b5ee58f76eb4e8c408b083121953c", "shasum": "" }, "require": { "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "zendframework/zend-loader": "^2.5", + "zendframework/zend-stdlib": "^2.5 || ^3.0", + "zendframework/zend-uri": "^2.5", + "zendframework/zend-validator": "^2.5" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", - "pear/archive_tar": "^1.4", - "phpunit/phpunit": "~4.0", - "zendframework/zend-crypt": "^2.6", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-uri": "^2.5" - }, - "suggest": { - "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters", - "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality", - "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter" + "phpunit/phpunit": "^4.0", + "zendframework/zend-config": "^2.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" } }, "autoload": { "psr-4": { - "Zend\\Filter\\": "src/" + "Zend\\Http\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "description": "provides a set of commonly needed data filters", - "homepage": "https://github.com/zendframework/zend-filter", + "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", + "homepage": "https://github.com/zendframework/zend-http", "keywords": [ - "filter", + "http", "zf2" ], - "time": "2016-02-04 19:52:41" + "time": "2016-02-04 20:36:48" }, { - "name": "zendframework/zend-form", - "version": "2.7.0", + "name": "zendframework/zend-json", + "version": "2.6.1", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-form.git", - "reference": "7c46b6a2d04d12aacd9c32bb021d0d9d0354d5d5" + "url": "https://github.com/zendframework/zend-json.git", + "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-form/zipball/7c46b6a2d04d12aacd9c32bb021d0d9d0354d5d5", - "reference": "7c46b6a2d04d12aacd9c32bb021d0d9d0354d5d5", + "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", + "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-hydrator": "^1.1 || ^2.1", - "zendframework/zend-inputfilter": "^2.6", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "php": "^5.5 || ^7.0" }, "require-dev": { - "doctrine/annotations": "~1.0", "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "~4.0", - "zendframework/zend-cache": "^2.6.1", - "zendframework/zend-captcha": "^2.5", - "zendframework/zend-code": "^2.6", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-filter": "^2.6", - "zendframework/zend-i18n": "^2.6", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-session": "^2.5", - "zendframework/zend-text": "^2.6", - "zendframework/zend-validator": "^2.6", - "zendframework/zend-view": "^2.6.2", - "zendframework/zendservice-recaptcha": "*" + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-server": "^2.6.1", + "zendframework/zend-stdlib": "^2.5 || ^3.0", + "zendframework/zendxml": "^1.0.2" }, "suggest": { - "zendframework/zend-captcha": "Zend\\Captcha component", - "zendframework/zend-code": "Zend\\Code component", - "zendframework/zend-eventmanager": "Zend\\EventManager component", - "zendframework/zend-filter": "Zend\\Filter component", - "zendframework/zend-i18n": "Zend\\I18n component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component", - "zendframework/zend-validator": "Zend\\Validator component", - "zendframework/zend-view": "Zend\\View component", - "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component" + "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server", + "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server", + "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses", + "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload": { "psr-4": { - "Zend\\Form\\": "src/" + "Zend\\Json\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-form", + "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", + "homepage": "https://github.com/zendframework/zend-json", "keywords": [ - "form", + "json", "zf2" ], - "time": "2016-02-22 21:41:46" + "time": "2016-02-04 21:20:26" }, { - "name": "zendframework/zend-http", + "name": "zendframework/zend-loader", "version": "2.5.1", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-http.git", - "reference": "6cc6dee9a27fc07e0167d8779ab2258747108ed5" + "url": "https://github.com/zendframework/zend-loader.git", + "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-http/zipball/6cc6dee9a27fc07e0167d8779ab2258747108ed5", - "reference": "6cc6dee9a27fc07e0167d8779ab2258747108ed5", + "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c", + "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c", "shasum": "" }, "require": { - "php": ">=5.3.23", - "zendframework/zend-loader": "~2.5", - "zendframework/zend-stdlib": "~2.5", - "zendframework/zend-uri": "~2.5", - "zendframework/zend-validator": "~2.5" + "php": ">=5.3.23" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5" + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { @@ -434,818 +372,837 @@ }, "autoload": { "psr-4": { - "Zend\\Http\\": "src/" + "Zend\\Loader\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", - "homepage": "https://github.com/zendframework/zend-http", + "homepage": "https://github.com/zendframework/zend-loader", "keywords": [ - "http", + "loader", "zf2" ], - "time": "2015-06-03 15:32:01" + "time": "2015-06-03 14:05:47" }, { - "name": "zendframework/zend-hydrator", - "version": "1.1.0", + "name": "zendframework/zend-modulemanager", + "version": "2.7.2", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-hydrator.git", - "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65" + "url": "https://github.com/zendframework/zend-modulemanager.git", + "reference": "2a59ab9a0dd7699a55050dff659ab0f28272b46e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65", - "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65", + "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/2a59ab9a0dd7699a55050dff659ab0f28272b46e", + "reference": "2a59ab9a0dd7699a55050dff659ab0f28272b46e", "shasum": "" }, "require": { "php": "^5.5 || ^7.0", + "zendframework/zend-config": "^2.6", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.0@dev", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-filter": "^2.6", - "zendframework/zend-inputfilter": "^2.6", - "zendframework/zend-serializer": "^2.6.1", + "zendframework/zend-console": "^2.6", + "zendframework/zend-di": "^2.6", + "zendframework/zend-loader": "^2.5", + "zendframework/zend-mvc": "^2.7", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" }, "suggest": { - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage", - "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage", - "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage" + "zendframework/zend-config": "Zend\\Config component", + "zendframework/zend-console": "Zend\\Console component", + "zendframework/zend-loader": "Zend\\Loader component", + "zendframework/zend-mvc": "Zend\\Mvc component", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component" }, "type": "library", "extra": { "branch-alias": { - "dev-release-1.0": "1.0-dev", - "dev-release-1.1": "1.1-dev", - "dev-master": "2.0-dev", - "dev-develop": "2.1-dev" + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" } }, "autoload": { "psr-4": { - "Zend\\Hydrator\\": "src/" + "Zend\\ModuleManager\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-hydrator", + "homepage": "https://github.com/zendframework/zend-modulemanager", "keywords": [ - "hydrator", + "modulemanager", "zf2" ], - "time": "2016-02-18 22:38:26" + "time": "2016-05-16 21:21:11" }, { - "name": "zendframework/zend-inputfilter", - "version": "2.6.0", + "name": "zendframework/zend-mvc", + "version": "3.0.1", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-inputfilter.git", - "reference": "b3b043284b7eec2ae5a3c51e1f81db06f2e167a1" + "url": "https://github.com/zendframework/zend-mvc.git", + "reference": "dc9926ae85798c6765ae4124a19ec24a2e50f6cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/b3b043284b7eec2ae5a3c51e1f81db06f2e167a1", - "reference": "b3b043284b7eec2ae5a3c51e1f81db06f2e167a1", + "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/dc9926ae85798c6765ae4124a19ec24a2e50f6cb", + "reference": "dc9926ae85798c6765ae4124a19ec24a2e50f6cb", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-filter": "^2.6", - "zendframework/zend-stdlib": "^2.7 || ^3.0", - "zendframework/zend-validator": "^2.6" + "container-interop/container-interop": "^1.1", + "php": "^5.6 || ^7.0", + "zendframework/zend-eventmanager": "^3.0", + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-modulemanager": "^2.7.1", + "zendframework/zend-router": "^3.0.1", + "zendframework/zend-servicemanager": "^3.0.3", + "zendframework/zend-stdlib": "^3.0", + "zendframework/zend-view": "^2.6.7" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "^4.5", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" + "zendframework/zend-json": "^2.6.1 || ^3.0", + "zendframework/zend-psr7bridge": "^0.2" }, "suggest": { - "zendframework/zend-servicemanager": "To support plugin manager support" + "zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable", + "zendframework/zend-mvc-console": "zend-mvc-console provides the ability to expose zend-mvc as a console application", + "zendframework/zend-mvc-i18n": "zend-mvc-i18n provides integration with zend-i18n, including a translation bridge and translatable route segments", + "zendframework/zend-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads", + "zendframework/zend-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests", + "zendframework/zend-mvc-plugin-identity": "To access the authenticated identity (per zend-authentication) in controllers", + "zendframework/zend-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers", + "zendframework/zend-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow", + "zendframework/zend-servicemanager-di": "zend-servicemanager-di provides utilities for integrating zend-di and zend-servicemanager in your zend-mvc application" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" } }, "autoload": { "psr-4": { - "Zend\\InputFilter\\": "src/" + "Zend\\Mvc\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-inputfilter", + "homepage": "https://github.com/zendframework/zend-mvc", "keywords": [ - "inputfilter", + "mvc", "zf2" ], - "time": "2016-02-18 19:49:24" + "time": "2016-06-23 20:39:38" }, { - "name": "zendframework/zend-json", - "version": "2.5.1", + "name": "zendframework/zend-router", + "version": "3.0.2", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-json.git", - "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc" + "url": "https://github.com/zendframework/zend-router.git", + "reference": "03763610632a9022aff22a0e8f340852e68392a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-json/zipball/c74eaf17d2dd37dc1e964be8dfde05706a821ebc", - "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc", + "url": "https://api.github.com/repos/zendframework/zend-router/zipball/03763610632a9022aff22a0e8f340852e68392a1", + "reference": "03763610632a9022aff22a0e8f340852e68392a1", "shasum": "" }, "require": { - "php": ">=5.3.23", - "zendframework/zend-stdlib": "~2.5" + "container-interop/container-interop": "^1.1", + "php": "^5.5 || ^7.0", + "zendframework/zend-http": "^2.5", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-stdlib": "^2.7.5 || ^3.0" + }, + "conflict": { + "zendframework/zend-mvc": "<3.0.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-http": "~2.5", - "zendframework/zend-server": "~2.5", - "zendframework/zendxml": "~1.0" + "phpunit/phpunit": "^4.5", + "sebastian/version": "^1.0.4", + "squizlabs/php_codesniffer": "^2.3", + "zendframework/zend-i18n": "^2.6" }, "suggest": { - "zendframework/zend-http": "Zend\\Http component", - "zendframework/zend-server": "Zend\\Server component", - "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage" + "zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" + }, + "zf": { + "component": "Zend\\Router", + "config-provider": "Zend\\Router\\ConfigProvider" } }, "autoload": { "psr-4": { - "Zend\\Json\\": "src/" + "Zend\\Router\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", - "homepage": "https://github.com/zendframework/zend-json", + "homepage": "https://github.com/zendframework/zend-router", "keywords": [ - "json", + "mvc", + "routing", "zf2" ], - "time": "2015-06-03 15:32:01" + "time": "2016-05-31 20:47:48" }, { - "name": "zendframework/zend-loader", - "version": "2.5.0", + "name": "zendframework/zend-servicemanager", + "version": "3.1.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-loader.git", - "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c" + "url": "https://github.com/zendframework/zend-servicemanager.git", + "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c", - "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c", + "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/90b88339a4b937c6bb0055ee04b2567e7e628f25", + "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25", "shasum": "" }, "require": { - "php": ">=5.3.23" + "container-interop/container-interop": "~1.0", + "php": "^5.5 || ^7.0" + }, + "provide": { + "container-interop/container-interop-implementation": "^1.1" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" + "ocramius/proxy-manager": "^1.0 || ^2.0", + "phpbench/phpbench": "^0.10.0", + "phpunit/phpunit": "^4.6 || ^5.2.10", + "squizlabs/php_codesniffer": "^2.5.1" + }, + "suggest": { + "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services", + "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" } }, "autoload": { "psr-4": { - "Zend\\Loader\\": "src/" + "Zend\\ServiceManager\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-loader", + "homepage": "https://github.com/zendframework/zend-servicemanager", "keywords": [ - "loader", - "zf2" + "service-manager", + "servicemanager", + "zf" ], - "time": "2015-06-03 14:05:47" + "time": "2016-06-01 16:50:58" }, { - "name": "zendframework/zend-modulemanager", - "version": "2.7.0", + "name": "zendframework/zend-stdlib", + "version": "3.0.1", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-modulemanager.git", - "reference": "fe5a156df1ae4245c7b4a7b2b9067545761f59d7" + "url": "https://github.com/zendframework/zend-stdlib.git", + "reference": "8bafa58574204bdff03c275d1d618aaa601588ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/fe5a156df1ae4245c7b4a7b2b9067545761f59d7", - "reference": "fe5a156df1ae4245c7b4a7b2b9067545761f59d7", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8bafa58574204bdff03c275d1d618aaa601588ae", + "reference": "8bafa58574204bdff03c275d1d618aaa601588ae", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "php": "^5.5 || ^7.0" }, "require-dev": { + "athletic/athletic": "~0.1", "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "^2.6", - "zendframework/zend-console": "^2.6", - "zendframework/zend-di": "^2.6", - "zendframework/zend-loader": "^2.5", - "zendframework/zend-servicemanager": "^3.0.3" - }, - "suggest": { - "zendframework/zend-config": "Zend\\Config component", - "zendframework/zend-console": "Zend\\Console component", - "zendframework/zend-loader": "Zend\\Loader component", - "zendframework/zend-mvc": "Zend\\Mvc component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component" + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" } }, "autoload": { "psr-4": { - "Zend\\ModuleManager\\": "src/" + "Zend\\Stdlib\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-modulemanager", + "homepage": "https://github.com/zendframework/zend-stdlib", "keywords": [ - "modulemanager", + "stdlib", "zf2" ], - "time": "2016-02-25 18:22:47" + "time": "2016-04-12 21:19:36" }, { - "name": "zendframework/zend-mvc", - "version": "2.7.0", + "name": "zendframework/zend-uri", + "version": "2.5.2", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-mvc.git", - "reference": "073d391a4996ff0ad338fff3f92cadf5aeecda9c" + "url": "https://github.com/zendframework/zend-uri.git", + "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/073d391a4996ff0ad338fff3f92cadf5aeecda9c", - "reference": "073d391a4996ff0ad338fff3f92cadf5aeecda9c", + "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/0bf717a239432b1a1675ae314f7c4acd742749ed", + "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.1", "php": "^5.5 || ^7.0", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-form": "^2.7", - "zendframework/zend-hydrator": "^1.1 || ^2.1", - "zendframework/zend-psr7bridge": "^0.2", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-stdlib": "^2.7.5 || ^3.0" + "zendframework/zend-escaper": "^2.5", + "zendframework/zend-validator": "^2.5" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-authentication": "^2.5.3", - "zendframework/zend-cache": "^2.6.1", - "zendframework/zend-console": "^2.6", - "zendframework/zend-di": "^2.6", - "zendframework/zend-filter": "^2.6.1", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-i18n": "^2.6", - "zendframework/zend-inputfilter": "^2.6", - "zendframework/zend-json": "^2.6.1", - "zendframework/zend-log": "^2.7.1", - "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-serializer": "^2.6.1", - "zendframework/zend-session": "^2.6.2", - "zendframework/zend-text": "^2.6", - "zendframework/zend-uri": "^2.5", - "zendframework/zend-validator": "^2.6", - "zendframework/zend-version": "^2.5", - "zendframework/zend-view": "^2.6.3" - }, - "suggest": { - "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin", - "zendframework/zend-config": "Zend\\Config component", - "zendframework/zend-console": "Zend\\Console component", - "zendframework/zend-di": "Zend\\Di component", - "zendframework/zend-filter": "Zend\\Filter component", - "zendframework/zend-http": "Zend\\Http component", - "zendframework/zend-i18n": "Zend\\I18n component for translatable segments", - "zendframework/zend-inputfilter": "Zend\\Inputfilter component", - "zendframework/zend-json": "Zend\\Json component", - "zendframework/zend-log": "Zend\\Log component", - "zendframework/zend-modulemanager": "Zend\\ModuleManager component", - "zendframework/zend-serializer": "Zend\\Serializer component", - "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins", - "zendframework/zend-text": "Zend\\Text component", - "zendframework/zend-uri": "Zend\\Uri component", - "zendframework/zend-validator": "Zend\\Validator component", - "zendframework/zend-version": "Zend\\Version component", - "zendframework/zend-view": "Zend\\View component" + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" } }, "autoload": { "psr-4": { - "Zend\\Mvc\\": "src/" + "Zend\\Uri\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-mvc", + "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", + "homepage": "https://github.com/zendframework/zend-uri", "keywords": [ - "mvc", + "uri", "zf2" ], - "time": "2016-03-01 19:19:37" + "time": "2016-02-17 22:38:51" }, { - "name": "zendframework/zend-psr7bridge", - "version": "0.2.0", + "name": "zendframework/zend-validator", + "version": "2.8.1", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-psr7bridge.git", - "reference": "b7a819be28819a90c9d2c24656db00c880e12ed2" + "url": "https://github.com/zendframework/zend-validator.git", + "reference": "8ec9f57a717dd37340308aa632f148a2c2be1cfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/b7a819be28819a90c9d2c24656db00c880e12ed2", - "reference": "b7a819be28819a90c9d2c24656db00c880e12ed2", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/8ec9f57a717dd37340308aa632f148a2c2be1cfc", + "reference": "8ec9f57a717dd37340308aa632f148a2c2be1cfc", "shasum": "" }, "require": { - "php": ">=5.5", - "psr/http-message": "^1.0", - "zendframework/zend-diactoros": "^1.1", - "zendframework/zend-http": "^2.5" + "container-interop/container-interop": "^1.1", + "php": "^5.5 || ^7.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "phpunit/phpunit": "^4.7", - "squizlabs/php_codesniffer": "^2.3" + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "^4.0", + "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-config": "^2.6", + "zendframework/zend-db": "^2.7", + "zendframework/zend-filter": "^2.6", + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-i18n": "^2.6", + "zendframework/zend-math": "^2.6", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-session": "^2.6.2", + "zendframework/zend-uri": "^2.5" + }, + "suggest": { + "zendframework/zend-db": "Zend\\Db component", + "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator", + "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators", + "zendframework/zend-i18n-resources": "Translations of validator messages", + "zendframework/zend-math": "Zend\\Math component", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", + "zendframework/zend-session": "Zend\\Session component", + "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" + }, + "zf": { + "component": "Zend\\Validator", + "config-provider": "Zend\\Validator\\ConfigProvider" } }, "autoload": { "psr-4": { - "Zend\\Psr7Bridge\\": "src/" + "Zend\\Validator\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "description": "PSR-7 <-> Zend\\Http bridge", - "homepage": "https://github.com/zendframework/zend-psr7bridge", + "description": "provides a set of commonly needed validators", + "homepage": "https://github.com/zendframework/zend-validator", "keywords": [ - "http", - "psr", - "psr-7" + "validator", + "zf2" ], - "time": "2015-09-28 15:47:35" + "time": "2016-06-23 13:44:31" }, { - "name": "zendframework/zend-servicemanager", - "version": "2.7.5", + "name": "zendframework/zend-version", + "version": "2.5.1", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-servicemanager.git", - "reference": "fb5b54db5ead533b38e311f14e9c01a79218bf2b" + "url": "https://github.com/zendframework/zend-version.git", + "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/fb5b54db5ead533b38e311f14e9c01a79218bf2b", - "reference": "fb5b54db5ead533b38e311f14e9c01a79218bf2b", + "url": "https://api.github.com/repos/zendframework/zend-version/zipball/e30c55dc394eaf396f0347887af0a7bef471fe08", + "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08", "shasum": "" }, "require": { - "container-interop/container-interop": "~1.0", - "php": "^5.5 || ^7.0" + "php": ">=5.3.23", + "zendframework/zend-json": "~2.5" }, "require-dev": { - "athletic/athletic": "dev-master", "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "~4.0", - "zendframework/zend-di": "~2.5", - "zendframework/zend-mvc": "~2.5" + "zendframework/zend-http": "~2.5" }, "suggest": { - "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services", - "zendframework/zend-di": "Zend\\Di component" + "zendframework/zend-http": "Allows use of Zend\\Http\\Client to check version information", + "zendframework/zend-json": "To check latest version hosted in GitHub" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "3.0-dev" + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" } }, "autoload": { "psr-4": { - "Zend\\ServiceManager\\": "src/" + "Zend\\Version\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-servicemanager", + "homepage": "https://github.com/zendframework/zend-version", "keywords": [ - "servicemanager", + "version", "zf2" ], - "time": "2016-02-02 14:11:46" + "time": "2015-06-04 15:41:05" }, { - "name": "zendframework/zend-stdlib", - "version": "2.7.5", + "name": "zendframework/zend-view", + "version": "2.8.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "b894a85f3ef8a52e7aa62c3c5aa245e383c70cca" + "url": "https://github.com/zendframework/zend-view.git", + "reference": "1516805ed7f04afedbd4600d496437c49847a6cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/b894a85f3ef8a52e7aa62c3c5aa245e383c70cca", - "reference": "b894a85f3ef8a52e7aa62c3c5aa245e383c70cca", + "url": "https://api.github.com/repos/zendframework/zend-view/zipball/1516805ed7f04afedbd4600d496437c49847a6cd", + "reference": "1516805ed7f04afedbd4600d496437c49847a6cd", "shasum": "" }, "require": { "php": "^5.5 || ^7.0", - "zendframework/zend-hydrator": "~1.0" + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-loader": "^2.5", + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "athletic/athletic": "~0.1", "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-inputfilter": "~2.5", - "zendframework/zend-serializer": "~2.5", - "zendframework/zend-servicemanager": "~2.5" + "phpunit/phpunit": "^4.5", + "zendframework/zend-authentication": "^2.5", + "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-config": "^2.6", + "zendframework/zend-console": "^2.6", + "zendframework/zend-escaper": "^2.5", + "zendframework/zend-feed": "^2.7", + "zendframework/zend-filter": "^2.6.1", + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-i18n": "^2.6", + "zendframework/zend-json": "^2.6.1", + "zendframework/zend-log": "^2.7", + "zendframework/zend-modulemanager": "^2.7.1", + "zendframework/zend-mvc": "^2.7", + "zendframework/zend-navigation": "^2.5", + "zendframework/zend-paginator": "^2.5", + "zendframework/zend-permissions-acl": "^2.6", + "zendframework/zend-router": "^3.0.1", + "zendframework/zend-serializer": "^2.6.1", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-session": "^2.6.2", + "zendframework/zend-uri": "^2.5" }, "suggest": { - "zendframework/zend-eventmanager": "To support aggregate hydrator usage", - "zendframework/zend-filter": "To support naming strategy hydrator usage", - "zendframework/zend-serializer": "Zend\\Serializer component", - "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" + "zendframework/zend-authentication": "Zend\\Authentication component", + "zendframework/zend-escaper": "Zend\\Escaper component", + "zendframework/zend-feed": "Zend\\Feed component", + "zendframework/zend-filter": "Zend\\Filter component", + "zendframework/zend-http": "Zend\\Http component", + "zendframework/zend-i18n": "Zend\\I18n component", + "zendframework/zend-json": "Zend\\Json component", + "zendframework/zend-mvc": "Zend\\Mvc component", + "zendframework/zend-navigation": "Zend\\Navigation component", + "zendframework/zend-paginator": "Zend\\Paginator component", + "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component", + "zendframework/zend-uri": "Zend\\Uri component" }, + "bin": [ + "bin/templatemap_generator.php" + ], "type": "library", "extra": { "branch-alias": { - "dev-release-2.7": "2.7-dev", - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" } }, "autoload": { "psr-4": { - "Zend\\Stdlib\\": "src/" + "Zend\\View\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-stdlib", + "description": "provides a system of helpers, output filters, and variable escaping", + "homepage": "https://github.com/zendframework/zend-view", "keywords": [ - "stdlib", + "view", "zf2" ], - "time": "2016-02-16 18:25:48" - }, + "time": "2016-06-21 20:58:34" + } + ], + "packages-dev": [ { - "name": "zendframework/zend-uri", - "version": "2.5.1", + "name": "doctrine/instantiator", + "version": "1.0.5", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-uri.git", - "reference": "fe6c7f4c8d9037fe551898a538a2b6d39483f572" + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/fe6c7f4c8d9037fe551898a538a2b6d39483f572", - "reference": "fe6c7f4c8d9037fe551898a538a2b6d39483f572", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", "shasum": "" }, "require": { - "php": ">=5.3.23", - "zendframework/zend-escaper": "~2.5", - "zendframework/zend-validator": "~2.5" + "php": ">=5.3,<8.0-DEV" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-4": { - "Zend\\Uri\\": "src/" + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], - "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", - "homepage": "https://github.com/zendframework/zend-uri", + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", "keywords": [ - "uri", - "zf2" + "constructor", + "instantiate" ], - "time": "2015-06-03 15:32:03" + "time": "2015-06-14 21:17:01" }, { - "name": "zendframework/zend-validator", - "version": "2.6.0", + "name": "myclabs/deep-copy", + "version": "1.5.1", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-validator.git", - "reference": "1315fead53358054e3f5fcf440c1a4cd5f0724db" + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "a8773992b362b58498eed24bf85005f363c34771" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/1315fead53358054e3f5fcf440c1a4cd5f0724db", - "reference": "1315fead53358054e3f5fcf440c1a4cd5f0724db", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a8773992b362b58498eed24bf85005f363c34771", + "reference": "a8773992b362b58498eed24bf85005f363c34771", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.1", - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "php": ">=5.4.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.0", - "zendframework/zend-cache": "^2.6.1", - "zendframework/zend-config": "^2.6", - "zendframework/zend-db": "^2.5", - "zendframework/zend-filter": "^2.6", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-i18n": "^2.6", - "zendframework/zend-math": "^2.6", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-session": "^2.5", - "zendframework/zend-uri": "^2.5" - }, - "suggest": { - "zendframework/zend-db": "Zend\\Db component", - "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator", - "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators", - "zendframework/zend-i18n-resources": "Translations of validator messages", - "zendframework/zend-math": "Zend\\Math component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", - "zendframework/zend-session": "Zend\\Session component", - "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators" + "doctrine/collections": "1.*", + "phpunit/phpunit": "~4.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, "autoload": { "psr-4": { - "Zend\\Validator\\": "src/" + "DeepCopy\\": "src/DeepCopy/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], - "description": "provides a set of commonly needed validators", - "homepage": "https://github.com/zendframework/zend-validator", + "description": "Create deep copies (clones) of your objects", + "homepage": "https://github.com/myclabs/DeepCopy", "keywords": [ - "validator", - "zf2" + "clone", + "copy", + "duplicate", + "object", + "object graph" ], - "time": "2016-02-17 17:59:34" + "time": "2015-11-20 12:04:31" }, { - "name": "zendframework/zend-version", - "version": "2.5.0", + "name": "phpdocumentor/reflection-common", + "version": "1.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-version.git", - "reference": "4090b29643a4cc543486afabb941634d3c57fc00" + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-version/zipball/4090b29643a4cc543486afabb941634d3c57fc00", - "reference": "4090b29643a4cc543486afabb941634d3c57fc00", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", "shasum": "" }, "require": { - "php": ">=5.3.23", - "zendframework/zend-json": "~2.5.0" + "php": ">=5.5" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-http": "~2.5.0" - }, - "suggest": { - "zendframework/zend-http": "Allows use of Zend\\Http\\Client to check version information", - "zendframework/zend-json": "To check latest version hosted in GitHub" + "phpunit/phpunit": "^4.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-4": { - "Zend\\Version\\": "src/" + "phpDocumentor\\Reflection\\": [ + "src" + ] } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], - "homepage": "https://github.com/zendframework/zend-version", + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", "keywords": [ - "version", - "zf2" + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" ], - "time": "2015-06-03 14:06:03" + "time": "2015-12-27 11:43:31" }, { - "name": "zendframework/zend-view", - "version": "2.6.0", + "name": "phpdocumentor/reflection-docblock", + "version": "3.1.0", "source": { "type": "git", - "url": "https://github.com/zendframework/zend-view.git", - "reference": "3c09c9e8477716ea539df4544d4bbbffdd8d6132" + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-view/zipball/3c09c9e8477716ea539df4544d4bbbffdd8d6132", - "reference": "3c09c9e8477716ea539df4544d4bbbffdd8d6132", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-loader": "^2.5", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0@dev", + "phpdocumentor/type-resolver": "^0.2.0", + "webmozart/assert": "^1.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-authentication": "^2.5", - "zendframework/zend-cache": "^2.6.1", - "zendframework/zend-config": "^2.6", - "zendframework/zend-console": "^2.6", - "zendframework/zend-escaper": "^2.5", - "zendframework/zend-feed": "^2.7", - "zendframework/zend-filter": "^2.6.1", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-i18n": "^2.6", - "zendframework/zend-json": "^2.6.1", - "zendframework/zend-log": "^2.7", - "zendframework/zend-mvc": "^2.6.1", - "zendframework/zend-navigation": "^2.5", - "zendframework/zend-paginator": "^2.5", - "zendframework/zend-permissions-acl": "^2.6", - "zendframework/zend-serializer": "^2.6.1", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-session": "^2.5", - "zendframework/zend-uri": "^2.5" + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^4.4" }, - "suggest": { - "zendframework/zend-authentication": "Zend\\Authentication component", - "zendframework/zend-escaper": "Zend\\Escaper component", - "zendframework/zend-feed": "Zend\\Feed component", - "zendframework/zend-filter": "Zend\\Filter component", - "zendframework/zend-http": "Zend\\Http component", - "zendframework/zend-i18n": "Zend\\I18n component", - "zendframework/zend-json": "Zend\\Json component", - "zendframework/zend-mvc": "Zend\\Mvc component", - "zendframework/zend-navigation": "Zend\\Navigation component", - "zendframework/zend-paginator": "Zend\\Paginator component", - "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component", - "zendframework/zend-uri": "Zend\\Uri component" + "type": "library", + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "time": "2016-06-10 09:48:41" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "0.2", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443", + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^5.2||^4.8.24" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-4": { - "Zend\\View\\": "src/" + "phpDocumentor\\Reflection\\": [ + "src/" + ] } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], - "description": "provides a system of helpers, output filters, and variable escaping", - "homepage": "https://github.com/zendframework/zend-view", - "keywords": [ - "view", - "zf2" + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } ], - "time": "2016-02-17 23:33:10" - } - ], - "packages-dev": [ + "time": "2016-06-10 07:14:17" + }, { - "name": "fabpot/php-cs-fixer", - "version": "v1.7", + "name": "phpspec/prophecy", + "version": "v1.6.1", "source": { "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "6425aeb97ab921371182712a18c280d546e7769b" + "url": "https://github.com/phpspec/prophecy.git", + "reference": "58a8137754bc24b25740d4281399a4a3596058e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/6425aeb97ab921371182712a18c280d546e7769b", - "reference": "6425aeb97ab921371182712a18c280d546e7769b", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0", + "reference": "58a8137754bc24b25740d4281399a4a3596058e0", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": ">=5.3.6", - "sebastian/diff": "~1.1", - "symfony/console": "~2.3", - "symfony/event-dispatcher": "~2.1", - "symfony/filesystem": "~2.1", - "symfony/finder": "~2.1", - "symfony/process": "~2.3", - "symfony/stopwatch": "~2.5" + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "sebastian/comparator": "^1.1", + "sebastian/recursion-context": "^1.0" }, "require-dev": { - "satooshi/php-coveralls": "0.7.*@dev" + "phpspec/phpspec": "^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } }, - "bin": [ - "php-cs-fixer" - ], - "type": "application", "autoload": { - "psr-4": { - "Symfony\\CS\\": "Symfony/CS/" + "psr-0": { + "Prophecy\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1254,52 +1211,63 @@ ], "authors": [ { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" }, { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" } ], - "description": "A script to automatically fix Symfony Coding Standard", - "abandoned": "friendsofphp/php-cs-fixer", - "time": "2015-04-16 07:21:30" + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2016-06-07 08:13:47" }, { "name": "phpunit/php-code-coverage", - "version": "2.0.0", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "cbdd64d012c9b8c2e30850abd125001ed5db1eed" + "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cbdd64d012c9b8c2e30850abd125001ed5db1eed", - "reference": "cbdd64d012c9b8c2e30850abd125001ed5db1eed", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/900370c81280cc0d942ffbc5912d80464eaee7e9", + "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9", "shasum": "" }, "require": { - "php": ">=5.3.3", - "phpunit/php-file-iterator": "~1.3.1", + "php": "^5.6 || ^7.0", + "phpunit/php-file-iterator": "~1.3", "phpunit/php-text-template": "~1.2", - "phpunit/php-token-stream": "~1.1.3", - "sebastian/environment": "~1.0", - "sebastian/version": "~1.0" + "phpunit/php-token-stream": "^1.4.2", + "sebastian/code-unit-reverse-lookup": "~1.0", + "sebastian/environment": "^1.3.2", + "sebastian/version": "~1.0|~2.0" }, "require-dev": { "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": ">=4.0.0,<4.1.0" + "phpunit/phpunit": "^5.4" }, "suggest": { "ext-dom": "*", - "ext-xdebug": ">=2.2.1" + "ext-xdebug": ">=2.4.0", + "ext-xmlwriter": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -1308,9 +1276,6 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -1328,35 +1293,37 @@ "testing", "xunit" ], - "time": "2014-03-07 06:40:32" + "time": "2016-06-03 05:03:56" }, { "name": "phpunit/php-file-iterator", - "version": "1.3.2", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "46b0610951db3a918ee7842bc0d471e72c1d0d46" + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/46b0610951db3a918ee7842bc0d471e72c1d0d46", - "reference": "46b0610951db3a918ee7842bc0d471e72c1d0d46", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", "shasum": "" }, "require": { - "php": ">=5.2.7" + "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, "autoload": { - "files": [ - "File/Iterator/Autoload.php" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -1368,25 +1335,25 @@ } ], "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "http://www.phpunit.de/", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", "keywords": [ "filesystem", "iterator" ], - "time": "2012-09-22 00:00:00" + "time": "2015-06-21 13:08:43" }, { "name": "phpunit/php-text-template", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a" + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", - "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", "shasum": "" }, "require": { @@ -1395,20 +1362,17 @@ "type": "library", "autoload": { "classmap": [ - "Text/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1417,35 +1381,35 @@ "keywords": [ "template" ], - "time": "2014-01-30 17:20:04" + "time": "2015-06-21 13:50:34" }, { "name": "phpunit/php-timer", - "version": "1.0.3", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "5175e9bb35fc9cc430973ed83a3d62531c3c8698" + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5175e9bb35fc9cc430973ed83a3d62531c3c8698", - "reference": "5175e9bb35fc9cc430973ed83a3d62531c3c8698", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", "shasum": "" }, "require": { - "php": ">=5.2.7" + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4|~5" }, "type": "library", "autoload": { - "files": [ - "PHP/Timer/Autoload.php" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -1457,40 +1421,180 @@ } ], "description": "Utility class for timing", - "homepage": "http://www.phpunit.de/", + "homepage": "https://github.com/sebastianbergmann/php-timer/", "keywords": [ "timer" ], - "time": "2012-09-23 00:00:00" + "time": "2016-05-12 18:03:57" }, { "name": "phpunit/php-token-stream", - "version": "1.1.4", + "version": "1.4.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2015-09-15 10:49:45" + }, + { + "name": "phpunit/phpunit", + "version": "5.4.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "2f1fc94b77ea6418bd6a06c64a1dac0645fbce59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2f1fc94b77ea6418bd6a06c64a1dac0645fbce59", + "reference": "2f1fc94b77ea6418bd6a06c64a1dac0645fbce59", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "myclabs/deep-copy": "~1.3", + "php": "^5.6 || ^7.0", + "phpspec/prophecy": "^1.3.1", + "phpunit/php-code-coverage": "^4.0", + "phpunit/php-file-iterator": "~1.4", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "^1.0.6", + "phpunit/phpunit-mock-objects": "^3.2", + "sebastian/comparator": "~1.1", + "sebastian/diff": "~1.2", + "sebastian/environment": "^1.3 || ^2.0", + "sebastian/exporter": "~1.2", + "sebastian/global-state": "~1.0", + "sebastian/object-enumerator": "~1.0", + "sebastian/resource-operations": "~1.0", + "sebastian/version": "~1.0|~2.0", + "symfony/yaml": "~2.1|~3.0" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "3.0.2" + }, + "suggest": { + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2016-06-16 06:01:15" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "3.2.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "dd11f1b0c071dc46fe711a7dd331db1b2179b9be" + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "b13d0d9426ced06958bd32104653526a6c998a52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/dd11f1b0c071dc46fe711a7dd331db1b2179b9be", - "reference": "dd11f1b0c071dc46fe711a7dd331db1b2179b9be", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/b13d0d9426ced06958bd32104653526a6c998a52", + "reference": "b13d0d9426ced06958bd32104653526a6c998a52", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": ">=5.2.7" + "doctrine/instantiator": "^1.0.2", + "php": "^5.6 || ^7.0", + "phpunit/php-text-template": "^1.2", + "sebastian/exporter": "^1.2" + }, + "conflict": { + "phpunit/phpunit": "<5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.4" + }, + "suggest": { + "ext-soap": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2.x-dev" + } + }, "autoload": { - "files": [ - "PHP/Token/Stream/Autoload.php" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -1501,57 +1605,38 @@ "role": "lead" } ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "http://www.phpunit.de/", + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", "keywords": [ - "tokenizer" + "mock", + "xunit" ], - "time": "2012-09-23 00:00:00" + "time": "2016-06-12 07:37:26" }, { - "name": "phpunit/phpunit", - "version": "4.0.0", + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b3a7c58bc39f01577f89d63da1ec578e1e993f1a" + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b3a7c58bc39f01577f89d63da1ec578e1e993f1a", - "reference": "b3a7c58bc39f01577f89d63da1ec578e1e993f1a", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe", + "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpunit/php-code-coverage": ">=2.0.0,<2.1.0", - "phpunit/php-file-iterator": "~1.3.1", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "~1.0.2", - "phpunit/phpunit-mock-objects": ">=2.0.0,<2.1.0", - "sebastian/diff": "~1.1", - "sebastian/environment": "~1.0", - "sebastian/exporter": "~1.0.1", - "sebastian/version": "~1.0", - "symfony/yaml": "~2.0" + "php": ">=5.6" }, - "suggest": { - "ext-json": "*", - "ext-simplexml": "*", - "ext-tokenizer": "*", - "phpunit/php-invoker": "~1.1" + "require-dev": { + "phpunit/phpunit": "~5" }, - "bin": [ - "phpunit" - ], "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -1560,57 +1645,45 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "", - "../../symfony/yaml/" - ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "email": "sebastian@phpunit.de" } ], - "description": "The PHP Unit Testing framework.", - "homepage": "http://www.phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ], - "time": "2014-03-07 07:00:44" + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "time": "2016-02-13 06:45:14" }, { - "name": "phpunit/phpunit-mock-objects", - "version": "2.0.0", + "name": "sebastian/comparator", + "version": "1.2.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "f055539b22449034af4d232549c53b6cd49b9cff" + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/f055539b22449034af4d232549c53b6cd49b9cff", - "reference": "f055539b22449034af4d232549c53b6cd49b9cff", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", "shasum": "" }, "require": { "php": ">=5.3.3", - "phpunit/php-text-template": "~1.2" + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2" }, "require-dev": { - "phpunit/phpunit": ">=4.0.0,<4.1.0" - }, - "suggest": { - "ext-soap": "*" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -1619,48 +1692,60 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "email": "sebastian@phpunit.de" } ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", "keywords": [ - "mock", - "xunit" + "comparator", + "compare", + "equality" ], - "time": "2014-03-07 06:53:16" + "time": "2015-07-26 15:48:44" }, { "name": "sebastian/diff", - "version": "1.1.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d" + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d", - "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -1673,47 +1758,46 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - }, { "name": "Kore Nordmann", "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], "description": "Diff implementation", - "homepage": "http://www.github.com/sebastianbergmann/diff", + "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ "diff" ], - "time": "2013-08-03 16:46:33" + "time": "2015-12-08 07:14:41" }, { "name": "sebastian/environment", - "version": "1.0.0", + "version": "1.3.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a" + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/79517609ec01139cd7e9fded0dd7ce08c952ef6a", - "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "4.0.*@dev" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -1728,8 +1812,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "email": "sebastian@phpunit.de" } ], "description": "Provides functionality to handle HHVM/PHP environments", @@ -1739,32 +1822,34 @@ "environment", "hhvm" ], - "time": "2014-02-18 16:17:19" + "time": "2016-05-17 03:18:57" }, { "name": "sebastian/exporter", - "version": "1.0.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529" + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529", - "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.3", + "sebastian/recursion-context": "~1.0" }, "require-dev": { - "phpunit/phpunit": "4.0.*@dev" + "ext-mbstring": "*", + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -1777,11 +1862,6 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - }, { "name": "Jeff Welch", "email": "whatthejeff@gmail.com" @@ -1790,14 +1870,17 @@ "name": "Volker Dusch", "email": "github@wallbash.com" }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net", - "role": "Lead" - }, { "name": "Bernhard Schussek", "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" } ], "description": "Provides the functionality to export PHP variables for visualization", @@ -1806,23 +1889,37 @@ "export", "exporter" ], - "time": "2014-02-16 08:26:31" + "time": "2016-06-17 09:04:28" }, { - "name": "sebastian/version", - "version": "1.0.0", + "name": "sebastian/global-state", + "version": "1.1.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "16b021aed448b654ae05846e394e057e9a6f04cb" + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/16b021aed448b654ae05846e394e057e9a6f04cb", - "reference": "16b021aed448b654ae05846e394e057e9a6f04cb", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", "shasum": "" }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "suggest": { + "ext-uopz": "*" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -1835,290 +1932,304 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "email": "sebastian@phpunit.de" } ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "time": "2013-01-05 14:27:32" + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2015-10-12 03:26:01" }, { - "name": "symfony/console", - "version": "v2.3.0", - "target-dir": "Symfony/Component/Console", + "name": "sebastian/object-enumerator", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "36e238358617de042f7c1d93e012f06b3d7e5f40" + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "d4ca2fb70344987502567bc50081c03e6192fb26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/36e238358617de042f7c1d93e012f06b3d7e5f40", - "reference": "36e238358617de042f7c1d93e012f06b3d7e5f40", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26", + "reference": "d4ca2fb70344987502567bc50081c03e6192fb26", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.6", + "sebastian/recursion-context": "~1.0" }, "require-dev": { - "symfony/event-dispatcher": "~2.1" - }, - "suggest": { - "symfony/event-dispatcher": "" + "phpunit/phpunit": "~5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "psr-0": { - "Symfony\\Component\\Console\\": "" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Symfony Console Component", - "homepage": "http://symfony.com", - "time": "2013-05-30 05:11:26" + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2016-01-28 13:25:10" }, { - "name": "symfony/event-dispatcher", - "version": "v2.1.0", - "target-dir": "Symfony/Component/EventDispatcher", + "name": "sebastian/recursion-context", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "421520fd35ace52106947b2d6c2d9db49cb5a866" + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "913401df809e99e4f47b27cdd781f4a258d58791" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/421520fd35ace52106947b2d6c2d9db49cb5a866", - "reference": "421520fd35ace52106947b2d6c2d9db49cb5a866", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", + "reference": "913401df809e99e4f47b27cdd781f4a258d58791", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": "2.1.*" - }, - "suggest": { - "symfony/dependency-injection": "v2.1.0", - "symfony/http-kernel": "v2.1.0" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "psr-0": { - "Symfony\\Component\\EventDispatcher": "" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" }, { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" } ], - "description": "Symfony EventDispatcher Component", - "homepage": "http://symfony.com", - "time": "2012-08-22 13:48:41" + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2015-11-11 19:50:13" }, { - "name": "symfony/filesystem", - "version": "v2.1.0", - "target-dir": "Symfony/Component/Filesystem", + "name": "sebastian/resource-operations", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "57c95ad66231e75b63643df2bd5f6a8bc5603bef" + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/57c95ad66231e75b63643df2bd5f6a8bc5603bef", - "reference": "57c95ad66231e75b63643df2bd5f6a8bc5603bef", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "psr-0": { - "Symfony\\Component\\Filesystem": "" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], - "description": "Symfony Filesystem Component", - "homepage": "http://symfony.com", - "time": "2012-08-22 13:48:41" + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2015-07-28 20:34:47" }, { - "name": "symfony/finder", - "version": "v2.1.0", - "target-dir": "Symfony/Component/Finder", + "name": "sebastian/version", + "version": "2.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "e2e9f746294f60aed3bb5bc20da24e23b92f0479" + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/e2e9f746294f60aed3bb5bc20da24e23b92f0479", - "reference": "e2e9f746294f60aed3bb5bc20da24e23b92f0479", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5", + "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-0": { - "Symfony\\Component\\Finder": "" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Symfony Finder Component", - "homepage": "http://symfony.com", - "time": "2012-08-22 13:48:41" + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2016-02-04 12:56:52" }, { - "name": "symfony/process", - "version": "v2.3.0", - "target-dir": "Symfony/Component/Process", + "name": "squizlabs/php_codesniffer", + "version": "2.3.4", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "bb721b29e033594512f8b08386e13593b0faaf0f" + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "11a2545c44a5915f883e2e5ec12e14ed345e3ab2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/bb721b29e033594512f8b08386e13593b0faaf0f", - "reference": "bb721b29e033594512f8b08386e13593b0faaf0f", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/11a2545c44a5915f883e2e5ec12e14ed345e3ab2", + "reference": "11a2545c44a5915f883e2e5ec12e14ed345e3ab2", "shasum": "" }, "require": { - "php": ">=5.3.3" + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.1.2" }, + "bin": [ + "scripts/phpcs", + "scripts/phpcbf" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-0": { - "Symfony\\Component\\Process\\": "" - } + "classmap": [ + "CodeSniffer.php", + "CodeSniffer/CLI.php", + "CodeSniffer/Exception.php", + "CodeSniffer/File.php", + "CodeSniffer/Fixer.php", + "CodeSniffer/Report.php", + "CodeSniffer/Reporting.php", + "CodeSniffer/Sniff.php", + "CodeSniffer/Tokens.php", + "CodeSniffer/Reports/", + "CodeSniffer/Tokenizers/", + "CodeSniffer/DocGenerators/", + "CodeSniffer/Standards/AbstractPatternSniff.php", + "CodeSniffer/Standards/AbstractScopeSniff.php", + "CodeSniffer/Standards/AbstractVariableSniff.php", + "CodeSniffer/Standards/IncorrectPatternException.php", + "CodeSniffer/Standards/Generic/Sniffs/", + "CodeSniffer/Standards/MySource/Sniffs/", + "CodeSniffer/Standards/PEAR/Sniffs/", + "CodeSniffer/Standards/PSR1/Sniffs/", + "CodeSniffer/Standards/PSR2/Sniffs/", + "CodeSniffer/Standards/Squiz/Sniffs/", + "CodeSniffer/Standards/Zend/Sniffs/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Greg Sherwood", + "role": "lead" } ], - "description": "Symfony Process Component", - "homepage": "http://symfony.com", - "time": "2013-05-06 20:03:44" + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "http://www.squizlabs.com/php-codesniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2015-09-09 00:18:50" }, { - "name": "symfony/stopwatch", - "version": "v2.5.0", - "target-dir": "Symfony/Component/Stopwatch", + "name": "symfony/yaml", + "version": "v3.1.1", "source": { "type": "git", - "url": "https://github.com/symfony/Stopwatch.git", - "reference": "724d73604ebe6c1c9bdf36533b556123bd9075a1" + "url": "https://github.com/symfony/yaml.git", + "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/724d73604ebe6c1c9bdf36533b556123bd9075a1", - "reference": "724d73604ebe6c1c9bdf36533b556123bd9075a1", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c5a7e7fc273c758b92b85dcb9c46149ccda89623", + "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "3.1-dev" } }, "autoload": { - "psr-0": { - "Symfony\\Component\\Stopwatch\\": "" - } + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2127,63 +2238,74 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Stopwatch Component", - "homepage": "http://symfony.com", - "time": "2014-04-18 20:40:13" + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2016-06-14 11:18:07" }, { - "name": "symfony/yaml", - "version": "2.0.4", + "name": "webmozart/assert", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "e60c0d68640e662e88d879f0df139e022335a92a" + "url": "https://github.com/webmozart/assert.git", + "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e60c0d68640e662e88d879f0df139e022335a92a", - "reference": "e60c0d68640e662e88d879f0df139e022335a92a", + "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", + "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" } ], - "description": "Symfony Yaml Component", - "homepage": "http://symfony.com", - "time": "2011-09-26 22:55:43" + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2015-08-24 13:29:44" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": [], - "prefer-stable": true, - "prefer-lowest": true, + "prefer-stable": false, + "prefer-lowest": false, "platform": { - "php": "^5.5 || ^7.0" + "php": "^5.6 || ^7.0" }, "platform-dev": [] } diff --git a/phpcs.xml b/phpcs.xml new file mode 100644 index 0000000..e994eae --- /dev/null +++ b/phpcs.xml @@ -0,0 +1,21 @@ + + + Zend Framework coding standard + + + + + + + + + + + + + + + + src + test + diff --git a/src/Collector/ConfigCollector.php b/src/Collector/ConfigCollector.php index 6c56a34..f4b0aa0 100644 --- a/src/Collector/ConfigCollector.php +++ b/src/Collector/ConfigCollector.php @@ -153,7 +153,8 @@ private function unserializeArray(array $data) } if ($value instanceof ClosureStub) { - $unserialized[$key] = function () {}; + $unserialized[$key] = function () { + }; continue; } diff --git a/src/Listener/ToolbarListener.php b/src/Listener/ToolbarListener.php index a894e02..e5c9add 100644 --- a/src/Listener/ToolbarListener.php +++ b/src/Listener/ToolbarListener.php @@ -28,6 +28,7 @@ use ZendDeveloperTools\Exception\InvalidOptionException; use Zend\EventManager\EventManagerInterface; use Zend\EventManager\ListenerAggregateInterface; +use Zend\EventManager\ListenerAggregateTrait; /** * Developer Toolbar Listener @@ -37,6 +38,8 @@ */ class ToolbarListener implements ListenerAggregateInterface { + use ListenerAggregateTrait; + /** * Time to live for the version cache in seconds. * @@ -68,11 +71,6 @@ class ToolbarListener implements ListenerAggregateInterface */ protected $options; - /** - * @var array - */ - protected $listeners = []; - /** * Constructor. * @@ -90,19 +88,12 @@ public function __construct($viewRenderer, Options $options) */ public function attach(EventManagerInterface $events, $priority = 1) { - $this->listeners[] = $events->getSharedManager()->attach('profiler', ProfilerEvent::EVENT_COLLECTED, [$this, 'onCollected'], Profiler::PRIORITY_TOOLBAR); - } - - /** - * {@inheritdoc} - */ - public function detach(EventManagerInterface $events) - { - foreach ($this->listeners as $index => $listener) { - if ($events->detach($listener)) { - unset($this->listeners[$index]); - } - } + $this->listeners[] = $events->getSharedManager()->attach( + 'profiler', + ProfilerEvent::EVENT_COLLECTED, + [$this, 'onCollected'], + Profiler::PRIORITY_TOOLBAR + ); } /** @@ -211,7 +202,10 @@ protected function renderEntries(ProfilerEvent $event) try { $collectorInstance = $report->getCollector($name); - if ($this->options->getToolbarAutoHide() && $collectorInstance instanceof AutoHideInterface && $collectorInstance->canHide()) { + if ($this->options->getToolbarAutoHide() + && $collectorInstance instanceof AutoHideInterface + && $collectorInstance->canHide() + ) { continue; } diff --git a/src/Module.php b/src/Module.php index e6d66ae..0d723af 100644 --- a/src/Module.php +++ b/src/Module.php @@ -180,7 +180,10 @@ public function getServiceConfig() return new Listener\StorageListener($sm); }, 'ZendDeveloperTools\ToolbarListener' => function ($sm) { - return new Listener\ToolbarListener($sm->get('ViewRenderer'), $sm->get('ZendDeveloperTools\Config')); + return new Listener\ToolbarListener( + $sm->get('ViewRenderer'), + $sm->get('ZendDeveloperTools\Config') + ); }, 'ZendDeveloperTools\ProfilerListener' => function ($sm) { return new Listener\ProfilerListener($sm, $sm->get('ZendDeveloperTools\Config')); diff --git a/test/OptionsTest.php b/test/OptionsTest.php index 1b10329..7d9ea0a 100644 --- a/test/OptionsTest.php +++ b/test/OptionsTest.php @@ -3,13 +3,14 @@ use PHPUnit_Framework_TestCase; use ZendDeveloperTools\Options; +use ZendDeveloperTools\ReportInterface; class OptionsTest extends PHPUnit_Framework_TestCase { public function testStatusOfDefaultConfiguration() { - $dist = require __DIR__."/../config/zenddevelopertools.local.php.dist"; - $reportMock = $this->getMock("ZendDeveloperTools\\ReportInterface"); + $dist = require __DIR__ . '/../config/zenddevelopertools.local.php.dist'; + $reportMock = $this->prophesize(ReportInterface::class)->reveal(); $options = new Options($dist['zenddevelopertools'], $reportMock); $this->assertTrue($options->isEnabled()); $this->assertTrue($options->isToolbarEnabled()); From 4662f686411711dba89af6dc4f8c93695dbeb4f6 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 27 Jun 2016 14:20:43 -0500 Subject: [PATCH 27/35] Check config files as well as source files Fixes short array syntax. --- config/zenddevelopertools.local.php.dist | 30 ++++++++++++------------ phpcs.xml | 2 ++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/config/zenddevelopertools.local.php.dist b/config/zenddevelopertools.local.php.dist index 5f01dca..2df2892 100644 --- a/config/zenddevelopertools.local.php.dist +++ b/config/zenddevelopertools.local.php.dist @@ -1,10 +1,10 @@ array( +return [ + 'zenddevelopertools' => [ /** * General Profiler settings */ - 'profiler' => array( + 'profiler' => [ /** * Enables or disables the profiler. * @@ -51,7 +51,7 @@ return array( * 'matcher' => array('url' => array('path' => '/admin') * Note: The matcher is not implemented yet! */ - 'matcher' => array(), + 'matcher' => [], /** * Contains a list with all collector the profiler should run. Zend Developer Tools ships with @@ -61,9 +61,9 @@ return array( * Example: 'collectors' => array('db' => null) * Expects: array */ - 'collectors' => array() - ), - 'events' => array( + 'collectors' => [], + ], + 'events' => [ /** * Set to true to enable event-level logging for collectors that will support it. This enables a wildcard * listener onto the shared event manager that will allow profiling of user-defined events as well as the @@ -81,7 +81,7 @@ return array( * Example: 'collectors' => array('memory' => null) * Expects: array */ - 'collectors' => array(), + 'collectors' => [], /** * Contains event identifiers used with the event listener. Zend Developer Tools defaults to listen to all @@ -91,12 +91,12 @@ return array( * Example: 'identifiers' => array('all' => null, 'dispatchable' => 'Zend\Stdlib\DispatchableInterface') * Expects: array */ - 'identifiers' => array() - ), + 'identifiers' => [], + ], /** * General Toolbar settings */ - 'toolbar' => array( + 'toolbar' => [ /** * Enables or disables the Toolbar. * @@ -147,7 +147,7 @@ return array( * ), * Expects: array */ - 'entries' => array() - ) - ) -); + 'entries' => [], + ], + ], +]; diff --git a/phpcs.xml b/phpcs.xml index e994eae..03cab89 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -18,4 +18,6 @@ src test + config/module.config.php + config/zenddevelopertools.local.php.dist From 8c61694ae59599541ea39aff52c1e284dca325e2 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 27 Jun 2016 14:27:41 -0500 Subject: [PATCH 28/35] Added scripts to composer, and updated travis to use them Also ensures: - usage of docker build containers - removal of PHP 5.5 items from matrix - caching of composer assets - definition of composer arguments --- .travis.yml | 47 +++++++++++++++++++++-------------------------- composer.json | 11 +++++++++++ 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 35545a0..e5c6ffe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,40 +1,25 @@ -language: php +sudo: false -php: - - 5.5 - - 5.6 - - 7 +language: php -before_install: - - composer self-update +cache: + directories: + - $HOME/.composer/cache + - vendor -install: - - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi - - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi - - travis_retry composer install $COMPOSER_ARGS - - composer show --installed +env: + global: + - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs" matrix: fast_finish: true include: - - php: 5.5 - env: - - DEPS=lowest - - php: 5.5 - env: - - EXECUTE_CS_CHECK=true - - DEPS=locked - - php: 5.5 - env: - - DEPS=latest - php: 5.6 env: - DEPS=lowest - php: 5.6 env: - DEPS=locked - - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)" - - PATH="$HOME/.local/bin:$PATH" - php: 5.6 env: - DEPS=latest @@ -44,10 +29,20 @@ matrix: - php: 7 env: - DEPS=locked + - CS_CHECK=true - php: 7 env: - DEPS=latest +before_install: + - travis_retry composer self-update + +install: + - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi + - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi + - travis_retry composer install $COMPOSER_ARGS + - composer show + script: - - ./vendor/bin/phpunit - - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi + - composer test + - if [[ $CS_CHECK == 'true' ]]; then composer cs ; fi diff --git a/composer.json b/composer.json index 762061d..ce5c632 100644 --- a/composer.json +++ b/composer.json @@ -54,5 +54,16 @@ "psr-4": { "ZendDeveloperToolsTest\\": "test/" } + }, + "scripts": { + "check": [ + "@cs", + "@test" + ], + "coveralls": "coveralls", + "cs": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit", + "test-coverage": "phpunit --coverage-clover clover.xml" } } From 0628d53646e5e9568f59aef141ff3f8dda7ea978 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 27 Jun 2016 14:36:25 -0500 Subject: [PATCH 29/35] New ignore rules, plus attributes (to ignore files on dist build) --- .gitattributes | 9 +++++++++ .gitignore | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..57607c1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +/doc export-ignore +/test export-ignore +/vendor export-ignore +.coveralls.yml export-ignore +.gitattributes export-ignore +.gitignore export-ignore +.travis.yml export-ignore +phpcs.xml export-ignore +phpunit.xml.dist export-ignore diff --git a/.gitignore b/.gitignore index 4f13a2b..9497d96 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ nbproject .project .settings/ .DS_Store -vendor +vendor/ From 9bd983b52748026c77a7e95b9498abd96fb6066f Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 27 Jun 2016 14:45:13 -0500 Subject: [PATCH 30/35] Use the ListenerAggregateTrait to remove code duplication --- src/Listener/FirePhpListener.php | 20 +++----------------- src/Listener/FlushListener.php | 18 ++---------------- src/Listener/ProfilerListener.php | 20 +++----------------- src/Listener/StorageListener.php | 21 +++------------------ 4 files changed, 11 insertions(+), 68 deletions(-) diff --git a/src/Listener/FirePhpListener.php b/src/Listener/FirePhpListener.php index e8938c1..e34bd27 100644 --- a/src/Listener/FirePhpListener.php +++ b/src/Listener/FirePhpListener.php @@ -13,6 +13,7 @@ use ZendDeveloperTools\ProfilerEvent; use Zend\EventManager\EventManagerInterface; use Zend\EventManager\ListenerAggregateInterface; +use Zend\EventManager\ListenerAggregateTrait; use Zend\ServiceManager\ServiceLocatorInterface; /** @@ -21,16 +22,13 @@ */ class FirePhpListener implements ListenerAggregateInterface { + use ListenerAggregateTrait; + /** * @var ServiceLocatorInterface */ protected $serviceLocator; - /** - * @var array - */ - protected $listeners = []; - /** * Constructor. * @@ -53,18 +51,6 @@ public function attach(EventManagerInterface $events, $priority = 1) ); } - /** - * {@inheritdoc} - */ - public function detach(EventManagerInterface $events) - { - foreach ($this->listeners as $index => $listener) { - if ($events->detach($listener)) { - unset($this->listeners[$index]); - } - } - } - /** * ProfilerEvent::EVENT_COLLECTED event callback. * diff --git a/src/Listener/FlushListener.php b/src/Listener/FlushListener.php index 8b9ac1c..3cb6139 100644 --- a/src/Listener/FlushListener.php +++ b/src/Listener/FlushListener.php @@ -14,6 +14,7 @@ use Zend\Stdlib\ResponseInterface; use Zend\EventManager\EventManagerInterface; use Zend\EventManager\ListenerAggregateInterface; +use Zend\EventManager\ListenerAggregateTrait; /** * Flush Listener @@ -23,10 +24,7 @@ */ class FlushListener implements ListenerAggregateInterface { - /** - * @var array - */ - protected $listeners = []; + use ListenerAggregateTrait; /** * {@inheritdoc} @@ -40,18 +38,6 @@ public function attach(EventManagerInterface $events, $priority = 1) ); } - /** - * {@inheritdoc} - */ - public function detach(EventManagerInterface $events) - { - foreach ($this->listeners as $index => $listener) { - if ($events->detach($listener)) { - unset($this->listeners[$index]); - } - } - } - /** * MvcEvent::EVENT_FINISH event callback * diff --git a/src/Listener/ProfilerListener.php b/src/Listener/ProfilerListener.php index 9f91b22..204fc06 100644 --- a/src/Listener/ProfilerListener.php +++ b/src/Listener/ProfilerListener.php @@ -14,6 +14,7 @@ use ZendDeveloperTools\Profiler; use Zend\EventManager\EventManagerInterface; use Zend\EventManager\ListenerAggregateInterface; +use Zend\EventManager\ListenerAggregateTrait; use Zend\ServiceManager\ServiceLocatorInterface; use Zend\ServiceManager\Exception\ServiceNotFoundException; @@ -25,6 +26,8 @@ */ class ProfilerListener implements ListenerAggregateInterface { + use ListenerAggregateTrait; + /** * @var ServiceLocatorInterface */ @@ -35,11 +38,6 @@ class ProfilerListener implements ListenerAggregateInterface */ protected $options; - /** - * @var array - */ - protected $listeners = []; - /** * Constructor. * @@ -64,18 +62,6 @@ public function attach(EventManagerInterface $events, $priority = 1) ); } - /** - * {@inheritdoc} - */ - public function detach(EventManagerInterface $events) - { - foreach ($this->listeners as $index => $listener) { - if ($events->detach($listener)) { - unset($this->listeners[$index]); - } - } - } - /** * MvcEvent::EVENT_FINISH event callback * diff --git a/src/Listener/StorageListener.php b/src/Listener/StorageListener.php index 5c74252..8ec03f7 100644 --- a/src/Listener/StorageListener.php +++ b/src/Listener/StorageListener.php @@ -13,24 +13,21 @@ use ZendDeveloperTools\ProfilerEvent; use Zend\EventManager\EventManagerInterface; use Zend\EventManager\ListenerAggregateInterface; +use Zend\EventManager\ListenerAggregateTrait; use Zend\ServiceManager\ServiceLocatorInterface; /** * Report Storage Listener - * */ class StorageListener implements ListenerAggregateInterface { + use ListenerAggregateTrait; + /** * @var ServiceLocatorInterface */ protected $serviceLocator; - /** - * @var array - */ - protected $listeners = []; - /** * Constructor. * @@ -53,18 +50,6 @@ public function attach(EventManagerInterface $events, $priority = 1) ); } - /** - * {@inheritdoc} - */ - public function detach(EventManagerInterface $events) - { - foreach ($this->listeners as $index => $listener) { - if ($events->detach($listener)) { - unset($this->listeners[$index]); - } - } - } - /** * ProfilerEvent::EVENT_COLLECTED event callback. * From 08410a24c5bd99c9d182ba171b53c515222ddf9a Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 27 Jun 2016 15:28:07 -0500 Subject: [PATCH 31/35] Consistency and normalization Various changes to ensure consistency between all files: - license docblocks if they were missing - space after `!` operator - return/continue early --- src/Collector/ConfigCollector.php | 6 - src/Collector/DbCollector.php | 7 +- src/Collector/MemoryCollector.php | 6 +- src/Collector/RequestCollector.php | 33 ++-- src/Collector/TimeCollector.php | 33 ++-- src/EventLogging/EventContextInterface.php | 6 + src/EventLogging/EventContextProvider.php | 10 +- src/Exception/SerializableException.php | 29 +++- src/Listener/FlushListener.php | 2 +- src/Listener/ProfilerListener.php | 14 +- src/Listener/ToolbarListener.php | 9 +- src/Module.php | 12 +- src/Options.php | 174 +++++++++++---------- src/Profiler.php | 29 ++-- src/ProfilerEvent.php | 3 - src/Report.php | 9 +- src/View/Helper/DetailArray.php | 2 +- src/View/Helper/Memory.php | 8 +- src/View/Helper/Time.php | 8 +- 19 files changed, 225 insertions(+), 175 deletions(-) diff --git a/src/Collector/ConfigCollector.php b/src/Collector/ConfigCollector.php index f4b0aa0..67a5b25 100644 --- a/src/Collector/ConfigCollector.php +++ b/src/Collector/ConfigCollector.php @@ -108,7 +108,6 @@ public function unserialize($serialized) * Replaces the un-serializable items in an array with stubs * * @param array|\Traversable $data - * * @return array */ private function makeArraySerializable($data) @@ -118,13 +117,11 @@ private function makeArraySerializable($data) foreach (ArrayUtils::iteratorToArray($data) as $key => $value) { if ($value instanceof Traversable || is_array($value)) { $serializable[$key] = $this->makeArraySerializable($value); - continue; } if ($value instanceof Closure) { $serializable[$key] = new ClosureStub(); - continue; } @@ -138,7 +135,6 @@ private function makeArraySerializable($data) * Opposite of {@see makeArraySerializable} - replaces stubs in an array with actual un-serializable objects * * @param array $data - * * @return array */ private function unserializeArray(array $data) @@ -148,14 +144,12 @@ private function unserializeArray(array $data) foreach (ArrayUtils::iteratorToArray($data) as $key => $value) { if ($value instanceof Traversable || is_array($value)) { $unserialized[$key] = $this->unserializeArray($value); - continue; } if ($value instanceof ClosureStub) { $unserialized[$key] = function () { }; - continue; } diff --git a/src/Collector/DbCollector.php b/src/Collector/DbCollector.php index eef830f..5960ced 100644 --- a/src/Collector/DbCollector.php +++ b/src/Collector/DbCollector.php @@ -52,9 +52,11 @@ public function collect(MvcEvent $mvcEvent) */ public function canHide() { - if (!isset($this->profiler)) { + if (! isset($this->profiler)) { return false; - } elseif ($this->getQueryCount() > 0) { + } + + if ($this->getQueryCount() > 0) { return false; } @@ -90,7 +92,6 @@ public function getProfiler() public function setProfiler(Profiler $profiler) { $this->profiler = $profiler; - return $this; } diff --git a/src/Collector/MemoryCollector.php b/src/Collector/MemoryCollector.php index 2f37feb..48fb2af 100644 --- a/src/Collector/MemoryCollector.php +++ b/src/Collector/MemoryCollector.php @@ -38,7 +38,7 @@ public function getPriority() */ public function collect(MvcEvent $mvcEvent) { - if (!isset($this->data)) { + if (! isset($this->data)) { $this->data = []; } @@ -61,7 +61,7 @@ public function collectEvent($id, Event $event) $context['line'] = $contextProvider->getEventTriggerLine(); $context['memory'] = memory_get_usage(true); - if (!isset($this->data['event'][$id])) { + if (! isset($this->data['event'][$id])) { $this->data['event'][$id] = []; } @@ -97,7 +97,7 @@ public function getApplicationEventMemory() { $result = []; - if (!isset($this->data['event']['application'])) { + if (! isset($this->data['event']['application'])) { return $result; } diff --git a/src/Collector/RequestCollector.php b/src/Collector/RequestCollector.php index e6625dc..f1fee21 100644 --- a/src/Collector/RequestCollector.php +++ b/src/Collector/RequestCollector.php @@ -55,6 +55,7 @@ public function collect(MvcEvent $mvcEvent) $var = $key . ': ' . (is_object($var) ? get_class($var) : gettype($var)); } sort($vars); + $views[] = [ 'template' => $child->getTemplate(), 'vars' => $vars, @@ -65,11 +66,11 @@ public function collect(MvcEvent $mvcEvent) $this->addChildrenToView($viewModel, $addToViewFromModel); $this->data = [ - 'views' => $views, - 'method' => $mvcEvent->getRequest()->getMethod(), - 'status' => $mvcEvent->getResponse()->getStatusCode(), - 'route' => ($match === null) ? 'N/A' : $match->getMatchedRouteName(), - 'action' => ($match === null) ? 'N/A' : $match->getParam('action', 'N/A'), + 'views' => $views, + 'method' => $mvcEvent->getRequest()->getMethod(), + 'status' => $mvcEvent->getResponse()->getStatusCode(), + 'route' => ($match === null) ? 'N/A' : $match->getMatchedRouteName(), + 'action' => ($match === null) ? 'N/A' : $match->getParam('action', 'N/A'), 'controller' => ($match === null) ? 'N/A' : $match->getParam('controller', 'N/A') ]; } @@ -80,11 +81,13 @@ public function collect(MvcEvent $mvcEvent) */ protected function addChildrenToView(ModelInterface $viewModel, $addToViewFromModel) { - if ($viewModel->hasChildren()) { - foreach ($viewModel->getChildren() as $child) { - $addToViewFromModel($child); - $this->addChildrenToView($child, $addToViewFromModel); - } + if (! $viewModel->hasChildren()) { + return; + } + + foreach ($viewModel->getChildren() as $child) { + $addToViewFromModel($child); + $this->addChildrenToView($child, $addToViewFromModel); } } @@ -147,20 +150,20 @@ public function getControllerName() */ public function getFullControllerName($short = true) { + $controller = $this->data['controller']; + if ($short) { - $controller = explode('\\', $this->data['controller']); + $controller = explode('\\', $controller); $controller = array_pop($controller); - } else { - $controller = $this->data['controller']; } $return = sprintf('%s::%s', $controller, $this->data['action']); if ($return === 'N/A::N/A') { return 'N/A'; - } else { - return $return; } + + return $return; } /** diff --git a/src/Collector/TimeCollector.php b/src/Collector/TimeCollector.php index 50873bf..8f28e0c 100644 --- a/src/Collector/TimeCollector.php +++ b/src/Collector/TimeCollector.php @@ -38,15 +38,9 @@ public function getPriority() */ public function collect(MvcEvent $mvcEvent) { - if (PHP_VERSION_ID >= 50400) { - $start = $mvcEvent->getRequest()->getServer()->get('REQUEST_TIME_FLOAT'); - } elseif (defined('REQUEST_MICROTIME')) { - $start = REQUEST_MICROTIME; - } else { - $start = $mvcEvent->getRequest()->getServer()->get('REQUEST_TIME'); - } + $start = $this->marshalStartTime($mvcEvent); - if (!isset($this->data)) { + if (! isset($this->data)) { $this->data = []; } @@ -69,7 +63,7 @@ public function collectEvent($id, Event $event) $context['file'] = $contextProvider->getEventTriggerFile(); $context['line'] = $contextProvider->getEventTriggerLine(); - if (!isset($this->data['event'][$id])) { + if (! isset($this->data['event'][$id])) { $this->data['event'][$id] = []; } @@ -115,7 +109,7 @@ public function getApplicationEventTimes() { $result = []; - if (!isset($this->data['event']['application'])) { + if (! isset($this->data['event']['application'])) { return $result; } @@ -133,4 +127,23 @@ public function getApplicationEventTimes() return $result; } + + /** + * Determine the start time + * + * @param MvcEvent $mvcEvent + * @return float + */ + private function marshalStartTime(MvcEvent $mvcEvent) + { + if (PHP_VERSION_ID >= 50400) { + return $mvcEvent->getRequest()->getServer()->get('REQUEST_TIME_FLOAT'); + } + + if (defined('REQUEST_MICROTIME')) { + return REQUEST_MICROTIME; + } + + return $mvcEvent->getRequest()->getServer()->get('REQUEST_TIME'); + } } diff --git a/src/EventLogging/EventContextInterface.php b/src/EventLogging/EventContextInterface.php index a9a267c..7efe0ee 100644 --- a/src/EventLogging/EventContextInterface.php +++ b/src/EventLogging/EventContextInterface.php @@ -1,4 +1,10 @@ debugBacktrace) { + if (! $this->debugBacktrace) { //Remove the levels this method introduces $trace = debug_backtrace(); $this->debugBacktrace = array_splice($trace, 2); @@ -118,6 +124,7 @@ private function getDebugBacktrace() public function getEventTriggerFile() { $backtrace = $this->getDebugBacktrace(); + if (file_exists($backtrace[4]['file'])) { return basename(dirname($backtrace[4]['file'])) . '/' . basename($backtrace[4]['file']); } @@ -133,6 +140,7 @@ public function getEventTriggerFile() public function getEventTriggerLine() { $backtrace = $this->getDebugBacktrace(); + if (isset($backtrace[4]['line'])) { return $backtrace[4]['line']; } diff --git a/src/Exception/SerializableException.php b/src/Exception/SerializableException.php index b3f15e6..ecd3249 100644 --- a/src/Exception/SerializableException.php +++ b/src/Exception/SerializableException.php @@ -164,21 +164,34 @@ protected function filterArgs($args, $level = 0) foreach ($args as $key => $value) { if (is_object($value)) { $result[$key] = ['object', get_class($value)]; - } elseif (is_array($value)) { + continue; + } + + if (is_array($value)) { if ($level > 10) { $result[$key] = ['array', '*DEEP NESTED ARRAY*']; - } else { - $result[$key] = ['array', $this->filterArgs($value, ++$level)]; + continue; } - } elseif (null === $value) { + $result[$key] = ['array', $this->filterArgs($value, ++$level)]; + continue; + } + + if (null === $value) { $result[$key] = ['null', null]; - } elseif (is_bool($value)) { + continue; + } + + if (is_bool($value)) { $result[$key] = ['boolean', $value]; - } elseif (is_resource($value)) { + continue; + } + + if (is_resource($value)) { $result[$key] = ['resource', get_resource_type($value)]; - } else { - $result[$key] = ['string', (string) $value]; + continue; } + + $result[$key] = ['string', (string) $value]; } return $result; diff --git a/src/Listener/FlushListener.php b/src/Listener/FlushListener.php index 3cb6139..067901b 100644 --- a/src/Listener/FlushListener.php +++ b/src/Listener/FlushListener.php @@ -46,7 +46,7 @@ public function attach(EventManagerInterface $events, $priority = 1) public function onFinish(MvcEvent $event) { $response = $event->getResponse(); - if (!$response instanceof ResponseInterface) { + if (! $response instanceof ResponseInterface) { return; } diff --git a/src/Listener/ProfilerListener.php b/src/Listener/ProfilerListener.php index 204fc06..0f5bd42 100644 --- a/src/Listener/ProfilerListener.php +++ b/src/Listener/ProfilerListener.php @@ -80,14 +80,14 @@ public function onFinish(MvcEvent $event) foreach ($collectors as $name => $collector) { if ($this->serviceLocator->has($collector)) { $profiler->addCollector($this->serviceLocator->get($collector)); - } else { - $error = sprintf('Unable to fetch or create an instance for %s.', $collector); - if ($strict === true) { - throw new ServiceNotFoundException($error); - } else { - $report->addError($error); - } + continue; } + + $error = sprintf('Unable to fetch or create an instance for %s.', $collector); + if ($strict === true) { + throw new ServiceNotFoundException($error); + } + $report->addError($error); } $profiler->collect($event); diff --git a/src/Listener/ToolbarListener.php b/src/Listener/ToolbarListener.php index e5c9add..257e62f 100644 --- a/src/Listener/ToolbarListener.php +++ b/src/Listener/ToolbarListener.php @@ -221,7 +221,7 @@ protected function renderEntries(ProfilerEvent $event) } } - if (!empty($errors) || $report->hasErrors()) { + if (! empty($errors) || $report->hasErrors()) { $tmp = []; foreach ($errors as $name => $template) { $cur = sprintf('Unable to render toolbar template %s (%s).', $name, $template); @@ -252,7 +252,7 @@ protected function renderEntries(ProfilerEvent $event) */ protected function getLatestVersion($currentVersion) { - if (!$this->options->isVersionCheckEnabled()) { + if (! $this->options->isVersionCheckEnabled()) { return [true, '']; } @@ -260,7 +260,7 @@ protected function getLatestVersion($currentVersion) // exit early if the cache dir doesn't exist, // to prevent hitting the GitHub API for every request. - if (!is_dir($cacheDir)) { + if (! is_dir($cacheDir)) { return [true, '']; } @@ -299,12 +299,11 @@ protected function getLatestVersion($currentVersion) private function getModules(ProfilerEvent $event) { - if (!$application = $event->getApplication()) { + if (! $application = $event->getApplication()) { return; } $serviceManager = $application->getServiceManager(); - /* @var $moduleManager \Zend\ModuleManager\ModuleManagerInterface */ $moduleManager = $serviceManager->get('ModuleManager'); return array_keys($moduleManager->getLoadedModules()); diff --git a/src/Module.php b/src/Module.php index 0d723af..9460321 100644 --- a/src/Module.php +++ b/src/Module.php @@ -189,7 +189,6 @@ public function getServiceConfig() return new Listener\ProfilerListener($sm, $sm->get('ZendDeveloperTools\Config')); }, 'ZendDeveloperTools\EventLoggingListenerAggregate' => function ($sm) { - /* @var $config \ZendDeveloperTools\Options */ $config = $sm->get('ZendDeveloperTools\Config'); return new Listener\EventLoggingListenerAggregate( @@ -208,7 +207,16 @@ public function getServiceConfig() $db->setProfiler($adapter->getProfiler()); } } - if (!$p && $sm->has('Zend\Db\Adapter\ProfilingAdapter')) { + + if (! $p && $sm->has('Zend\Db\Adapter\AdapterInterface')) { + $adapter = $sm->get('Zend\Db\Adapter\AdapterInterface'); + if ($adapter instanceof ProfilingAdapter) { + $p = true; + $db->setProfiler($adapter->getProfiler()); + } + } + + if (! $p && $sm->has('Zend\Db\Adapter\ProfilingAdapter')) { $adapter = $sm->get('Zend\Db\Adapter\ProfilingAdapter'); if ($adapter instanceof ProfilingAdapter) { $db->setProfiler($adapter->getProfiler()); diff --git a/src/Options.php b/src/Options.php index d6f5817..5aa3a47 100644 --- a/src/Options.php +++ b/src/Options.php @@ -11,6 +11,9 @@ use Zend\Stdlib\AbstractOptions; +/** + * @todo storage and firephp options + */ class Options extends AbstractOptions { /** @@ -28,12 +31,12 @@ class Options extends AbstractOptions 'cache_dir' => 'data/cache', 'matcher' => [], 'collectors' => [ - 'db' => 'ZendDeveloperTools\DbCollector', - 'exception' => 'ZendDeveloperTools\ExceptionCollector', - 'request' => 'ZendDeveloperTools\RequestCollector', - 'config' => 'ZendDeveloperTools\ConfigCollector', - 'memory' => 'ZendDeveloperTools\MemoryCollector', - 'time' => 'ZendDeveloperTools\TimeCollector', + 'db' => DbCollector::class, + 'exception' => ExceptionCollector::class, + 'request' => RequestCollector::class, + 'config' => ConfigCollector::class, + 'memory' => MemoryCollector::class, + 'time' => TimeCollector::class, ], ]; @@ -44,8 +47,8 @@ class Options extends AbstractOptions protected $events = [ 'enabled' => false, 'collectors' => [ - 'memory' => 'ZendDeveloperTools\MemoryCollector', - 'time' => 'ZendDeveloperTools\TimeCollector', + 'memory' => MemoryCollector::class, + 'time' => TimeCollector::class, ], 'identifiers' => [ 'all' => '*' @@ -90,23 +93,28 @@ public function __construct($options, ReportInterface $report) */ public function setProfiler(array $options) { - if (isset($options['enabled'])) { - $this->profiler['enabled'] = (bool) $options['enabled']; - } - if (isset($options['strict'])) { - $this->profiler['strict'] = (bool) $options['strict']; - } - if (isset($options['flush_early'])) { - $this->profiler['flush_early'] = (bool) $options['flush_early']; - } - if (isset($options['cache_dir'])) { - $this->profiler['cache_dir'] = (string) $options['cache_dir']; - } - if (isset($options['matcher'])) { - $this->setMatcher($options['matcher']); - } - if (isset($options['collectors'])) { - $this->setCollectors($options['collectors']); + foreach ($options as $key => $value) { + switch ($key) { + case 'enabled': + // fall-through + case 'strict': + // fall-through + case 'flush_early': + $this->profiler[$key] = (bool) $value; + continue; + case 'cache_dir': + $this->profiler[$key] = (string) $value; + continue; + case 'matcher': + $this->setMatcher($value); + continue; + case 'collectors': + $this->setCollectors($value); + continue; + default: + // unknown option + continue; + } } } @@ -120,9 +128,11 @@ public function setEvents(array $options) if (isset($options['enabled'])) { $this->events['enabled'] = (bool) $options['enabled']; } + if (isset($options['collectors'])) { $this->setEventCollectors($options['collectors']); } + if (isset($options['identifiers'])) { $this->setEventIdentifiers($options['identifiers']); } @@ -136,12 +146,11 @@ public function setEvents(array $options) */ protected function setMatcher($options) { - if (!is_array($options)) { + if (! is_array($options)) { $this->report->addError(sprintf( - '[\'zenddevelopertools\'][\'profiler\'][\'matcher\'] must be an array, %s given.', + "['zenddevelopertools']['profiler']['matcher'] must be an array, %s given.", gettype($options) )); - return; } @@ -155,21 +164,21 @@ protected function setMatcher($options) */ protected function setCollectors($options) { - if (!is_array($options)) { + if (! is_array($options)) { $this->report->addError(sprintf( - '[\'zenddevelopertools\'][\'profiler\'][\'collectors\'] must be an array, %s given.', + "['zenddevelopertools']['profiler']['collectors'] must be an array, %s given.", gettype($options) )); - return; } foreach ($options as $name => $collector) { if (($collector === false || $collector === null)) { unset($this->profiler['collectors'][$name]); - } else { - $this->profiler['collectors'][$name] = $collector; + continue; } + + $this->profiler['collectors'][$name] = $collector; } } @@ -190,21 +199,21 @@ public function isEnabled() */ public function setEventCollectors(array $options) { - if (!is_array($options)) { + if (! is_array($options)) { $this->report->addError(sprintf( - '[\'zenddevelopertools\'][\'events\'][\'collectors\'] must be an array, %s given.', + "['zenddevelopertools']['events']['collectors'] must be an array, %s given.", gettype($options) )); - return; } foreach ($options as $name => $collector) { if (($collector === false || $collector === null)) { unset($this->events['collectors'][$name]); - } else { - $this->events['collectors'][$name] = $collector; + continue; } + + $this->events['collectors'][$name] = $collector; } } @@ -216,21 +225,21 @@ public function setEventCollectors(array $options) */ public function setEventIdentifiers(array $options) { - if (!is_array($options)) { + if (! is_array($options)) { $this->report->addError(sprintf( '[\'zenddevelopertools\'][\'events\'][\'identifiers\'] must be an array, %s given.', gettype($options) )); - return; } foreach ($options as $name => $identifier) { if (($identifier === false || $identifier === null)) { unset($this->events['identifiers'][$name]); - } else { - $this->events['identifiers'][$name] = $identifier; + continue; } + + $this->events['identifiers'][$name] = $identifier; } } @@ -264,11 +273,9 @@ public function isStrict() */ public function canFlushEarly() { - return ( - $this->profiler['flush_early'] && - !$this->profiler['strict'] && - !$this->toolbar['enabled'] - ); + return ($this->profiler['flush_early'] + && ! $this->profiler['strict'] + && ! $this->toolbar['enabled']); } /** @@ -322,39 +329,46 @@ public function getEventIdentifiers() */ public function setToolbar(array $options) { - if (isset($options['enabled'])) { - $this->toolbar['enabled'] = (bool) $options['enabled']; - } - if (isset($options['auto_hide'])) { - $this->toolbar['auto_hide'] = (bool) $options['auto_hide']; - } - if (isset($options['version_check'])) { - $this->toolbar['version_check'] = (bool) $options['version_check']; - } - if (isset($options['position'])) { - if ($options['position'] !== 'bottom' && $options['position'] !== 'top') { - $this->report->addError(sprintf( - '[\'zenddevelopertools\'][\'toolbar\'][\'position\'] must be "top" or "bottom", %s given.', - $options['position'] - )); - } else { - $this->toolbar['position'] = $options['position']; - } - } - if (isset($options['entries'])) { - if (is_array($options['entries'])) { - foreach ($options['entries'] as $collector => $template) { - if ($template === false || $template === null) { - unset($this->toolbar['entries'][$collector]); - } else { - $this->toolbar['entries'][$collector] = $template; + foreach ($options as $key => $value) { + switch ($key) { + case 'enabled': + // fall-through + case 'auto_hide': + // fall-through + case 'version_check': + $this->toolbar[$key] = (bool) $value; + continue; + case 'position': + if ($value !== 'bottom' && $value !== 'top') { + $this->report->addError(sprintf( + "['zenddevelopertools']['toolbar']['position'] must be 'top' or 'bottom', %s given.", + $value + )); + continue; + } + $this->toolbar[$key] = $value; + continue; + case 'entries': + if (! is_array($value)) { + $this->report->addError(sprintf( + "['zenddevelopertools']['toolbar']['entries'] must be an array, %s given.", + gettype($value) + )); } - } - } else { - $this->report->addError(sprintf( - '[\'zenddevelopertools\'][\'toolbar\'][\'entries\'] must be an array, %s given.', - gettype($options['entries']) - )); + + foreach ($value as $collector => $template) { + if ($template === false || $template === null) { + unset($this->toolbar[$key][$collector]); + continue; + } + + $this->toolbar[$key][$collector] = $template; + } + + continue; + default: + // Unknown type; ignore + continue; } } } @@ -408,6 +422,4 @@ public function getToolbarEntries() { return $this->toolbar['entries']; } - - // todo: storage and firephp options. } diff --git a/src/Profiler.php b/src/Profiler.php index 3ac8856..b05f3bd 100644 --- a/src/Profiler.php +++ b/src/Profiler.php @@ -10,6 +10,8 @@ namespace ZendDeveloperTools; +use DateTime; +use DateTimezone; use Zend\EventManager\EventInterface; use Zend\EventManager\EventManagerAwareInterface; use Zend\EventManager\EventManagerInterface; @@ -105,7 +107,6 @@ public function __construct(ReportInterface $report) public function setErrorMode($mode) { $this->strict = $mode; - return $this; } @@ -118,7 +119,6 @@ public function setErrorMode($mode) public function setEvent(EventInterface $event) { $this->event = $event; - return $this; } @@ -129,7 +129,7 @@ public function setEvent(EventInterface $event) */ public function getEvent() { - if (!isset($this->event)) { + if (! isset($this->event)) { $this->event = new ProfilerEvent(); $this->event->setTarget($this); $this->event->setProfiler($this); @@ -171,21 +171,20 @@ public function getEventManager() */ public function addCollector($collector) { - if (!isset($this->collectors)) { + if (! isset($this->collectors)) { $this->collectors = new PriorityQueue(); } if ($collector instanceof Collector\CollectorInterface) { $this->collectors->insert($collector, $collector->getPriority()); - } else { - $error = sprintf('%s must implement CollectorInterface.', get_class($collector)); - - if ($this->strict === true) { - throw new Exception\CollectorException($error); - } + return $this; + } - $this->report->addError($error); + $error = sprintf('%s must implement CollectorInterface.', get_class($collector)); + if ($this->strict === true) { + throw new Exception\CollectorException($error); } + $this->report->addError($error); return $this; } @@ -201,10 +200,10 @@ public function addCollector($collector) public function collect(MvcEvent $mvcEvent) { $this->report->setToken(uniqid('zdt')) - ->setUri($mvcEvent->getRequest()->getUriString()) - ->setMethod($mvcEvent->getRequest()->getMethod()) - ->setTime(new \DateTime('now', new \DateTimeZone('UTC'))) - ->setIp($mvcEvent->getRequest()->getServer()->get('REMOTE_ADDR')); + ->setUri($mvcEvent->getRequest()->getUriString()) + ->setMethod($mvcEvent->getRequest()->getMethod()) + ->setTime(new DateTime('now', new DateTimeZone('UTC'))) + ->setIp($mvcEvent->getRequest()->getServer()->get('REMOTE_ADDR')); if (isset($this->collectors)) { foreach ($this->collectors as $collector) { diff --git a/src/ProfilerEvent.php b/src/ProfilerEvent.php index bdf6224..1205494 100644 --- a/src/ProfilerEvent.php +++ b/src/ProfilerEvent.php @@ -51,7 +51,6 @@ public function getApplication() public function setApplication(ApplicationInterface $application) { $this->setParam('application', $application); - return $this; } @@ -74,7 +73,6 @@ public function getProfiler() public function setProfiler(Profiler $profiler) { $this->setParam('profiler', $profiler); - return $this; } @@ -97,7 +95,6 @@ public function getReport() public function setReport(ReportInterface $report) { $this->setParam('report', $report); - return $this; } } diff --git a/src/Report.php b/src/Report.php index b92f98e..0d9f37d 100644 --- a/src/Report.php +++ b/src/Report.php @@ -52,7 +52,6 @@ class Report implements ReportInterface public function setIp($ip) { $this->ip = $ip; - return $this; } @@ -70,7 +69,6 @@ public function getIp() public function setUri($uri) { $this->uri = $uri; - return $this; } @@ -88,7 +86,6 @@ public function getUri() public function setTime($time) { $this->time = $time; - return $this; } @@ -106,7 +103,6 @@ public function getTime() public function setToken($token) { $this->token = $token; - return $this; } @@ -123,12 +119,11 @@ public function getToken() */ public function addError($error) { - if (!isset($this->errors)) { + if (! isset($this->errors)) { $this->errors = []; } $this->errors[] = $error; - return $this; } @@ -154,7 +149,6 @@ public function hasErrors() public function setMethod($method) { $this->method = $method; - return $this; } @@ -182,7 +176,6 @@ public function getCollector($name) if (isset($this->collectors[$name])) { return $this->collectors[$name]; } - return; } diff --git a/src/View/Helper/DetailArray.php b/src/View/Helper/DetailArray.php index 4631fd6..472f9a6 100644 --- a/src/View/Helper/DetailArray.php +++ b/src/View/Helper/DetailArray.php @@ -36,7 +36,7 @@ class DetailArray extends AbstractHelper */ public function __invoke($label, array $details, $redundant = false) { - $r = []; + $r = []; $r[] = ' Date: Mon, 27 Jun 2016 15:34:30 -0500 Subject: [PATCH 33/35] Updated documentation and package type --- README.md | 43 ++++++++++++++++++------------------------- composer.json | 4 ++-- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 7c9123a..1fe96ee 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,32 @@ -Zend Developer Tools -==================== +# Zend Developer Tools [![Build Status](https://travis-ci.org/zendframework/ZendDeveloperTools.svg)](https://travis-ci.org/zendframework/ZendDeveloperTools) -Module providing debug tools for working with the [Zend Framework 2](https://github.com/zendframework/zf2) MVC -layer. +Module providing debug tools for use with [zend-mvc](https://docs.zendframework.com/zend-mvc) applications. -Installation -============ +## Installation 1. Install the module via composer by running: - ```sh - composer require zendframework/zend-developer-tools:dev-master + ```bash + $ composer require --dev zendframework/zend-developer-tools ``` + or download it directly from github and place it in your application's `module/` directory. -2. Add the `ZendDeveloperTools` module to the module section of your `config/application.config.php` + +2. Add the `ZendDeveloperTools` module to the module section of your `config/application.config.php`. + Starting with version 1.1.0, if you are using [zend-component-installer](https://docs.zendframework.com/zend-component-installer), + this will be done for you automatically. 3. Copy `./vendor/zendframework/zend-developer-tools/config/zenddevelopertools.local.php.dist` to `./config/autoload/zenddevelopertools.local.php`. Change any settings in it according to your needs. -4. If server version of PHP is lower than 5.4.0 add the following in your `index.php`: - ```php - define('REQUEST_MICROTIME', microtime(true)); - ``` - - **Note:** The displayed execution time in the toolbar will be highly inaccurate - if you don't define `REQUEST_MICROTIME` in PHP < 5.4.0. -Extensions -========== +## Extensions -* [BjyProfiler](https://github.com/bjyoungblood/BjyProfiler) - profile `Zend\Db` queries -* [OcraServiceManager](https://github.com/Ocramius/OcraServiceManager) - track dependencies within your application -* [SanSessionToolbar](https://github.com/samsonasik/SanSessionToolbar) - preview `Zend\Session` data -* [ZfSnapEventDebugger](https://github.com/snapshotpl/ZfSnapEventDebugger) - debug events from `Zend\EventManager` -* [DoctrineORMModule](https://github.com/doctrine/DoctrineORMModule) - profile `DoctrineORM` queries -* [JhuZdtLoggerModule](https://github.com/jhuet/JhuZdtLoggerModule) - log data from `Zend\Log` -* [aist-git-tools](https://github.com/ma-si/aist-git-tools) - informations about current GIT repository +- [BjyProfiler](https://github.com/bjyoungblood/BjyProfiler) - profile `Zend\Db` queries +- [OcraServiceManager](https://github.com/Ocramius/OcraServiceManager) - track dependencies within your application +- [SanSessionToolbar](https://github.com/samsonasik/SanSessionToolbar) - preview `Zend\Session` data +- [ZfSnapEventDebugger](https://github.com/snapshotpl/ZfSnapEventDebugger) - debug events from `Zend\EventManager` +- [DoctrineORMModule](https://github.com/doctrine/DoctrineORMModule) - profile `DoctrineORM` queries +- [JhuZdtLoggerModule](https://github.com/jhuet/JhuZdtLoggerModule) - log data from `Zend\Log` +- [aist-git-tools](https://github.com/ma-si/aist-git-tools) - informations about current GIT repository diff --git a/composer.json b/composer.json index df3d228..76949d4 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "zendframework/zend-developer-tools", - "description": "Module for developer and debug tools for working with the ZF2 MVC layer.", - "type": "zf-module", + "description": "Module for developer and debug tools for use with zend-mvc applications.", + "type": "library", "license": "BSD-3-Clause", "keywords": [ "debug", From a3d7c2e8783e93bfb7a7f7408c15a28c6b25a832 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 27 Jun 2016 15:36:11 -0500 Subject: [PATCH 34/35] CS issues fixed per phpcs --- src/Collector/DbCollector.php | 2 +- src/Collector/TimeCollector.php | 2 +- src/Exception/SerializableException.php | 8 ++++---- src/View/Helper/Memory.php | 2 +- src/View/Helper/Time.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Collector/DbCollector.php b/src/Collector/DbCollector.php index 5960ced..48614ea 100644 --- a/src/Collector/DbCollector.php +++ b/src/Collector/DbCollector.php @@ -55,7 +55,7 @@ public function canHide() if (! isset($this->profiler)) { return false; } - + if ($this->getQueryCount() > 0) { return false; } diff --git a/src/Collector/TimeCollector.php b/src/Collector/TimeCollector.php index 8f28e0c..bfb02cf 100644 --- a/src/Collector/TimeCollector.php +++ b/src/Collector/TimeCollector.php @@ -139,7 +139,7 @@ private function marshalStartTime(MvcEvent $mvcEvent) if (PHP_VERSION_ID >= 50400) { return $mvcEvent->getRequest()->getServer()->get('REQUEST_TIME_FLOAT'); } - + if (defined('REQUEST_MICROTIME')) { return REQUEST_MICROTIME; } diff --git a/src/Exception/SerializableException.php b/src/Exception/SerializableException.php index ecd3249..3d80d73 100644 --- a/src/Exception/SerializableException.php +++ b/src/Exception/SerializableException.php @@ -166,7 +166,7 @@ protected function filterArgs($args, $level = 0) $result[$key] = ['object', get_class($value)]; continue; } - + if (is_array($value)) { if ($level > 10) { $result[$key] = ['array', '*DEEP NESTED ARRAY*']; @@ -175,17 +175,17 @@ protected function filterArgs($args, $level = 0) $result[$key] = ['array', $this->filterArgs($value, ++$level)]; continue; } - + if (null === $value) { $result[$key] = ['null', null]; continue; } - + if (is_bool($value)) { $result[$key] = ['boolean', $value]; continue; } - + if (is_resource($value)) { $result[$key] = ['resource', get_resource_type($value)]; continue; diff --git a/src/View/Helper/Memory.php b/src/View/Helper/Memory.php index 3262df6..cc3fb15 100644 --- a/src/View/Helper/Memory.php +++ b/src/View/Helper/Memory.php @@ -38,7 +38,7 @@ public function __invoke($size, $precision = 2) if ($size < 1024) { return sprintf('%d B', $size); } - + if (($size / 1024) < 1024) { return sprintf('%.0f KB', $size / 1024); } diff --git a/src/View/Helper/Time.php b/src/View/Helper/Time.php index 0bb1763..d2f0885 100644 --- a/src/View/Helper/Time.php +++ b/src/View/Helper/Time.php @@ -42,7 +42,7 @@ public function __invoke($time, $precision = 2) if ($time >= 1) { return sprintf('%.' . $precision . 'f s', $time); } - + if ($time * 1000 >= 1) { return sprintf('%.' . $precision . 'f ms', $time * 1000); } From 44d9576303240b7cda2737a90cc1187c426ede9b Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 27 Jun 2016 15:49:01 -0500 Subject: [PATCH 35/35] Removed zend-version integration - Irrelevant starting with v2.5, and impossible to determine unless we spelunk in the composer installed.json. --- CHANGELOG.md | 26 +++++ composer.json | 5 +- composer.lock | 109 +----------------- src/Listener/ToolbarListener.php | 29 +---- .../toolbar/zendframework.phtml | 19 +-- 5 files changed, 34 insertions(+), 154 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..bf9aa13 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,26 @@ +# Changelog + +All notable changes to this project will be documented in this file, in reverse chronological order by release. + +## 1.1.0 - 2016-06-27 + +### Added + +- [#213](https://github.com/zendframework/ZendDeveloperTools/pull/213) adds + support for zend-mvc, zend-eventmanager, and zend-servicemanager v3. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- Nothing. + +## 1.0.0 - 2016-06-27 + +First stable release. diff --git a/composer.json b/composer.json index 76949d4..7f8ea28 100644 --- a/composer.json +++ b/composer.json @@ -36,13 +36,12 @@ "zendframework/zend-stdlib": "^2.7 || ^3.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", "zendframework/zend-modulemanager": "^2.7", - "zendframework/zend-version": "^2.5", "zendframework/zend-debug": "^2.5 || ^3.0", "zendframework/zend-view": "^2.6" }, "require-dev": { - "phpunit/phpunit": "^4.8 || ^5.0", - "squizlabs/php_codesniffer": "~2.3.1" + "phpunit/phpunit": "^4.8 || ^5.0", + "squizlabs/php_codesniffer": "~2.3.1" }, "suggest": { "bjyoungblood/bjy-profiler": "Version: dev-master, allows the usage of the (Zend) Db collector.", diff --git a/composer.lock b/composer.lock index c25a50c..fca0403 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d3aac4379a034f0785d267d5f4b4c083", - "content-hash": "f4441c4e0a410a7a2d9b21f31641c717", + "hash": "bf4218c4e83eed8651f4c9e3cab4dae1", + "content-hash": "70c64b46ecf4198088b51830c8835cbc", "packages": [ { "name": "container-interop/container-interop", @@ -287,61 +287,6 @@ ], "time": "2016-02-04 20:36:48" }, - { - "name": "zendframework/zend-json", - "version": "2.6.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-json.git", - "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", - "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-server": "^2.6.1", - "zendframework/zend-stdlib": "^2.5 || ^3.0", - "zendframework/zendxml": "^1.0.2" - }, - "suggest": { - "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server", - "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server", - "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses", - "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Json\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", - "homepage": "https://github.com/zendframework/zend-json", - "keywords": [ - "json", - "zf2" - ], - "time": "2016-02-04 21:20:26" - }, { "name": "zendframework/zend-loader", "version": "2.5.1", @@ -789,56 +734,6 @@ ], "time": "2016-06-23 13:44:31" }, - { - "name": "zendframework/zend-version", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-version.git", - "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-version/zipball/e30c55dc394eaf396f0347887af0a7bef471fe08", - "reference": "e30c55dc394eaf396f0347887af0a7bef471fe08", - "shasum": "" - }, - "require": { - "php": ">=5.3.23", - "zendframework/zend-json": "~2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-http": "~2.5" - }, - "suggest": { - "zendframework/zend-http": "Allows use of Zend\\Http\\Client to check version information", - "zendframework/zend-json": "To check latest version hosted in GitHub" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Version\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-version", - "keywords": [ - "version", - "zf2" - ], - "time": "2015-06-04 15:41:05" - }, { "name": "zendframework/zend-view", "version": "2.8.0", diff --git a/src/Listener/ToolbarListener.php b/src/Listener/ToolbarListener.php index 257e62f..d285309 100644 --- a/src/Listener/ToolbarListener.php +++ b/src/Listener/ToolbarListener.php @@ -18,7 +18,6 @@ namespace ZendDeveloperTools\Listener; -use Zend\Version\Version; use Zend\View\Model\ViewModel; use Zend\View\Exception\RuntimeException; use ZendDeveloperTools\Options; @@ -47,19 +46,12 @@ class ToolbarListener implements ListenerAggregateInterface */ const VERSION_CACHE_TTL = 3600; - /** - * Dev documentation URI pattern. - * - * @var string - */ - const DEV_DOC_URI_PATTERN = 'http://zf2.readthedocs.org/en/%s/index.html'; - /** * Documentation URI pattern. * * @var string */ - const DOC_URI_PATTERN = 'http://framework.zend.com/manual/%s/en/index.html'; + const DOC_URI = 'https://docs.zendframework.com/'; /** * @var object @@ -167,27 +159,10 @@ protected function renderEntries(ProfilerEvent $event) { $entries = []; $report = $event->getReport(); - - list($isLatest, $latest) = $this->getLatestVersion(Version::VERSION); - - if (false === ($pos = strpos(Version::VERSION, 'dev'))) { - $docUri = sprintf(self::DOC_URI_PATTERN, substr(Version::VERSION, 0, 3)); - } else { // unreleased dev branch - compare minor part of versions - $partsCurrent = explode('.', substr(Version::VERSION, 0, $pos)); - $partsLatestRelease = explode('.', $latest); - $docUri = sprintf( - self::DEV_DOC_URI_PATTERN, - current($partsLatestRelease) == $partsCurrent[1] ? 'latest' : 'develop' - ); - } - $zfEntry = new ViewModel([ - 'zf_version' => Version::VERSION, - 'is_latest' => $isLatest, - 'latest' => $latest, 'php_version' => phpversion(), 'has_intl' => extension_loaded('intl'), - 'doc_uri' => $docUri, + 'doc_uri' => self::DOC_URI, 'modules' => $this->getModules($event), ]); $zfEntry->setTemplate('zend-developer-tools/toolbar/zendframework'); diff --git a/view/zend-developer-tools/toolbar/zendframework.phtml b/view/zend-developer-tools/toolbar/zendframework.phtml index cecfe09..3adc61d 100644 --- a/view/zend-developer-tools/toolbar/zendframework.phtml +++ b/view/zend-developer-tools/toolbar/zendframework.phtml @@ -1,28 +1,13 @@
- Zend Framework 2 - - zf_version; ?> - + Zend Framework
- is_latest): ?> - - New Version - - latest; ?> - - - Documentation Modules Gallery - - Version - zf_version; ?> - PHP Version php_version; ?> @@ -35,7 +20,7 @@ >intl - modules)): ?> + modules)) : ?> ZendDeveloperToolsDetailArray('Modules', $this->modules); ?>