diff --git a/autoload_classmap.php b/autoload_classmap.php index e1fd8fa..2eb7a5e 100644 --- a/autoload_classmap.php +++ b/autoload_classmap.php @@ -1,31 +1,33 @@ __DIR__ . '/src/MyBase/Controller/AbstractConsoleController.php', - 'MyBase\Filter\Ellipsis' => __DIR__ . '/src/MyBase/Filter/Ellipsis.php', - 'MyBase\Filter\FileArrayToString' => __DIR__ . '/src/MyBase/Filter/FileArrayToString.php', - 'MyBase\ServiceManager\AsseticSassFilterFactory' => __DIR__ . '/src/MyBase/ServiceManager/AsseticSassFilterFactory.php', - 'MyBase\Mail\Transport\Factory' => __DIR__ . '/src/MyBase/Mail/Transport/Factory.php', - 'MyBase\Mail\Transport\Exception\DomainException' => __DIR__ . '/src/MyBase/Mail/Transport/Exception/DomainException.php', - 'MyBase\Form\Element\CountrySelect' => __DIR__ . '/src/MyBase/Form/Element/CountrySelect.php', - 'MyBase\Doctrine\EntityMapper' => __DIR__ . '/src/MyBase/Doctrine/EntityMapper.php', - 'MyBase\Doctrine\EntityManagerAwareInitializer' => __DIR__ . '/src/MyBase/Doctrine/EntityManagerAwareInitializer.php', - 'MyBase\Doctrine\EntityManagerAwareInterface' => __DIR__ . '/src/MyBase/Doctrine/EntityManagerAwareInterface.php', - 'MyBase\Doctrine\EntityManagerAwareTrait' => __DIR__ . '/src/MyBase/Doctrine/EntityManagerAwareTrait.php', - 'MyBase\Entity\Entity' => __DIR__ . '/src/MyBase/Entity/Entity.php', - 'MyBase\DataMapper\MapperEvent' => __DIR__ . '/src/MyBase/DataMapper/MapperEvent.php', - 'MyBase\DataMapper\MapperAwareTrait' => __DIR__ . '/src/MyBase/DataMapper/MapperAwareTrait.php', - 'MyBase\DataMapper\MapperInterface' => __DIR__ . '/src/MyBase/DataMapper/MapperInterface.php', - 'MyBase\DataMapper\MapperAwareInterface' => __DIR__ . '/src/MyBase/DataMapper/MapperAwareInterface.php', - 'MyBase\Util\Serializor' => __DIR__ . '/src/MyBase/Util/Serializor.php', - 'MyBase\Captcha\ImagickCaptcha' => __DIR__ . '/src/MyBase/Captcha/ImagickCaptcha.php', - 'MyBase\AbstractModule' => __DIR__ . '/src/MyBase/AbstractModule.php', - 'MyBase\Module' => __DIR__ . '/src/MyBase/Module.php', - 'MyBase\View\Helper\DatePatternFormat' => __DIR__ . '/src/MyBase/View/Helper/DatePatternFormat.php', - 'MyBase\View\Helper\BootstrapFormFile' => __DIR__ . '/src/MyBase/View/Helper/BootstrapFormFile.php', - 'MyBase\View\Helper\ImageResize' => __DIR__ . '/src/MyBase/View/Helper/ImageResize.php', - 'MyBase\View\Helper\FormFieldset' => __DIR__ . '/src/MyBase/View/Helper/FormFieldset.php', - 'MyBase\View\Helper\AbstractEntityHelper' => __DIR__ . '/src/MyBase/View/Helper/AbstractEntityHelper.php', - 'MyBase\View\Helper\TimeAgo' => __DIR__ . '/src/MyBase/View/Helper/TimeAgo.php', - 'MyBase\Image\Resizer' => __DIR__ . '/src/MyBase/Image/Resizer.php', + 'MyBase\Controller\AbstractConsoleController' => __DIR__ . '/src/Controller/AbstractConsoleController.php', + 'MyBase\Filter\Ellipsis' => __DIR__ . '/src/Filter/Ellipsis.php', + 'MyBase\Filter\FileArrayToString' => __DIR__ . '/src/Filter/FileArrayToString.php', + 'MyBase\ServiceManager\HTMLPurifierFactory' => __DIR__ . '/src/ServiceManager/HTMLPurifierFactory.php', + 'MyBase\ServiceManager\AsseticSassFilterFactory' => __DIR__ . '/src/ServiceManager/AsseticSassFilterFactory.php', + 'MyBase\Mail\Transport\Factory' => __DIR__ . '/src/Mail/Transport/Factory.php', + 'MyBase\Mail\Transport\Exception\DomainException' => __DIR__ . '/src/Mail/Transport/Exception/DomainException.php', + 'MyBase\Form\Element\CountrySelect' => __DIR__ . '/src/Form/Element/CountrySelect.php', + 'MyBase\Doctrine\EntityMapper' => __DIR__ . '/src/Doctrine/EntityMapper.php', + 'MyBase\Doctrine\EntityManagerAwareInitializer' => __DIR__ . '/src/Doctrine/EntityManagerAwareInitializer.php', + 'MyBase\Doctrine\EntityManagerAwareInterface' => __DIR__ . '/src/Doctrine/EntityManagerAwareInterface.php', + 'MyBase\Doctrine\ObjectManagerAwareTrait' => __DIR__ . '/src/Doctrine/ObjectManagerAwareTrait.php', + 'MyBase\Doctrine\EntityManagerAwareTrait' => __DIR__ . '/src/Doctrine/EntityManagerAwareTrait.php', + 'MyBase\Entity\Entity' => __DIR__ . '/src/Entity/Entity.php', + 'MyBase\DataMapper\MapperEvent' => __DIR__ . '/src/DataMapper/MapperEvent.php', + 'MyBase\DataMapper\MapperAwareTrait' => __DIR__ . '/src/DataMapper/MapperAwareTrait.php', + 'MyBase\DataMapper\MapperInterface' => __DIR__ . '/src/DataMapper/MapperInterface.php', + 'MyBase\DataMapper\MapperAwareInterface' => __DIR__ . '/src/DataMapper/MapperAwareInterface.php', + 'MyBase\Util\Serializor' => __DIR__ . '/src/Util/Serializor.php', + 'MyBase\Captcha\ImagickCaptcha' => __DIR__ . '/src/Captcha/ImagickCaptcha.php', + 'MyBase\AbstractModule' => __DIR__ . '/src/AbstractModule.php', + 'MyBase\Module' => __DIR__ . '/src/Module.php', + 'MyBase\View\Helper\DatePatternFormat' => __DIR__ . '/src/View/Helper/DatePatternFormat.php', + 'MyBase\View\Helper\BootstrapFormFile' => __DIR__ . '/src/View/Helper/BootstrapFormFile.php', + 'MyBase\View\Helper\ImageResize' => __DIR__ . '/src/View/Helper/ImageResize.php', + 'MyBase\View\Helper\FormFieldset' => __DIR__ . '/src/View/Helper/FormFieldset.php', + 'MyBase\View\Helper\AbstractEntityHelper' => __DIR__ . '/src/View/Helper/AbstractEntityHelper.php', + 'MyBase\View\Helper\TimeAgo' => __DIR__ . '/src/View/Helper/TimeAgo.php', + 'MyBase\Image\Resizer' => __DIR__ . '/src/Image/Resizer.php', ); diff --git a/composer.json b/composer.json index 064cd07..d4a41bb 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,9 @@ } }, "autoload" : { - "psr-0" : { - "MyBase" : "src" + "psr-4": { + "MyBase\\": "src/", + "MyBase\\Test\\": "tests/Test" }, "classmap": [ "./" diff --git a/src/MyBase/AbstractModule.php b/src/AbstractModule.php similarity index 53% rename from src/MyBase/AbstractModule.php rename to src/AbstractModule.php index c27dcb9..0ed3491 100644 --- a/src/MyBase/AbstractModule.php +++ b/src/AbstractModule.php @@ -15,8 +15,48 @@ abstract class AbstractModule implements Feature\AutoloaderProviderInterface, Feature\ConfigProviderInterface { + /** + * @var string + */ protected $dir; + /** + * @var string + */ + protected $namespace; + + /** + * @var int + */ + protected $psr = 0; + + public function __construct() + { + $className = get_class($this); + $this->namespace = substr($className, 0, strpos($className, '\\')); + + $reflector = new \ReflectionClass($className); + $classDir = dirname($reflector->getFileName()); + $baseClassDir = pathinfo($classDir, PATHINFO_BASENAME); + + if ($baseClassDir === $this->getNamespace()) { + $this->dir = realpath(dirname(dirname($classDir))); // PSR-0 i.e. src/Namespace/Module.php + } elseif ($baseClassDir === 'src') { + $this->dir = realpath(dirname($classDir)); // PSR-4 i.e. src/Module.php + $this->psr = 4; + } else { + throw new \RuntimeException("Could not detect module root directory. Please either use PSR-0 or PSR-4 structure."); + } + } + + /** + * @return string + */ + public function getNamespace() + { + return $this->namespace; + } + /** * Module root directory * @@ -24,12 +64,6 @@ abstract class AbstractModule implements */ public function getDir() { - if (! $this->dir) { - $reflector = new \ReflectionClass(get_class($this)); - $classDir = dirname($reflector->getFileName()); - $this->dir = realpath($classDir . '/../..'); // assume PSR-0 compliant structure, e.g. src/Namespace/Module.php - } - return $this->dir; } @@ -38,8 +72,11 @@ public function getDir() */ public function getAutoloaderConfig() { - $className = get_class($this); - $namespace = substr($className, 0, strpos($className, '\\')); + $moduleNamespaceDir = $this->getDir() . '/src/'; + + if ($this->psr == 0) { + $moduleNamespaceDir .= $this->getNamespace(); + } return [ 'Zend\Loader\ClassMapAutoloader' => [ @@ -47,7 +84,7 @@ public function getAutoloaderConfig() ], 'Zend\Loader\StandardAutoloader' => [ 'namespaces' => [ - $namespace => $this->getDir() . '/src/' . $namespace, + $this->getNamespace() => $moduleNamespaceDir, ], ], ]; diff --git a/src/MyBase/Captcha/ImagickCaptcha.php b/src/Captcha/ImagickCaptcha.php similarity index 100% rename from src/MyBase/Captcha/ImagickCaptcha.php rename to src/Captcha/ImagickCaptcha.php diff --git a/src/MyBase/Controller/AbstractConsoleController.php b/src/Controller/AbstractConsoleController.php similarity index 100% rename from src/MyBase/Controller/AbstractConsoleController.php rename to src/Controller/AbstractConsoleController.php diff --git a/src/MyBase/DataMapper/MapperAwareInterface.php b/src/DataMapper/MapperAwareInterface.php similarity index 100% rename from src/MyBase/DataMapper/MapperAwareInterface.php rename to src/DataMapper/MapperAwareInterface.php diff --git a/src/MyBase/DataMapper/MapperAwareTrait.php b/src/DataMapper/MapperAwareTrait.php similarity index 100% rename from src/MyBase/DataMapper/MapperAwareTrait.php rename to src/DataMapper/MapperAwareTrait.php diff --git a/src/MyBase/DataMapper/MapperEvent.php b/src/DataMapper/MapperEvent.php similarity index 100% rename from src/MyBase/DataMapper/MapperEvent.php rename to src/DataMapper/MapperEvent.php diff --git a/src/MyBase/DataMapper/MapperInterface.php b/src/DataMapper/MapperInterface.php similarity index 100% rename from src/MyBase/DataMapper/MapperInterface.php rename to src/DataMapper/MapperInterface.php diff --git a/src/MyBase/Doctrine/EntityManagerAwareInitializer.php b/src/Doctrine/EntityManagerAwareInitializer.php similarity index 100% rename from src/MyBase/Doctrine/EntityManagerAwareInitializer.php rename to src/Doctrine/EntityManagerAwareInitializer.php diff --git a/src/MyBase/Doctrine/EntityManagerAwareInterface.php b/src/Doctrine/EntityManagerAwareInterface.php similarity index 100% rename from src/MyBase/Doctrine/EntityManagerAwareInterface.php rename to src/Doctrine/EntityManagerAwareInterface.php diff --git a/src/MyBase/Doctrine/EntityManagerAwareTrait.php b/src/Doctrine/EntityManagerAwareTrait.php similarity index 100% rename from src/MyBase/Doctrine/EntityManagerAwareTrait.php rename to src/Doctrine/EntityManagerAwareTrait.php diff --git a/src/MyBase/Doctrine/EntityMapper.php b/src/Doctrine/EntityMapper.php similarity index 100% rename from src/MyBase/Doctrine/EntityMapper.php rename to src/Doctrine/EntityMapper.php diff --git a/src/MyBase/Doctrine/ObjectManagerAwareTrait.php b/src/Doctrine/ObjectManagerAwareTrait.php similarity index 100% rename from src/MyBase/Doctrine/ObjectManagerAwareTrait.php rename to src/Doctrine/ObjectManagerAwareTrait.php diff --git a/src/MyBase/Entity/Entity.php b/src/Entity/Entity.php similarity index 100% rename from src/MyBase/Entity/Entity.php rename to src/Entity/Entity.php diff --git a/src/MyBase/Filter/Ellipsis.php b/src/Filter/Ellipsis.php similarity index 100% rename from src/MyBase/Filter/Ellipsis.php rename to src/Filter/Ellipsis.php diff --git a/src/MyBase/Filter/FileArrayToString.php b/src/Filter/FileArrayToString.php similarity index 100% rename from src/MyBase/Filter/FileArrayToString.php rename to src/Filter/FileArrayToString.php diff --git a/src/MyBase/Form/Element/CountrySelect.php b/src/Form/Element/CountrySelect.php similarity index 100% rename from src/MyBase/Form/Element/CountrySelect.php rename to src/Form/Element/CountrySelect.php diff --git a/src/MyBase/Image/Resizer.php b/src/Image/Resizer.php similarity index 100% rename from src/MyBase/Image/Resizer.php rename to src/Image/Resizer.php diff --git a/src/MyBase/Mail/Transport/Exception/DomainException.php b/src/Mail/Transport/Exception/DomainException.php similarity index 100% rename from src/MyBase/Mail/Transport/Exception/DomainException.php rename to src/Mail/Transport/Exception/DomainException.php diff --git a/src/MyBase/Mail/Transport/Factory.php b/src/Mail/Transport/Factory.php similarity index 100% rename from src/MyBase/Mail/Transport/Factory.php rename to src/Mail/Transport/Factory.php diff --git a/src/MyBase/Module.php b/src/Module.php similarity index 100% rename from src/MyBase/Module.php rename to src/Module.php diff --git a/src/MyBase/ServiceManager/AsseticSassFilterFactory.php b/src/ServiceManager/AsseticSassFilterFactory.php similarity index 100% rename from src/MyBase/ServiceManager/AsseticSassFilterFactory.php rename to src/ServiceManager/AsseticSassFilterFactory.php diff --git a/src/MyBase/ServiceManager/HTMLPurifierFactory.php b/src/ServiceManager/HTMLPurifierFactory.php similarity index 100% rename from src/MyBase/ServiceManager/HTMLPurifierFactory.php rename to src/ServiceManager/HTMLPurifierFactory.php diff --git a/src/MyBase/Util/Serializor.php b/src/Util/Serializor.php similarity index 100% rename from src/MyBase/Util/Serializor.php rename to src/Util/Serializor.php diff --git a/src/MyBase/View/Helper/AbstractEntityHelper.php b/src/View/Helper/AbstractEntityHelper.php similarity index 100% rename from src/MyBase/View/Helper/AbstractEntityHelper.php rename to src/View/Helper/AbstractEntityHelper.php diff --git a/src/MyBase/View/Helper/BootstrapFormFile.php b/src/View/Helper/BootstrapFormFile.php similarity index 100% rename from src/MyBase/View/Helper/BootstrapFormFile.php rename to src/View/Helper/BootstrapFormFile.php diff --git a/src/MyBase/View/Helper/DatePatternFormat.php b/src/View/Helper/DatePatternFormat.php similarity index 100% rename from src/MyBase/View/Helper/DatePatternFormat.php rename to src/View/Helper/DatePatternFormat.php diff --git a/src/MyBase/View/Helper/FormFieldset.php b/src/View/Helper/FormFieldset.php similarity index 100% rename from src/MyBase/View/Helper/FormFieldset.php rename to src/View/Helper/FormFieldset.php diff --git a/src/MyBase/View/Helper/ImageResize.php b/src/View/Helper/ImageResize.php similarity index 100% rename from src/MyBase/View/Helper/ImageResize.php rename to src/View/Helper/ImageResize.php diff --git a/src/MyBase/View/Helper/TimeAgo.php b/src/View/Helper/TimeAgo.php similarity index 100% rename from src/MyBase/View/Helper/TimeAgo.php rename to src/View/Helper/TimeAgo.php diff --git a/tests/MyBaseTest/Bootstrap.php b/tests/Test/Bootstrap.php similarity index 99% rename from tests/MyBaseTest/Bootstrap.php rename to tests/Test/Bootstrap.php index 02fd0b1..b75495d 100644 --- a/tests/MyBaseTest/Bootstrap.php +++ b/tests/Test/Bootstrap.php @@ -5,7 +5,7 @@ * ************************************************ */ -namespace MyBaseTest; +namespace MyBase\Test; use Composer\Autoload\ClassLoader; use Zend\ModuleManager\ModuleManager; diff --git a/tests/MyBaseTest/Controller/AbstractConsoleControllerTest.php b/tests/Test/Controller/AbstractConsoleControllerTest.php similarity index 98% rename from tests/MyBaseTest/Controller/AbstractConsoleControllerTest.php rename to tests/Test/Controller/AbstractConsoleControllerTest.php index caf8d4a..0a43756 100644 --- a/tests/MyBaseTest/Controller/AbstractConsoleControllerTest.php +++ b/tests/Test/Controller/AbstractConsoleControllerTest.php @@ -5,7 +5,7 @@ * ************************************************ */ -namespace MyBaseTest\Controller; +namespace MyBase\Test\Controller; use PHPUnit_Framework_TestCase as TestCase; use Zend\Http\Request as HttpRequest; diff --git a/tests/MyBaseTest/Controller/TestAsset/ConcreteConsoleController.php b/tests/Test/Controller/TestAsset/ConcreteConsoleController.php similarity index 89% rename from tests/MyBaseTest/Controller/TestAsset/ConcreteConsoleController.php rename to tests/Test/Controller/TestAsset/ConcreteConsoleController.php index 32ee30a..e4dd6db 100644 --- a/tests/MyBaseTest/Controller/TestAsset/ConcreteConsoleController.php +++ b/tests/Test/Controller/TestAsset/ConcreteConsoleController.php @@ -5,7 +5,7 @@ * ************************************************ */ -namespace MyBaseTest\Controller\TestAsset; +namespace MyBase\Test\Controller\TestAsset; use MyBase\Controller\AbstractConsoleController; diff --git a/tests/MyBaseTest/Filter/EllpsisTest.php b/tests/Test/Filter/EllpsisTest.php similarity index 98% rename from tests/MyBaseTest/Filter/EllpsisTest.php rename to tests/Test/Filter/EllpsisTest.php index 7ad1ae1..f492187 100644 --- a/tests/MyBaseTest/Filter/EllpsisTest.php +++ b/tests/Test/Filter/EllpsisTest.php @@ -5,10 +5,10 @@ * ************************************************ */ -namespace MyBaseTest\Filter; +namespace MyBase\Test\Filter; use MyBase\Filter\Ellipsis; -use MyBaseTest\Bootstrap; +use MyBase\Test\Bootstrap; use PHPUnit_Framework_TestCase as TestCase; use Zend\Stdlib\StringUtils; diff --git a/tests/MyBaseTest/Filter/FileArrayToStringTest.php b/tests/Test/Filter/FileArrayToStringTest.php similarity index 95% rename from tests/MyBaseTest/Filter/FileArrayToStringTest.php rename to tests/Test/Filter/FileArrayToStringTest.php index a042d42..44dcfa2 100644 --- a/tests/MyBaseTest/Filter/FileArrayToStringTest.php +++ b/tests/Test/Filter/FileArrayToStringTest.php @@ -5,7 +5,7 @@ * ************************************************ */ -namespace MyBaseTest\Filter; +namespace MyBase\Test\Filter; use MyBase\Filter\FileArrayToString; use PHPUnit_Framework_TestCase; @@ -72,7 +72,7 @@ public function valuesProvider() [ new TestAsset\StringConvertible(), [], - 'MyBaseTest\Filter\TestAsset\StringConvertible' + 'MyBase\Test\Filter\TestAsset\StringConvertible' ], ]; } diff --git a/tests/MyBaseTest/Filter/TestAsset/StringConvertible.php b/tests/Test/Filter/TestAsset/StringConvertible.php similarity index 87% rename from tests/MyBaseTest/Filter/TestAsset/StringConvertible.php rename to tests/Test/Filter/TestAsset/StringConvertible.php index 4f1d139..e896b34 100644 --- a/tests/MyBaseTest/Filter/TestAsset/StringConvertible.php +++ b/tests/Test/Filter/TestAsset/StringConvertible.php @@ -5,7 +5,7 @@ * ************************************************ */ -namespace MyBaseTest\Filter\TestAsset; +namespace MyBase\Test\Filter\TestAsset; class StringConvertible { diff --git a/tests/MyBaseTest/Image/ResizerTest.php b/tests/Test/Image/ResizerTest.php similarity index 99% rename from tests/MyBaseTest/Image/ResizerTest.php rename to tests/Test/Image/ResizerTest.php index bfee2f2..c4e4bcb 100644 --- a/tests/MyBaseTest/Image/ResizerTest.php +++ b/tests/Test/Image/ResizerTest.php @@ -6,7 +6,7 @@ * ************************************************ */ -namespace MyBaseTest\Image; +namespace MyBase\Test\Image; use Imagick; use PHPUnit_Framework_TestCase; diff --git a/tests/MyBaseTest/Image/_files/.gitignore b/tests/Test/Image/_files/.gitignore similarity index 100% rename from tests/MyBaseTest/Image/_files/.gitignore rename to tests/Test/Image/_files/.gitignore diff --git a/tests/MyBaseTest/Image/_files/beermug.jpg b/tests/Test/Image/_files/beermug.jpg similarity index 100% rename from tests/MyBaseTest/Image/_files/beermug.jpg rename to tests/Test/Image/_files/beermug.jpg diff --git a/tests/MyBaseTest/Image/_files/unionjack.jpg b/tests/Test/Image/_files/unionjack.jpg similarity index 100% rename from tests/MyBaseTest/Image/_files/unionjack.jpg rename to tests/Test/Image/_files/unionjack.jpg diff --git a/tests/MyBaseTest/ServiceManager/AsseticSassFilterFactoryTest.php b/tests/Test/ServiceManager/AsseticSassFilterFactoryTest.php similarity index 98% rename from tests/MyBaseTest/ServiceManager/AsseticSassFilterFactoryTest.php rename to tests/Test/ServiceManager/AsseticSassFilterFactoryTest.php index 37a74f0..4af8b10 100644 --- a/tests/MyBaseTest/ServiceManager/AsseticSassFilterFactoryTest.php +++ b/tests/Test/ServiceManager/AsseticSassFilterFactoryTest.php @@ -5,7 +5,7 @@ * ************************************************ */ -namespace MyBaseTest\ServiceManager; +namespace MyBase\Test\ServiceManager; use MyBase\ServiceManager\AsseticSassFilterFactory; use PHPUnit_Framework_Assert; diff --git a/tests/MyBaseTest/ServiceManager/HTMLPurifierFactoryTest.php b/tests/Test/ServiceManager/HTMLPurifierFactoryTest.php similarity index 98% rename from tests/MyBaseTest/ServiceManager/HTMLPurifierFactoryTest.php rename to tests/Test/ServiceManager/HTMLPurifierFactoryTest.php index 6798d49..e097111 100644 --- a/tests/MyBaseTest/ServiceManager/HTMLPurifierFactoryTest.php +++ b/tests/Test/ServiceManager/HTMLPurifierFactoryTest.php @@ -5,11 +5,11 @@ * ************************************************ */ -namespace MyBaseTest\ServiceManager; +namespace MyBase\Test\ServiceManager; use HTMLPurifier; use MyBase\ServiceManager\HTMLPurifierFactory; -use MyBaseTest\Bootstrap; +use MyBase\Test\Bootstrap; use PHPUnit_Framework_TestCase as TestCase; use Zend\Stdlib\ArrayUtils; diff --git a/tests/MyBaseTest/Util/SerializorTest.php b/tests/Test/Util/SerializorTest.php similarity index 96% rename from tests/MyBaseTest/Util/SerializorTest.php rename to tests/Test/Util/SerializorTest.php index 5d88c72..bdd84bc 100644 --- a/tests/MyBaseTest/Util/SerializorTest.php +++ b/tests/Test/Util/SerializorTest.php @@ -6,7 +6,7 @@ * ************************************************ */ -namespace MyBaseTest\Util; +namespace MyBase\Test\Util; use PHPUnit_Framework_TestCase; use MyBase\Util\Serializor; diff --git a/tests/MyBaseTest/Util/TestAsset/Bar.php b/tests/Test/Util/TestAsset/Bar.php similarity index 85% rename from tests/MyBaseTest/Util/TestAsset/Bar.php rename to tests/Test/Util/TestAsset/Bar.php index 2ccbaa4..3333531 100644 --- a/tests/MyBaseTest/Util/TestAsset/Bar.php +++ b/tests/Test/Util/TestAsset/Bar.php @@ -5,7 +5,7 @@ * ************************************************ */ -namespace MyBaseTest\Util\TestAsset; +namespace MyBase\Test\Util\TestAsset; class Bar { diff --git a/tests/MyBaseTest/Util/TestAsset/Foo.php b/tests/Test/Util/TestAsset/Foo.php similarity index 86% rename from tests/MyBaseTest/Util/TestAsset/Foo.php rename to tests/Test/Util/TestAsset/Foo.php index 80b4df7..60e4a9a 100644 --- a/tests/MyBaseTest/Util/TestAsset/Foo.php +++ b/tests/Test/Util/TestAsset/Foo.php @@ -5,7 +5,7 @@ * ************************************************ */ -namespace MyBaseTest\Util\TestAsset; +namespace MyBase\Test\Util\TestAsset; class Foo { diff --git a/tests/MyBaseTest/View/Helper/DatePatternFormatTest.php b/tests/Test/View/Helper/DatePatternFormatTest.php similarity index 98% rename from tests/MyBaseTest/View/Helper/DatePatternFormatTest.php rename to tests/Test/View/Helper/DatePatternFormatTest.php index 3e38051..9871234 100644 --- a/tests/MyBaseTest/View/Helper/DatePatternFormatTest.php +++ b/tests/Test/View/Helper/DatePatternFormatTest.php @@ -5,7 +5,7 @@ * ************************************************ */ -namespace MyBaseTest\View\Helper; +namespace MyBase\Test\View\Helper; use MyBase\View\Helper\DatePatternFormat; use ZendTest\I18n\View\Helper\DateFormatTest; diff --git a/tests/MyBaseTest/View/Helper/ImageResizeTest.php b/tests/Test/View/Helper/ImageResizeTest.php similarity index 99% rename from tests/MyBaseTest/View/Helper/ImageResizeTest.php rename to tests/Test/View/Helper/ImageResizeTest.php index e492207..868b5ac 100644 --- a/tests/MyBaseTest/View/Helper/ImageResizeTest.php +++ b/tests/Test/View/Helper/ImageResizeTest.php @@ -5,7 +5,7 @@ * ************************************************ */ -namespace MyBaseTest\View\Helper; +namespace MyBase\Test\View\Helper; use MyBase\Image\Resizer; use MyBase\View\Helper\ImageResize; diff --git a/tests/init_bootstrap.php b/tests/init_bootstrap.php index 7906a78..02b0df8 100644 --- a/tests/init_bootstrap.php +++ b/tests/init_bootstrap.php @@ -5,11 +5,9 @@ * ************************************************ */ -namespace MyBaseTest; - error_reporting(E_ALL | E_STRICT); chdir(__DIR__); -require __DIR__ . '/' . __NAMESPACE__ . '/Bootstrap.php'; +require __DIR__ . '/Test/Bootstrap.php'; -Bootstrap::init(); +MyBase\Test\Bootstrap::init(); diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist index f9b4713..5b4ae11 100644 --- a/tests/phpunit.xml.dist +++ b/tests/phpunit.xml.dist @@ -1,7 +1,7 @@ - - ./MyBaseTest + + ./Test