Merge branch 'feature/php-short-array-syntax' into develop

Author: Maks3w

.php_cs

@@ -33,6 +33,7 @@ $config->fixers(
         'object_operator',
         'php_closing_tag',
         'remove_lines_between_uses',
+        'short_array_syntax',
         'short_tag',
         'standardize_not_equal',
         'trailing_spaces',

src/Annotation/AnnotationManager.php

@@ -41,10 +41,10 @@ class AnnotationManager implements EventManagerAwareInterface
      */
     public function setEventManager(EventManagerInterface $events)
     {
-        $events->setIdentifiers(array(
+        $events->setIdentifiers([
             __CLASS__,
             get_class($this),
-        ));
+        ]);
         $this->events = $events;
 
         return $this;
@@ -75,7 +75,7 @@ public function getEventManager()
     public function attach(ParserInterface $parser)
     {
         $this->getEventManager()
-             ->attach(self::EVENT_CREATE_ANNOTATION, array($parser, 'onCreateAnnotation'));
+             ->attach(self::EVENT_CREATE_ANNOTATION, [$parser, 'onCreateAnnotation']);
 
         return $this;
     }
@@ -91,11 +91,11 @@ public function createAnnotation(array $annotationData)
         $event = new Event();
         $event->setName(self::EVENT_CREATE_ANNOTATION);
         $event->setTarget($this);
-        $event->setParams(array(
+        $event->setParams([
             'class'   => $annotationData[0],
             'content' => $annotationData[1],
             'raw'     => $annotationData[2],
-        ));
+        ]);
 
         $eventManager = $this->getEventManager();
         $results = $eventManager->trigger($event, function ($r) {

src/Annotation/Parser/DoctrineAnnotationParser.php

@@ -29,7 +29,7 @@ class DoctrineAnnotationParser implements ParserInterface
     /**
      * @var array Annotation classes we support on this iteration
      */
-    protected $allowedAnnotations = array();
+    protected $allowedAnnotations = [];
 
     /**
      * @var DocParser

src/Annotation/Parser/GenericAnnotationParser.php

@@ -26,17 +26,17 @@ class GenericAnnotationParser implements ParserInterface
     /**
      * @var array
      */
-    protected $aliases = array();
+    protected $aliases = [];
 
     /**
      * @var array
      */
-    protected $annotationNames = array();
+    protected $annotationNames = [];
 
     /**
      * @var AnnotationInterface[]
      */
-    protected $annotations = array();
+    protected $annotations = [];
 
     /**
      * Listen to onCreateAnnotation, and attempt to return an annotation object
@@ -190,7 +190,7 @@ public function setAlias($alias, $class)
      */
     protected function normalizeAlias($alias)
     {
-        return strtolower(str_replace(array('-', '_', ' ', '\\', '/'), '', $alias));
+        return strtolower(str_replace(['-', '_', ' ', '\\', '/'], '', $alias));
     }
 
     /**

src/Generator/AbstractGenerator.php

@@ -36,7 +36,7 @@ abstract class AbstractGenerator implements GeneratorInterface
     /**
      * @param  array $options
      */
-    public function __construct($options = array())
+    public function __construct($options = [])
     {
         if ($options) {
             $this->setOptions($options);

src/Generator/ClassGenerator.php

@@ -51,22 +51,22 @@ class ClassGenerator extends AbstractGenerator
     /**
      * @var array Array of string names
      */
-    protected $implementedInterfaces = array();
+    protected $implementedInterfaces = [];
 
     /**
      * @var PropertyGenerator[] Array of properties
      */
-    protected $properties = array();
+    protected $properties = [];
 
     /**
      * @var PropertyGenerator[] Array of constants
      */
-    protected $constants = array();
+    protected $constants = [];
 
     /**
      * @var MethodGenerator[] Array of methods
      */
-    protected $methods = array();
+    protected $methods = [];
 
     /**
      * @var TraitUsageGenerator Object to encapsulate trait usage logic
@@ -107,15 +107,15 @@ public static function fromReflection(ClassReflection $classReflection)
             $interfaces = array_diff($interfaces, $parentClass->getInterfaces());
         }
 
-        $interfaceNames = array();
+        $interfaceNames = [];
         foreach ($interfaces as $interface) {
             /* @var \Zend\Code\Reflection\ClassReflection $interface */
             $interfaceNames[] = $interface->getName();
         }
 
         $cg->setImplementedInterfaces($interfaceNames);
 
-        $properties = array();
+        $properties = [];
 
         foreach ($classReflection->getProperties() as $reflectionProperty) {
             if ($reflectionProperty->getDeclaringClass()->getName() == $classReflection->getName()) {
@@ -125,18 +125,18 @@ public static function fromReflection(ClassReflection $classReflection)
 
         $cg->addProperties($properties);
 
-        $constants = array();
+        $constants = [];
 
         foreach ($classReflection->getConstants() as $name => $value) {
-            $constants[] = array(
+            $constants[] = [
                 'name' => $name,
                 'value' => $value
-            );
+            ];
         }
 
         $cg->addConstants($constants);
 
-        $methods = array();
+        $methods = [];
 
         foreach ($classReflection->getMethods() as $reflectionMethod) {
             $className = ($cg->getNamespaceName()) ? $cg->getNamespaceName() . "\\" . $cg->getName() : $cg->getName();
@@ -179,7 +179,7 @@ public static function fromArray(array $array)
         $cg = new static($array['name']);
         foreach ($array as $name => $value) {
             // normalize key
-            switch (strtolower(str_replace(array('.', '-', '_'), '', $name))) {
+            switch (strtolower(str_replace(['.', '-', '_'], '', $name))) {
                 case 'containingfile':
                     $cg->setContainingFileGenerator($value);
                     break;
@@ -226,9 +226,9 @@ public function __construct(
         $namespaceName = null,
         $flags = null,
         $extends = null,
-        $interfaces = array(),
-        $properties = array(),
-        $methods = array(),
+        $interfaces = [],
+        $properties = [],
+        $methods = [],
         $docBlock = null
     ) {
         $this->traitUsageGenerator = new TraitUsageGenerator($this);
@@ -242,7 +242,7 @@ public function __construct(
         if ($flags !== null) {
             $this->setFlags($flags);
         }
-        if ($properties !== array()) {
+        if ($properties !== []) {
             $this->addProperties($properties);
         }
         if ($extends !== null) {
@@ -251,7 +251,7 @@ public function __construct(
         if (is_array($interfaces)) {
             $this->setImplementedInterfaces($interfaces);
         }
-        if ($methods !== array()) {
+        if ($methods !== []) {
             $this->addMethods($methods);
         }
         if ($docBlock !== null) {
@@ -546,7 +546,7 @@ public function addConstants(array $constants)
                 $this->addPropertyFromGenerator($constant);
             } else {
                 if (is_array($constant)) {
-                    call_user_func_array(array($this, 'addConstant'), $constant);
+                    call_user_func_array([$this, 'addConstant'], $constant);
                 }
             }
         }
@@ -567,7 +567,7 @@ public function addProperties(array $properties)
                 if (is_string($property)) {
                     $this->addProperty($property);
                 } elseif (is_array($property)) {
-                    call_user_func_array(array($this, 'addProperty'), $property);
+                    call_user_func_array([$this, 'addProperty'], $property);
                 }
             }
         }
@@ -699,7 +699,7 @@ public function addMethods(array $methods)
                 if (is_string($method)) {
                     $this->addMethod($method);
                 } elseif (is_array($method)) {
-                    call_user_func_array(array($this, 'addMethod'), $method);
+                    call_user_func_array([$this, 'addMethod'], $method);
                 }
             }
         }
@@ -720,7 +720,7 @@ public function addMethods(array $methods)
      */
     public function addMethod(
         $name = null,
-        array $parameters = array(),
+        array $parameters = [],
         $flags = MethodGenerator::FLAG_PUBLIC,
         $body = null,
         $docBlock = null

src/Generator/DocBlock/Tag/AbstractTypeableTag.php

@@ -26,13 +26,13 @@ abstract class AbstractTypeableTag extends AbstractGenerator
     /**
      * @var array
      */
-    protected $types = array();
+    protected $types = [];
 
     /**
      * @param array $types
      * @param string $description
      */
-    public function __construct($types = array(), $description = null)
+    public function __construct($types = [], $description = null)
     {
         if (!empty($types)) {
             $this->setTypes($types);

src/Generator/DocBlock/Tag/MethodTag.php

@@ -27,7 +27,7 @@ class MethodTag extends AbstractTypeableTag implements TagInterface
      * @param string $description
      * @param bool $isStatic
      */
-    public function __construct($methodName = null, $types = array(), $description = null, $isStatic = false)
+    public function __construct($methodName = null, $types = [], $description = null, $isStatic = false)
     {
         if (!empty($methodName)) {
             $this->setMethodName($methodName);

src/Generator/DocBlock/Tag/ParamTag.php

@@ -24,7 +24,7 @@ class ParamTag extends AbstractTypeableTag implements TagInterface
      * @param array $types
      * @param string $description
      */
-    public function __construct($variableName = null, $types = array(), $description = null)
+    public function __construct($variableName = null, $types = [], $description = null)
     {
         if (!empty($variableName)) {
             $this->setVariableName($variableName);

src/Generator/DocBlock/Tag/PropertyTag.php

@@ -21,7 +21,7 @@ class PropertyTag extends AbstractTypeableTag implements TagInterface
      * @param array $types
      * @param string $description
      */
-    public function __construct($propertyName = null, $types = array(), $description = null)
+    public function __construct($propertyName = null, $types = [], $description = null)
     {
         if (!empty($propertyName)) {
             $this->setPropertyName($propertyName);