Switch from PSR-0 to PSR-4 and update README

README.md

@@ -7,6 +7,7 @@ Braincrafted\Json
 
 Developed by [Florian Eckerstorfer](https://florian.ec) in Vienna, Europe.
 
+
 Installation
 ------------
 
@@ -19,6 +20,7 @@ $ composer require braincrafted/json:@stable
 *__Tip:__ You should replace `@stable` with the most recent version from the
 [releases](https://github.com/braincrafted/json/releases) page.*
 
+
 Usage
 -----
 
@@ -32,6 +34,9 @@ echo Json::encode(array('name' => 'Bilbo Baggins'));
 // Decode JSON:
 print_r(Json::decode('{"name": "Bilbo Baggins"}'));
 
+// Decode JSON into an array:
+print_r(Json::decode('{"name": "Bilbo Baggins"}', Json::DECODE_ASSOC));
+
 // Error handling
 try {
     Json::decode('{"name": "Bilbo Baggins"'); // missing }
@@ -44,6 +49,12 @@ try {
 Changelog
 ---------
 
+### Version 0.3 (18 November 2014)
+
+- Switched from PSR-0 to PSR-4
+- Use `Json::DECODE_ASSOC` and `Json::DECODE_OBJECT` as second argument for `Json::decode()`
+
+
 ### Version 0.2 (15 November 2013)
 
 - Changed namespace to `Braincrafted`

composer.json

@@ -5,6 +5,6 @@
         "phpunit/phpunit": "3.7.x"
     },
     "autoload": {
-        "psr-0": { "Braincrafted\\Json": "src/" }
+        "psr-4": { "Braincrafted\\Json\\": "src/" }
     }
-}
+}

phpunit.xml.dist

@@ -3,13 +3,13 @@
 <phpunit bootstrap="tests/bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="Braincrafted\Json Test Suite">
-            <directory>tests/Braincrafted/Json/</directory>
+            <directory>tests/</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory suffix=".php">src/Braincrafted/Json/</directory>
+            <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
 </phpunit>