From 1d0dea587bf12e7f02c25ee09d6ed3abf6f6491b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bj=C3=B8rnskov?= Date: Tue, 6 May 2014 13:24:42 +0200 Subject: [PATCH] Use psr4 and use pimple 2.1 --- composer.json | 6 +++--- src/{Tacker => }/Configurator.php | 4 ++-- src/{Tacker => }/Loader/AbstractLoader.php | 0 src/{Tacker => }/Loader/CacheLoader.php | 0 src/{Tacker => }/Loader/IniFileLoader.php | 0 src/{Tacker => }/Loader/JsonFileLoader.php | 0 src/{Tacker => }/Loader/NormalizerLoader.php | 0 src/{Tacker => }/Loader/PhpFileLoader.php | 0 src/{Tacker => }/Loader/YamlFileLoader.php | 0 src/{Tacker => }/Normalizer.php | 0 src/{Tacker => }/Normalizer/ChainNormalizer.php | 0 src/{Tacker => }/Normalizer/EnvfileNormalizer.php | 0 src/{Tacker => }/Normalizer/EnvironmentNormalizer.php | 0 src/{Tacker => }/Normalizer/PimpleNormalizer.php | 6 ++++-- src/{Tacker => }/ResourceCollection.php | 0 15 files changed, 9 insertions(+), 7 deletions(-) rename src/{Tacker => }/Configurator.php (82%) rename src/{Tacker => }/Loader/AbstractLoader.php (100%) rename src/{Tacker => }/Loader/CacheLoader.php (100%) rename src/{Tacker => }/Loader/IniFileLoader.php (100%) rename src/{Tacker => }/Loader/JsonFileLoader.php (100%) rename src/{Tacker => }/Loader/NormalizerLoader.php (100%) rename src/{Tacker => }/Loader/PhpFileLoader.php (100%) rename src/{Tacker => }/Loader/YamlFileLoader.php (100%) rename src/{Tacker => }/Normalizer.php (100%) rename src/{Tacker => }/Normalizer/ChainNormalizer.php (100%) rename src/{Tacker => }/Normalizer/EnvfileNormalizer.php (100%) rename src/{Tacker => }/Normalizer/EnvironmentNormalizer.php (100%) rename src/{Tacker => }/Normalizer/PimpleNormalizer.php (89%) rename src/{Tacker => }/ResourceCollection.php (100%) diff --git a/composer.json b/composer.json index 07edd94..43349c2 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "license" : "MIT", "autoload" : { - "psr-0" : { "Tacker\\" : "src" } + "psr-4" : { "Tacker\\" : "src" } }, "require" : { @@ -13,8 +13,8 @@ }, "require-dev" : { - "pimple/pimple" : "~1.0", - "symfony/yaml" : "~2.3" + "pimple/pimple" : "2.1.x-dev", + "symfony/yaml" : "~2.4" }, "extra" : { diff --git a/src/Tacker/Configurator.php b/src/Configurator.php similarity index 82% rename from src/Tacker/Configurator.php rename to src/Configurator.php index f28a997..e28c87b 100644 --- a/src/Tacker/Configurator.php +++ b/src/Configurator.php @@ -3,7 +3,7 @@ namespace Tacker; use Symfony\Component\Config\Loader\LoaderInterface; -use Pimple; +use Pimple\Container; class Configurator { @@ -14,7 +14,7 @@ public function __construct(LoaderInterface $loader) $this->loader = $loader; } - public function configure(Pimple $pimple, $resource) + public function configure(Container $pimple, $resource) { $parameters = $this->loader->load($resource); diff --git a/src/Tacker/Loader/AbstractLoader.php b/src/Loader/AbstractLoader.php similarity index 100% rename from src/Tacker/Loader/AbstractLoader.php rename to src/Loader/AbstractLoader.php diff --git a/src/Tacker/Loader/CacheLoader.php b/src/Loader/CacheLoader.php similarity index 100% rename from src/Tacker/Loader/CacheLoader.php rename to src/Loader/CacheLoader.php diff --git a/src/Tacker/Loader/IniFileLoader.php b/src/Loader/IniFileLoader.php similarity index 100% rename from src/Tacker/Loader/IniFileLoader.php rename to src/Loader/IniFileLoader.php diff --git a/src/Tacker/Loader/JsonFileLoader.php b/src/Loader/JsonFileLoader.php similarity index 100% rename from src/Tacker/Loader/JsonFileLoader.php rename to src/Loader/JsonFileLoader.php diff --git a/src/Tacker/Loader/NormalizerLoader.php b/src/Loader/NormalizerLoader.php similarity index 100% rename from src/Tacker/Loader/NormalizerLoader.php rename to src/Loader/NormalizerLoader.php diff --git a/src/Tacker/Loader/PhpFileLoader.php b/src/Loader/PhpFileLoader.php similarity index 100% rename from src/Tacker/Loader/PhpFileLoader.php rename to src/Loader/PhpFileLoader.php diff --git a/src/Tacker/Loader/YamlFileLoader.php b/src/Loader/YamlFileLoader.php similarity index 100% rename from src/Tacker/Loader/YamlFileLoader.php rename to src/Loader/YamlFileLoader.php diff --git a/src/Tacker/Normalizer.php b/src/Normalizer.php similarity index 100% rename from src/Tacker/Normalizer.php rename to src/Normalizer.php diff --git a/src/Tacker/Normalizer/ChainNormalizer.php b/src/Normalizer/ChainNormalizer.php similarity index 100% rename from src/Tacker/Normalizer/ChainNormalizer.php rename to src/Normalizer/ChainNormalizer.php diff --git a/src/Tacker/Normalizer/EnvfileNormalizer.php b/src/Normalizer/EnvfileNormalizer.php similarity index 100% rename from src/Tacker/Normalizer/EnvfileNormalizer.php rename to src/Normalizer/EnvfileNormalizer.php diff --git a/src/Tacker/Normalizer/EnvironmentNormalizer.php b/src/Normalizer/EnvironmentNormalizer.php similarity index 100% rename from src/Tacker/Normalizer/EnvironmentNormalizer.php rename to src/Normalizer/EnvironmentNormalizer.php diff --git a/src/Tacker/Normalizer/PimpleNormalizer.php b/src/Normalizer/PimpleNormalizer.php similarity index 89% rename from src/Tacker/Normalizer/PimpleNormalizer.php rename to src/Normalizer/PimpleNormalizer.php index 0280d54..359e564 100644 --- a/src/Tacker/Normalizer/PimpleNormalizer.php +++ b/src/Normalizer/PimpleNormalizer.php @@ -2,6 +2,8 @@ namespace Tacker\Normalizer; +use Pimple\Container; + /** * @package Tacker */ @@ -10,9 +12,9 @@ class PimpleNormalizer implements \Tacker\Normalizer protected $pimple; /** - * @param Pimple $pimple + * @param Container $pimple */ - public function __construct(\Pimple $pimple) + public function __construct(Container $pimple) { $this->pimple = $pimple; } diff --git a/src/Tacker/ResourceCollection.php b/src/ResourceCollection.php similarity index 100% rename from src/Tacker/ResourceCollection.php rename to src/ResourceCollection.php