Merge pull request #9 from jeskew/feature/psr4-the-tests

PSR4 all the things
aws · Jun 12, 2015 · c463e8b · c463e8b
2 parents c09f17f + e3181d6
commit c463e8b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -17,14 +17,22 @@
         "silex/silex": "1.*"
     },
     "autoload": {
-        "psr-0": { "Aws\\Silex": "src/" }
+        "psr-4": {
+            "Aws\\Silex\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Aws\\Silex\\": "tests/"
+        }
     },
     "extra": {
         "branch-alias": {
             "dev-master": "1.0-dev"
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.7"
+        "phpunit/phpunit": "~4.7",
+        "squizlabs/php_codesniffer": "^2.3"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./tests/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="AwsServiceProvider Test Suite">
             <directory>./tests</directory>

diff --git a/src/Aws/Silex/AwsServiceProvider.php → src/AwsServiceProvider.php b/src/Aws/Silex/AwsServiceProvider.php → src/AwsServiceProvider.php
diff --git a/...ws/Silex/Tests/AwsServiceProviderTest.php → tests/AwsServiceProviderTest.php b/...ws/Silex/Tests/AwsServiceProviderTest.php → tests/AwsServiceProviderTest.php
@@ -14,9 +14,8 @@
  * permissions and limitations under the License.
  */
 
-namespace Aws\Silex\Tests;
+namespace Aws\Silex;
 
-use Aws\Silex\AwsServiceProvider;
 use Silex\Application;
 
 /**

diff --git a/tests/bootstrap.php b/tests/bootstrap.php