Dropping php 5.3 support, removing old array syntax

maschmann · maschmann · commit a8fdb465d20e · 2015-03-27T23:25:52.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 7
diff --git a/Config/Config.php b/Config/Config.php
@@ -20,11 +20,11 @@ final class Config
     /**
      * @var array
      */
-    private static $whitelist = array(
+    private static $whitelist = [
         'ConfigDefault',
         'ConfigEnv',
         'ConfigTimer',
-    );
+    ];
 
     /**
      * Get object of specific class.
diff --git a/Config/ConfigEnv.php b/Config/ConfigEnv.php
@@ -57,7 +57,7 @@ private function mergeEnvironments($param)
         );
 
         if (!empty($param['env']) && $this->defaultEnv !== $param['env']) {
-            $toMerge = $config->get($param['env'], array());
+            $toMerge = $config->get($param['env'], []);
             $merged = array_replace_recursive(
                 $config->get($this->defaultEnv),
                 $toMerge
diff --git a/Config/ConfigTimer.php b/Config/ConfigTimer.php
@@ -68,15 +68,15 @@ public function setConfig($file)
                 case 'holidays':
                     foreach ($timers as $timerSubKey => $params) {
                         foreach ($params as $paramKey => $paramValue) {
-                            $config[$timerKey][$timerSubKey] = array(
+                            $config[$timerKey][$timerSubKey] = [
                                 new \DateTime($paramValue),
                                 new \DateTime($paramValue . ' 23:59:59'),
-                            );
+                            ];
                         }
                     }
                     break;
                 case 'general_holidays':
-                    $tmpConf = array();
+                    $tmpConf = [];
                     $year    = date('Y');
                     // get server's easter date for later calculation
                     $easterDate = new \DateTime(date('Y-m-d', easter_date($year)));
diff --git a/Data/Data.php b/Data/Data.php
@@ -23,7 +23,7 @@ class Data implements DataInterface
      *
      * @var array
      */
-    private $data = array();
+    private $data = [];
 
     /**
      * Clears the data(!) content of the object.
@@ -32,7 +32,7 @@ class Data implements DataInterface
      */
     public function clear()
     {
-        $this->data = array();
+        $this->data = [];
 
         return $this;
     }
@@ -57,9 +57,9 @@ public function set()
             // iterate arguments reversed to build replacement array
             foreach (array_reverse($args) as $key) {
                 if (null == $replace) {
-                    $replace = array($key => $val);
+                    $replace = [$key => $val];
                 } else {
-                    $replace = array($key => $replace);
+                    $replace = [$key => $replace];
                 }
             }
 
