Switch to PSR-4

dunglas · Jan 22, 2016 · e574bd5 · e574bd5
1 parent 6249983
commit e574bd5
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -3,20 +3,24 @@
     "type": "library",
     "description": "Tor control library",
     "keywords": ["tor"],
-    "homepage": "http://dunglas.fr",
+    "homepage": "https://dunglas.fr",
     "license": "MIT",
-    "authors": [
-    {
+    "authors": [{
         "name": "Kévin Dunglas",
-        "email": "dunglas@gmail.com"
-    }
-    ],
+        "email": "dunglas@gmail.com",
+        "homepage": "https://dunglas.fr"
+    }],
+    "require": {
+        "php": ">=5.4"
+    },
     "autoload": {
-        "psr-0": {
-            "": "src/"
+        "psr-4": {
+            "TorControl\\": "src/"
         }
     },
-    "require": {
-        "php": ">=5.4"
+    "autoload-dev": {
+        "psr-4": {
+            "TorControl\\Tests\\": "tests/Tests/"
+        }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -12,13 +12,13 @@
 
     <testsuites>
         <testsuite name="TorControl">
-            <directory>./tests/TorControl/Tests</directory>
+            <directory>./tests/Tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory suffix=".php">./src/TorControl</directory>
+            <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
 

diff --git a/src/TorControl/Exception/IOError.php → src/Exception/IOError.php b/src/TorControl/Exception/IOError.php → src/Exception/IOError.php
diff --git a/src/TorControl/Exception/ProtocolError.php → src/Exception/ProtocolError.php b/src/TorControl/Exception/ProtocolError.php → src/Exception/ProtocolError.php
diff --git a/src/TorControl/Exception/TorError.php → src/Exception/TorError.php b/src/TorControl/Exception/TorError.php → src/Exception/TorError.php
diff --git a/src/TorControl/TorControl.php → src/TorControl.php b/src/TorControl/TorControl.php → src/TorControl.php
diff --git a/tests/TorControl/Tests/TorControlTest.php → tests/Tests/TorControlTest.php b/tests/TorControl/Tests/TorControlTest.php → tests/Tests/TorControlTest.php