ZF3

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.3.3
-  - 5.4
   - 5.5
   - 5.6
   - 7
@@ -12,8 +10,4 @@ before_install:
  - composer install --prefer-source
 
 script:
-  - ./vendor/bin/phpunit
-
-matrix:
-  allow_failures:
-    - php: 7.0
+  - ./vendor/bin/phpunit

composer.json

@@ -22,18 +22,18 @@
         }
     ],
     "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 || ^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"
     },
     "require-dev": {
-      "phpunit/phpunit":                     "~4"
+      "phpunit/phpunit":                     "~4 || ~5"
     },
     "suggest": {
         "bjyoungblood/bjy-profiler": "Version: dev-master, allows the usage of the (Zend) Db collector.",
@@ -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": {

config/module.config.php

@@ -1,8 +1,8 @@
 <?php
-return array(
-    'view_manager' => array(
-        'template_path_stack' => array(
+return [
+    'view_manager' => [
+        'template_path_stack' => [
             'zenddevelopertools' => __DIR__ . '/../view',
-        ),
-    ),
-);
+        ],
+    ],
+];

phpunit.xml.dist

@@ -12,7 +12,7 @@
     syntaxCheck="true"
 >
     <testsuite name="ZendDeveloperTools tests suite">
-        <directory>./tests</directory>
+        <directory>./test</directory>
     </testsuite>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">

src/ZendDeveloperTools/Collector/ConfigCollector.php → src/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)) {

src/ZendDeveloperTools/Collector/ExceptionCollector.php → src/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'))
-            );
+            ];
         }
     }
 

src/ZendDeveloperTools/Collector/MemoryCollector.php → src/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;

src/ZendDeveloperTools/Collector/RequestCollector.php → src/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')
-        );
+        ];
     }
 
     /**

src/ZendDeveloperTools/Collector/TimeCollector.php → src/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;

src/ZendDeveloperTools/EventLogging/EventContextProvider.php → src/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

src/ZendDeveloperTools/Exception/SerializableException.php → src/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,18 +109,18 @@ public function getPrevious()
      */
     protected function filterTrace($trace, $file, $line)
     {
-        $filteredTrace = array();
+        $filteredTrace = [];
 
-        $filteredTrace[] = array(
+        $filteredTrace[] = [
             'namespace'   => '',
             'short_class' => '',
             'class'       => '',
             'type'        => '',
             'function'    => '',
             'file'        => $file,
             'line'        => $line,
-            'args'        => array(),
-        );
+            'args'        => [],
+        ];
 
         foreach ($trace as $entry) {
             $class = '';
@@ -132,16 +132,16 @@ protected function filterTrace($trace, $file, $line)
                 $namespace = implode('\\', $parts);
             }
 
-            $filteredTrace[] = array(
+            $filteredTrace[] = [
                 'namespace'   => $namespace,
                 'short_class' => $class,
                 'class'       => isset($entry['class']) ? $entry['class'] : '',
                 'type'        => isset($entry['type']) ? $entry['type'] : '',
                 '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];
             }
         }
 

src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php → src/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 <[email protected]>
  * @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, '*', [$this,'onCollectEvent'], Profiler::PRIORITY_EVENT_COLLECTOR);
+        }
     }
 
     /**

src/ZendDeveloperTools/Listener/FirePhpListener.php → src/Listener/FirePhpListener.php

@@ -29,7 +29,7 @@ class FirePhpListener implements ListenerAggregateInterface
     /**
      * @var array
      */
-    protected $listeners = array();
+    protected $listeners = [];
 
     /**
      * Constructor.
@@ -44,11 +44,11 @@ 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,
-            array($this, 'onCollected'),
+            [$this, 'onCollected'],
             Profiler::PRIORITY_FIREPHP
         );
     }