Migrate from PSR-0 to PSR-4.

autoload.php

@@ -9,6 +9,6 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/lib/Predis/Autoloader.php';
+require __DIR__.'/lib/Autoloader.php';
 
 Predis\Autoloader::register();

bin/create-command-test

@@ -61,7 +61,7 @@ class CommandTestCaseGenerator
 
         $options = array(
             'overwrite' => false,
-            'tests' => __DIR__.'/../tests',
+            'tests' => __DIR__.'/../tests/Predis',
         );
 
         foreach ($getops as $option => $value) {
@@ -93,7 +93,7 @@ class CommandTestCaseGenerator
         }
 
         $options['fqn'] = "Predis\\Command\\{$options['class']}";
-        $options['path'] = "Predis/Command/{$options['class']}.php";
+        $options['path'] = "Command/{$options['class']}.php";
 
         $source = __DIR__.'/../lib/'.$options['path'];
         if (!file_exists($source)) {

bin/create-phar

@@ -52,7 +52,7 @@ function getPharStub($options)
 Phar::mapPhar('predis.phar');
 spl_autoload_register(function (\$class) {
     if (strpos(\$class, 'Predis\\\\') === 0) {
-        \$file = 'phar://predis.phar/'.strtr(\$class, '\\\', '/').'.php';
+        \$file = 'phar://predis.phar/'.strtr(substr(\$class, 7), '\\\', '/').'.php';
         if (file_exists(\$file)) {
             require \$file;
             return true;

bin/create-single-file

@@ -36,7 +36,7 @@ class CommandLine
         $getops = getopt(implode(array_keys($parameters)), $parameters);
 
         $options = array(
-            'source'  => __DIR__ . "/../lib/",
+            'source'  => __DIR__ . "/../lib",
             'output'  => PredisFile::NS_ROOT . '.php',
             'exclude' => array(),
         );
@@ -82,9 +82,8 @@ class PredisFile
 
     public static function from($libraryPath, array $exclude = array())
     {
-        $nsroot = self::NS_ROOT;
         $predisFile = new PredisFile();
-        $libIterator = new RecursiveDirectoryIterator("$libraryPath$nsroot");
+        $libIterator = new RecursiveDirectoryIterator($libraryPath);
 
         foreach (new RecursiveIteratorIterator($libIterator) as $classFile)
         {
@@ -92,7 +91,7 @@ class PredisFile
                 continue;
             }
 
-            $namespace = strtr(str_replace($libraryPath, '', $classFile->getPath()), '/', '\\');
+            $namespace = self::NS_ROOT.strtr(str_replace($libraryPath, '', $classFile->getPath()), '/', '\\');
 
             if (in_array(sprintf('%s\\%s', $namespace, $classFile->getBasename('.php')), $exclude)) {
                 continue;

composer.json

@@ -26,7 +26,7 @@
         "ext-curl": "Allows access to Webdis when paired with phpiredis"
     },
     "autoload": {
-        "psr-0": {"Predis": "lib/"}
+        "psr-4": {"Predis\\": "lib/"}
     },
     "extra": {
         "branch-alias": {