Change to 5.4 array syntax and make most properties private

composer.json

@@ -8,12 +8,12 @@
     },
 
     "require" : {
-        "php"            : ">=5.3.3",
+        "php"            : "~5.4",
         "symfony/config" : "~2.3"
     },
 
     "require-dev" : {
-        "pimple/pimple" : "2.1.x-dev",
+        "pimple/pimple" : "~2.1",
         "symfony/yaml" : "~2.4"
     },
 

src/Configurator.php

@@ -7,7 +7,7 @@
 
 class Configurator
 {
-    protected $loader;
+    private $loader;
 
     public function __construct(LoaderInterface $loader)
     {

src/Loader/AbstractLoader.php

@@ -12,8 +12,8 @@
  */
 abstract class AbstractLoader extends FileLoader
 {
-    protected $resources;
     protected $locator;
+    private $resources;
 
     public function __construct(
         FileLocatorInterface $locator,
@@ -39,7 +39,7 @@ protected function parse(array $parameters, $resource)
         }
 
         $imports = (array) $parameters['@import'];
-        $inherited = array();
+        $inherited = [];
 
         unset($parameters['@import']);
 

src/Loader/CacheLoader.php

@@ -11,10 +11,10 @@
  */
 class CacheLoader extends \Symfony\Component\Config\Loader\Loader
 {
-    protected $loader;
-    protected $resources;
-    protected $debug = false;
-    protected $cacheDir;
+    private $loader;
+    private $resources;
+    private $debug = false;
+    private $cacheDir;
 
     public function __construct(LoaderInterface $loader, ResourceCollection $resources)
     {

src/Loader/NormalizerLoader.php

@@ -7,8 +7,8 @@
 
 class NormalizerLoader extends \Symfony\Component\Config\Loader\Loader
 {
-    protected $normalizer;
-    protected $loader;
+    private $normalizer;
+    private $loader;
 
     public function __construct(LoaderInterface $loader, Normalizer $normalizer)
     {
@@ -20,7 +20,7 @@ public function load($resource, $type = null)
     {
         $parameters = $this->loader->load($resource, $type);
 
-        return array_map(array($this, 'normalize'), $parameters);
+        return array_map([$this, 'normalize'], $parameters);
     }
 
     public function supports($resource, $type = null)
@@ -31,7 +31,7 @@ public function supports($resource, $type = null)
     private function normalize($value)
     {
         if (is_array($value)) {
-            return array_map(array($this, 'normalize'), $value);
+            return array_map([$this, 'normalize'], $value);
         }
 
         return $this->normalizer->normalize($value);

src/Normalizer/ChainNormalizer.php

@@ -9,14 +9,14 @@
  */
 class ChainNormalizer implements \Tacker\Normalizer
 {
-    protected $normalizers = array();
+    private $normalizers = [];
 
     /**
      * @param array $normalizers
      */
-    public function __construct(array $normalizers = array())
+    public function __construct(array $normalizers = [])
     {
-        array_map(array($this, 'add'), $normalizers);
+        array_map([$this, 'add'], $normalizers);
     }
 
     /**

src/Normalizer/EnvfileNormalizer.php

@@ -6,8 +6,8 @@
 
 class EnvfileNormalizer extends EnvironmentNormalizer
 {
-    protected $env;
-    protected $locator;
+    private $env;
+    private $locator;
 
     public function __construct(FileLocatorInterface $locator)
     {
@@ -39,13 +39,13 @@ protected function load()
             return;
         }
 
-        $this->env = parse_ini_file($file, false, INI_SCANNER_RAW) ?: array();
+        $this->env = parse_ini_file($file, false, INI_SCANNER_RAW) ?: [];
         $this->env = array_change_key_case($this->env, CASE_UPPER);
     }
 
     protected function locate()
     {
-        foreach (array('Envfile', 'Envfile.dist') as $i => $file) {
+        foreach (['Envfile', 'Envfile.dist'] as $i => $file) {
             try {
                 return $this->locator->locate($file);
             } catch (\InvalidArgumentException $e) {

src/Normalizer/EnvironmentNormalizer.php

@@ -13,7 +13,7 @@ class EnvironmentNormalizer implements \Tacker\Normalizer
      */
     public function normalize($value)
     {
-        $result = preg_replace_callback('{##|#([A-Z0-9_]+)#}', array($this, 'callback'), $value, -1, $count);
+        $result = preg_replace_callback('{##|#([A-Z0-9_]+)#}', [$this, 'callback'], $value, -1, $count);
 
         return $count ? $result : $value;
     }

src/Normalizer/PimpleNormalizer.php

@@ -9,7 +9,7 @@
  */
 class PimpleNormalizer implements \Tacker\Normalizer
 {
-    protected $pimple;
+    private $pimple;
 
     /**
      * @param Container $pimple
@@ -29,7 +29,7 @@ public function normalize($value)
             return isset($this->pimple[$match[1]]) ? $this->pimple[$match[1]] : $match[0];
         }
 
-        $result = preg_replace_callback('{%%|%([a-z0-9_.]+)%}', array($this, 'callback'), $value, -1, $count);
+        $result = preg_replace_callback('{%%|%([a-z0-9_.]+)%}', [$this, 'callback'], $value, -1, $count);
 
         return $count ? $result : $value;
     }

src/ResourceCollection.php

@@ -6,7 +6,7 @@
 
 class ResourceCollection
 {
-    protected $resources = array();
+    private $resources = [];
 
     public function add(ResourceInterface $resource)
     {