diff --git a/Data/DataCollection.php b/Data/DataCollection.php
@@ -101,7 +101,7 @@ public function rewind()
     public function addItem($item, $position = null)
     {
         if (null === $position) {
-            $items = $this->get('items', array());
+            $items = $this->get('items', []);
             array_push($items, $item);
             $this->set('items', $items);
         } else {
@@ -127,7 +127,7 @@ public function getItem($position = 0)
      */
     public function count()
     {
-        return count($this->get('items', array()));
+        return count($this->get('items', []));
     }
 
     /**
@@ -139,7 +139,7 @@ public function count()
      */
     public function removeItem($position)
     {
-        $items = $this->get('items', array());
+        $items = $this->get('items', []);
 
         if (isset($items[$position])) {
             unset($items[$position]);
diff --git a/Tests/Config/ConfigDefaultTest.php b/Tests/Config/ConfigDefaultTest.php
@@ -28,10 +28,10 @@ class ConfigDefaultTest extends \PHPUnit_Framework_TestCase
     public function testFactory()
     {
         $config = Config::factory(
-            array(
+            [
                 'file' => TestData::getYamlConfigFile(),
                 'filecheck' => false,
-            ),
+            ],
             'ConfigDefault'
         );
 
diff --git a/Tests/Config/ConfigEnvTest.php b/Tests/Config/ConfigEnvTest.php
@@ -30,10 +30,10 @@ public function testFactoryProd()
     {
         // merged environments config
         $config = Config::factory(
-            array(
+            [
                 'file' => TestData::getYamlConfigFile(),
                 'filecheck' => false,
-            ),
+            ],
             'ConfigEnv'
         );
 
@@ -49,12 +49,12 @@ public function testFactoryProd()
     public function testFactoryEnv()
     {
         $config = Config::factory(
-            array(
+            [
                 'file' => TestData::getYamlConfigFile(),
                 'filecheck' => false,
                 'defaultEnv' => 'prod',
                 'env' => 'dev',
-            ),
+            ],
             'ConfigEnv'
         );
 
diff --git a/Tests/Config/ConfigFactoryTest.php b/Tests/Config/ConfigFactoryTest.php
@@ -26,10 +26,10 @@ class ConfigFactoryTest extends \PHPUnit_Framework_TestCase
     public function testFactory()
     {
         $config = Config::factory(
-            array(
+            [
                 'file' => TestData::getYamlConfigFile(),
                 'filecheck' => false,
-            ),
+            ],
             'ConfigDefault'
         );
 
@@ -43,10 +43,10 @@ public function testFactory()
     public function testFactoryErrorException()
     {
         $config = Config::factory(
-            array(
+            [
                 'file' => TestData::getYamlConfigFile(),
                 'filecheck' => false,
-            ),
+            ],
             'ConfigXXX'
         );
     }
@@ -58,7 +58,7 @@ public function testFactoryErrorException()
     public function testFactoryInvalidArgumentException()
     {
         $config = Config::factory(
-            array(),
+            [],
             'ConfigDefault'
         );
     }
diff --git a/Tests/Config/ConfigTimerTest.php b/Tests/Config/ConfigTimerTest.php
@@ -22,10 +22,10 @@ class ConfigTimerTest extends \PHPUnit_Framework_TestCase
     public function testFactory()
     {
         $config = Config::factory(
-            array(
+            [
                 'file' => TestData::getYamlTimerConfigFile(),
                 'filecheck' => false,
-            ),
+            ],
             'ConfigTimer'
         );
 
diff --git a/Tests/Data/DataCollectionTest.php b/Tests/Data/DataCollectionTest.php
@@ -31,7 +31,7 @@ public function testConstruct()
         $item = new \stdClass();
         $item->name = 'number_one';
 
-        $collection = new DataCollection(array($item));
+        $collection = new DataCollection([$item]);
         $this->assertInstanceOf('\Asm\Data\DataCollection', $collection);
 
         $this->assertEquals('number_one', $collection->getItem(0)->name);
diff --git a/Tests/Data/DataTest.php b/Tests/Data/DataTest.php
@@ -56,8 +56,8 @@ public function testSet(Data $data)
         $this->assertEquals('test_value3', $data->get('test_key_1', 'test_key_2'), 'multidim key get');
 
         // test initial setting of value
-        $data->set('test_key_4', array('test_key_3' => 'testValue4'));
-        $data->set('test_key_5', array('test_key_4' => 'testValue5'));
+        $data->set('test_key_4', ['test_key_3' => 'testValue4']);
+        $data->set('test_key_5', ['test_key_4' => 'testValue5']);
 
         $this->assertEquals('testValue4', $data->get('test_key_4', 'test_key_3'), 'merge arrays on set');
         $this->assertEquals('testValue5', $data->get('test_key_5', 'test_key_4'), 'merge arrays on set');
@@ -93,12 +93,12 @@ public function testGet(Data $data)
 
         $data->set(
             'testKey2',
-            array(
+            [
                 'test'     => 'test_value',
-                'sub_test' => array(
+                'sub_test' => [
                     'subsubtest' => 'subvalue',
-                )
-            )
+                ]
+            ]
         );
 
         // single dimension array getter
@@ -133,12 +133,12 @@ public function testGet(Data $data)
     public function testSetByArray(Data $data)
     {
         $data->setByArray(
-            array(
+            [
                 'testKey3' => 'test_value_3',
                 'testKey4' => 'test_value_4',
-                'testKey5' => array('subKey1' => 'sub_val_1'),
+                'testKey5' => ['subKey1' => 'sub_val_1'],
                 'testKey6' => new \stdClass(),
-            )
+            ]
         );
 
         $this->assertEquals('test_value_3', $data->get('testKey3'));
@@ -156,7 +156,7 @@ public function testSetByArray(Data $data)
      */
     public function testSetByArrayException(Data $data)
     {
-        $data->setByArray(array());
+        $data->setByArray([]);
     }
 
     /**
@@ -170,7 +170,7 @@ public function testSetByObject(Data $data)
         $objParam                = new \stdClass();
         $objParam->testProperty1 = 'test_property_value_1';
         $objParam->testProperty2 = 'test_property_value_2';
-        $objParam->testProperty3 = array('subkeyPropertyTest' => 'property_value');
+        $objParam->testProperty3 = ['subkeyPropertyTest' => 'property_value'];
         $objParam->testProperty4 = new \stdClass();
 
         $data->setByObject($objParam);
@@ -211,11 +211,11 @@ public function testSetByJson(Data $data)
     {
         $data->setByJson(
             json_encode(
-                array(
+                [
                     'testKey3' => 'test_value_3',
                     'testKey4' => 'test_value_4',
-                    'testKey5' => array('subKey1' => 'sub_val_1'),
-                )
+                    'testKey5' => ['subKey1' => 'sub_val_1'],
+                ]
             )
         );
 
diff --git a/Tests/Timer/TimerTest.php b/Tests/Timer/TimerTest.php
@@ -29,10 +29,10 @@ class TimerTest extends \PHPUnit_Framework_TestCase
     public function testConstruct()
     {
         $config = Config::factory(
-            array(
+            [
                 'file'      => TestData::getYamlTimerConfigFile(),
                 'filecheck' => false,
-            ),
+            ],
             'ConfigTimer'
         );
 
diff --git a/Timer/Timer.php b/Timer/Timer.php
@@ -111,7 +111,7 @@ public function getHoliday()
      */
     public function flush()
     {
-        $this->currentConf = array();
+        $this->currentConf = [];
         $this->holiday = null;
     }
 
@@ -163,8 +163,8 @@ private function checkHoliday($date = null)
             // clone for start/enddate
             $holidayEnd = clone $holiday;
             $holidayStart = clone $holiday;
-            $startTime = array('00', '00', '00');
-            $endTime = array('23', '59', '59');
+            $startTime = ['00', '00', '00'];
+            $endTime = ['23', '59', '59'];
 
             if (true === isset($this->currentConf['holiday']['interval'])) {
                 $startTime = explode(':', $this->currentConf['holiday']['interval'][0]);
@@ -213,7 +213,7 @@ private function checkHoliday($date = null)
      * @param  array $intervals
      * @return bool
      */
-    private function checkIntervals(array $intervals = array())
+    private function checkIntervals(array $intervals = [])
     {
         $today = new \DateTime();
         $return = false;
@@ -258,9 +258,9 @@ private function checkDays()
      * @param array $intervals
      * @return bool
      */
-    private function checkTime($intervals = array())
+    private function checkTime($intervals = [])
     {
-        $return = array();
+        $return = [];
         if (empty($intervals)) {
             $intervals = $this->currentConf['time'];
         }
diff --git a/example.php b/example.php

-Original file line number
+Diff line change
@@ @@ -1,7 +1,6 @@ @@
 language: php
 php:
 -  - 5.3
   - 5.4
   - 5.5
   - 7
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class Data implements DataInterface`
`23`	`23`	`*`
`24`	`24`	`* @var array`
`25`	`25`	`*/`
`26`		`- private $data = array();`
	`26`	`+ private $data = [];`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* Clears the data(!) content of the object.`
`@@ -32,7 +32,7 @@ class Data implements DataInterface`
`32`	`32`	`*/`
`33`	`33`	`public function clear()`
`34`	`34`	`{`
`35`		`- $this->data = array();`
	`35`	`+ $this->data = [];`
`36`	`36`
`37`	`37`	`return $this;`
`38`	`38`	`}`
`@@ -57,9 +57,9 @@ public function set()`
`57`	`57`	`// iterate arguments reversed to build replacement array`
`58`	`58`	`foreach (array_reverse($args) as $key) {`
`59`	`59`	`if (null == $replace) {`
`60`		`- $replace = array($key => $val);`
	`60`	`+ $replace = [$key => $val];`
`61`	`61`	`} else {`
`62`		`- $replace = array($key => $replace);`
	`62`	`+ $replace = [$key => $replace];`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public function rewind()`
`101`	`101`	`public function addItem($item, $position = null)`
`102`	`102`	`{`
`103`	`103`	`if (null === $position) {`
`104`		`- $items = $this->get('items', array());`
	`104`	`+ $items = $this->get('items', []);`
`105`	`105`	`array_push($items, $item);`
`106`	`106`	`$this->set('items', $items);`
`107`	`107`	`} else {`
`@@ -127,7 +127,7 @@ public function getItem($position = 0)`
`127`	`127`	`*/`
`128`	`128`	`public function count()`
`129`	`129`	`{`
`130`		`- return count($this->get('items', array()));`
	`130`	`+ return count($this->get('items', []));`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`/**`
`@@ -139,7 +139,7 @@ public function count()`
`139`	`139`	`*/`
`140`	`140`	`public function removeItem($position)`
`141`	`141`	`{`
`142`		`- $items = $this->get('items', array());`
	`142`	`+ $items = $this->get('items', []);`
`143`	`143`
`144`	`144`	`if (isset($items[$position])) {`
`145`	`145`	`unset($items[$position]);`