moved to psr-4, closed some extension points

maschmann · Dec 30, 2014 · 02cfb1f · 02cfb1f
1 parent 6908c71
commit 02cfb1f
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
         "phpunit\/phpunit": "~4.0"
     },
     "autoload": {
-        "psr-0": {
-            "": "lib/"
+        "psr-4": {
+            "Asm\\": "src/"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,15 +13,15 @@
         >
     <testsuites>
         <testsuite name="PhpUtilities testsuite">
-            <directory>./lib/Asm/Tests</directory>
+            <directory>./src/Tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>./lib/Asm</directory>
+            <directory>./src</directory>
             <exclude>
-                <directory>./lib/Asm/Tests</directory>
+                <directory>./src/Tests</directory>
                 <directory>./vendor</directory>
             </exclude>
         </whitelist>

diff --git a/lib/Asm/Config/Config.php → src/Config/Config.php b/lib/Asm/Config/Config.php → src/Config/Config.php
@@ -10,7 +10,7 @@
 namespace Asm\Config;
 
 /**
- * Class ConfigManager
+ * Class Config
  *
  * @package Asm\Config
  * @author marc aschmann <maschmann@gmail.com>

diff --git a/lib/Asm/Config/ConfigAbstract.php → src/Config/ConfigAbstract.php b/lib/Asm/Config/ConfigAbstract.php → src/Config/ConfigAbstract.php
diff --git a/lib/Asm/Config/ConfigDefault.php → src/Config/ConfigDefault.php b/lib/Asm/Config/ConfigDefault.php → src/Config/ConfigDefault.php
@@ -15,7 +15,7 @@
  * @package Asm\Config
  * @author marc aschmann <maschmann@gmail.com>
  */
-class ConfigDefault extends ConfigAbstract implements ConfigInterface
+final class ConfigDefault extends ConfigAbstract implements ConfigInterface
 {
     /**
      * default method

diff --git a/lib/Asm/Config/ConfigEnv.php → src/Config/ConfigEnv.php b/lib/Asm/Config/ConfigEnv.php → src/Config/ConfigEnv.php
@@ -17,12 +17,12 @@
  * @package Asm\Config
  * @author marc aschmann <maschmann@gmail.com>
  */
-class ConfigEnv extends ConfigAbstract implements ConfigInterface
+final class ConfigEnv extends ConfigAbstract implements ConfigInterface
 {
     /**
      * @var string
      */
-    protected $defaultEnv = 'prod';
+    private $defaultEnv = 'prod';
 
     /**
      * default method

diff --git a/lib/Asm/Config/ConfigInterface.php → src/Config/ConfigInterface.php b/lib/Asm/Config/ConfigInterface.php → src/Config/ConfigInterface.php
diff --git a/lib/Asm/Config/ConfigTimer.php → src/Config/ConfigTimer.php b/lib/Asm/Config/ConfigTimer.php → src/Config/ConfigTimer.php
@@ -15,7 +15,7 @@
  * @package Asm\Config
  * @author marc aschmann <maschmann@gmail.com>
  */
-class ConfigTimer extends ConfigAbstract implements ConfigInterface
+final class ConfigTimer extends ConfigAbstract implements ConfigInterface
 {
     /**
      * default method

diff --git a/lib/Asm/Data/Data.php → src/Data/Data.php b/lib/Asm/Data/Data.php → src/Data/Data.php
@@ -23,7 +23,7 @@ class Data implements DataInterface
      *
      * @var array
      */
-    protected $data = array();
+    private $data = array();
 
     /**
      * clears the data(!) content of the object

diff --git a/lib/Asm/Data/DataCollection.php → src/Data/DataCollection.php b/lib/Asm/Data/DataCollection.php → src/Data/DataCollection.php
@@ -15,18 +15,18 @@
  * @package Asm\Data
  * @author marc aschmann <maschmann@gmail.com>
  */
-class DataCollection extends Data implements DataInterface, \Iterator
+final class DataCollection extends Data implements DataInterface, \Iterator
 {
 
     /**
      * @var integer
      */
-    protected $position;
+    private $position;
 
     /**
      * @var integer
      */
-    protected $totalCount = 0;
+    private $totalCount = 0;
 
     /**
      * @param array $data

diff --git a/lib/Asm/Data/DataInterface.php → src/Data/DataInterface.php b/lib/Asm/Data/DataInterface.php → src/Data/DataInterface.php
diff --git a/lib/Asm/Test/TestData.php → src/Test/TestData.php b/lib/Asm/Test/TestData.php → src/Test/TestData.php
diff --git a/lib/Asm/Tests/Config/ConfigDefaultTest.php → src/Tests/Config/ConfigDefaultTest.php b/lib/Asm/Tests/Config/ConfigDefaultTest.php → src/Tests/Config/ConfigDefaultTest.php
diff --git a/lib/Asm/Tests/Config/ConfigEnvTest.php → src/Tests/Config/ConfigEnvTest.php b/lib/Asm/Tests/Config/ConfigEnvTest.php → src/Tests/Config/ConfigEnvTest.php
diff --git a/lib/Asm/Tests/Config/ConfigFactoryTest.php → src/Tests/Config/ConfigFactoryTest.php b/lib/Asm/Tests/Config/ConfigFactoryTest.php → src/Tests/Config/ConfigFactoryTest.php
diff --git a/lib/Asm/Tests/Config/ConfigTimerTest.php → src/Tests/Config/ConfigTimerTest.php b/lib/Asm/Tests/Config/ConfigTimerTest.php → src/Tests/Config/ConfigTimerTest.php
diff --git a/lib/Asm/Tests/Data/DataCollectionTest.php → src/Tests/Data/DataCollectionTest.php b/lib/Asm/Tests/Data/DataCollectionTest.php → src/Tests/Data/DataCollectionTest.php
diff --git a/lib/Asm/Tests/Data/DataTest.php → src/Tests/Data/DataTest.php b/lib/Asm/Tests/Data/DataTest.php → src/Tests/Data/DataTest.php
diff --git a/lib/Asm/Tests/Test/TestDataTest.php → src/Tests/Test/TestDataTest.php b/lib/Asm/Tests/Test/TestDataTest.php → src/Tests/Test/TestDataTest.php
diff --git a/lib/Asm/Tests/Timer/TimerTest.php → src/Tests/Timer/TimerTest.php b/lib/Asm/Tests/Timer/TimerTest.php → src/Tests/Timer/TimerTest.php
diff --git a/lib/Asm/Timer/Timer.php → src/Timer/Timer.php b/lib/Asm/Timer/Timer.php → src/Timer/Timer.php
@@ -17,7 +17,7 @@
  * @package Asm\Timer
  * @author Marc Aschmann <maschmann@gmail.com>
  */
-class Timer
+final class Timer
 {
     /**
      * @var \Asm\Data\Data