From c43be02bd9feb07c9c9389765e353a4643f5c519 Mon Sep 17 00:00:00 2001 From: Ben Ramsey Date: Fri, 21 Feb 2014 18:35:01 -0600 Subject: [PATCH] Upgraded to PSR-4 autoloading --- composer.json | 4 ++-- src/{Rhumsaa/Uuid => }/Console/Application.php | 0 src/{Rhumsaa/Uuid => }/Console/Command/DecodeCommand.php | 0 src/{Rhumsaa/Uuid => }/Console/Command/GenerateCommand.php | 0 src/{Rhumsaa/Uuid => }/Console/Exception.php | 0 src/{Rhumsaa/Uuid => }/Console/Util/ErrorHandler.php | 0 src/{Rhumsaa/Uuid => }/Doctrine/UuidType.php | 0 .../Uuid => }/Exception/UnsatisfiedDependencyException.php | 0 .../Uuid => }/Exception/UnsupportedOperationException.php | 0 src/{Rhumsaa/Uuid => }/Uuid.php | 2 +- tests/{Rhumsaa/Uuid => }/Console/ApplicationTest.php | 0 .../{Rhumsaa/Uuid => }/Console/Command/DecodeCommandTest.php | 0 .../Uuid => }/Console/Command/GenerateCommandTest.php | 0 tests/{Rhumsaa/Uuid => }/Console/TestCase.php | 0 tests/{Rhumsaa/Uuid => }/Console/Util/BufferedOutput.php | 0 tests/{Rhumsaa/Uuid => }/Console/Util/ErrorHandlerTest.php | 0 tests/{Rhumsaa/Uuid => }/Console/Util/TestOutput.php | 0 tests/{Rhumsaa/Uuid => }/Doctrine/UuidTypeTest.php | 0 tests/{Rhumsaa/Uuid => }/TestCase.php | 0 tests/{Rhumsaa/Uuid => }/UuidBcTag1_1_2Test.php | 0 tests/{Rhumsaa/Uuid => }/UuidTest.php | 0 tests/bootstrap.php | 2 +- 22 files changed, 4 insertions(+), 4 deletions(-) rename src/{Rhumsaa/Uuid => }/Console/Application.php (100%) rename src/{Rhumsaa/Uuid => }/Console/Command/DecodeCommand.php (100%) rename src/{Rhumsaa/Uuid => }/Console/Command/GenerateCommand.php (100%) rename src/{Rhumsaa/Uuid => }/Console/Exception.php (100%) rename src/{Rhumsaa/Uuid => }/Console/Util/ErrorHandler.php (100%) rename src/{Rhumsaa/Uuid => }/Doctrine/UuidType.php (100%) rename src/{Rhumsaa/Uuid => }/Exception/UnsatisfiedDependencyException.php (100%) rename src/{Rhumsaa/Uuid => }/Exception/UnsupportedOperationException.php (100%) rename src/{Rhumsaa/Uuid => }/Uuid.php (99%) rename tests/{Rhumsaa/Uuid => }/Console/ApplicationTest.php (100%) rename tests/{Rhumsaa/Uuid => }/Console/Command/DecodeCommandTest.php (100%) rename tests/{Rhumsaa/Uuid => }/Console/Command/GenerateCommandTest.php (100%) rename tests/{Rhumsaa/Uuid => }/Console/TestCase.php (100%) rename tests/{Rhumsaa/Uuid => }/Console/Util/BufferedOutput.php (100%) rename tests/{Rhumsaa/Uuid => }/Console/Util/ErrorHandlerTest.php (100%) rename tests/{Rhumsaa/Uuid => }/Console/Util/TestOutput.php (100%) rename tests/{Rhumsaa/Uuid => }/Doctrine/UuidTypeTest.php (100%) rename tests/{Rhumsaa/Uuid => }/TestCase.php (100%) rename tests/{Rhumsaa/Uuid => }/UuidBcTag1_1_2Test.php (100%) rename tests/{Rhumsaa/Uuid => }/UuidTest.php (100%) diff --git a/composer.json b/composer.json index d8ec088..4416da0 100644 --- a/composer.json +++ b/composer.json @@ -35,11 +35,11 @@ "doctrine/dbal": "Allow the use of a UUID as doctrine field type." }, "autoload": { - "psr-0": {"Rhumsaa\\Uuid": "src/"} + "psr-4": {"Rhumsaa\\Uuid\\": "src/"} }, "extra": { "branch-alias": { - "dev-master": "2.7.x-dev" + "dev-master": "2.8.x-dev" } } } diff --git a/src/Rhumsaa/Uuid/Console/Application.php b/src/Console/Application.php similarity index 100% rename from src/Rhumsaa/Uuid/Console/Application.php rename to src/Console/Application.php diff --git a/src/Rhumsaa/Uuid/Console/Command/DecodeCommand.php b/src/Console/Command/DecodeCommand.php similarity index 100% rename from src/Rhumsaa/Uuid/Console/Command/DecodeCommand.php rename to src/Console/Command/DecodeCommand.php diff --git a/src/Rhumsaa/Uuid/Console/Command/GenerateCommand.php b/src/Console/Command/GenerateCommand.php similarity index 100% rename from src/Rhumsaa/Uuid/Console/Command/GenerateCommand.php rename to src/Console/Command/GenerateCommand.php diff --git a/src/Rhumsaa/Uuid/Console/Exception.php b/src/Console/Exception.php similarity index 100% rename from src/Rhumsaa/Uuid/Console/Exception.php rename to src/Console/Exception.php diff --git a/src/Rhumsaa/Uuid/Console/Util/ErrorHandler.php b/src/Console/Util/ErrorHandler.php similarity index 100% rename from src/Rhumsaa/Uuid/Console/Util/ErrorHandler.php rename to src/Console/Util/ErrorHandler.php diff --git a/src/Rhumsaa/Uuid/Doctrine/UuidType.php b/src/Doctrine/UuidType.php similarity index 100% rename from src/Rhumsaa/Uuid/Doctrine/UuidType.php rename to src/Doctrine/UuidType.php diff --git a/src/Rhumsaa/Uuid/Exception/UnsatisfiedDependencyException.php b/src/Exception/UnsatisfiedDependencyException.php similarity index 100% rename from src/Rhumsaa/Uuid/Exception/UnsatisfiedDependencyException.php rename to src/Exception/UnsatisfiedDependencyException.php diff --git a/src/Rhumsaa/Uuid/Exception/UnsupportedOperationException.php b/src/Exception/UnsupportedOperationException.php similarity index 100% rename from src/Rhumsaa/Uuid/Exception/UnsupportedOperationException.php rename to src/Exception/UnsupportedOperationException.php diff --git a/src/Rhumsaa/Uuid/Uuid.php b/src/Uuid.php similarity index 99% rename from src/Rhumsaa/Uuid/Uuid.php rename to src/Uuid.php index bbe330e..3b7ca91 100644 --- a/src/Rhumsaa/Uuid/Uuid.php +++ b/src/Uuid.php @@ -93,7 +93,7 @@ final class Uuid /** * Version of the Rhumsaa\Uuid package */ - const VERSION = '2.7.1'; + const VERSION = '2.8.x-dev'; /** * For testing, 64-bit system override; if true, treat the system as 32-bit diff --git a/tests/Rhumsaa/Uuid/Console/ApplicationTest.php b/tests/Console/ApplicationTest.php similarity index 100% rename from tests/Rhumsaa/Uuid/Console/ApplicationTest.php rename to tests/Console/ApplicationTest.php diff --git a/tests/Rhumsaa/Uuid/Console/Command/DecodeCommandTest.php b/tests/Console/Command/DecodeCommandTest.php similarity index 100% rename from tests/Rhumsaa/Uuid/Console/Command/DecodeCommandTest.php rename to tests/Console/Command/DecodeCommandTest.php diff --git a/tests/Rhumsaa/Uuid/Console/Command/GenerateCommandTest.php b/tests/Console/Command/GenerateCommandTest.php similarity index 100% rename from tests/Rhumsaa/Uuid/Console/Command/GenerateCommandTest.php rename to tests/Console/Command/GenerateCommandTest.php diff --git a/tests/Rhumsaa/Uuid/Console/TestCase.php b/tests/Console/TestCase.php similarity index 100% rename from tests/Rhumsaa/Uuid/Console/TestCase.php rename to tests/Console/TestCase.php diff --git a/tests/Rhumsaa/Uuid/Console/Util/BufferedOutput.php b/tests/Console/Util/BufferedOutput.php similarity index 100% rename from tests/Rhumsaa/Uuid/Console/Util/BufferedOutput.php rename to tests/Console/Util/BufferedOutput.php diff --git a/tests/Rhumsaa/Uuid/Console/Util/ErrorHandlerTest.php b/tests/Console/Util/ErrorHandlerTest.php similarity index 100% rename from tests/Rhumsaa/Uuid/Console/Util/ErrorHandlerTest.php rename to tests/Console/Util/ErrorHandlerTest.php diff --git a/tests/Rhumsaa/Uuid/Console/Util/TestOutput.php b/tests/Console/Util/TestOutput.php similarity index 100% rename from tests/Rhumsaa/Uuid/Console/Util/TestOutput.php rename to tests/Console/Util/TestOutput.php diff --git a/tests/Rhumsaa/Uuid/Doctrine/UuidTypeTest.php b/tests/Doctrine/UuidTypeTest.php similarity index 100% rename from tests/Rhumsaa/Uuid/Doctrine/UuidTypeTest.php rename to tests/Doctrine/UuidTypeTest.php diff --git a/tests/Rhumsaa/Uuid/TestCase.php b/tests/TestCase.php similarity index 100% rename from tests/Rhumsaa/Uuid/TestCase.php rename to tests/TestCase.php diff --git a/tests/Rhumsaa/Uuid/UuidBcTag1_1_2Test.php b/tests/UuidBcTag1_1_2Test.php similarity index 100% rename from tests/Rhumsaa/Uuid/UuidBcTag1_1_2Test.php rename to tests/UuidBcTag1_1_2Test.php diff --git a/tests/Rhumsaa/Uuid/UuidTest.php b/tests/UuidTest.php similarity index 100% rename from tests/Rhumsaa/Uuid/UuidTest.php rename to tests/UuidTest.php diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 1710d4a..2f16bac 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -12,4 +12,4 @@ if (!file_exists(dirname(__DIR__) . '/vendor/autoload.php')) { $loader = include realpath(dirname(__FILE__) . '/../vendor/autoload.php'); $loader->add("Doctrine\Tests\DBAL", __DIR__."/../vendor/doctrine/dbal/tests"); -$loader->add('Rhumsaa\Uuid', __DIR__); +$loader->addPsr4('Rhumsaa\\Uuid\\', __DIR__);