From bd1ef40db6369dfd53259a90e2d3466305fc31a9 Mon Sep 17 00:00:00 2001
From: Scott <scott@paragonie.com>
Date: Thu, 16 Apr 2015 09:03:49 -0400
Subject: [PATCH] Autoloader sanity

---
 composer.json                   | 15 ++++++--------
 pharaoh                         | 35 +--------------------------------
 src/{ => Pharaoh}/PharDiff.php  |  0
 src/{ => Pharaoh}/PharError.php |  0
 src/{ => Pharaoh}/Pharaoh.php   |  0
 src/autoload.php                | 33 +++++++++++++++++++++++++++++++
 6 files changed, 40 insertions(+), 43 deletions(-)
 rename src/{ => Pharaoh}/PharDiff.php (100%)
 rename src/{ => Pharaoh}/PharError.php (100%)
 rename src/{ => Pharaoh}/Pharaoh.php (100%)
 create mode 100644 src/autoload.php

diff --git a/composer.json b/composer.json
index 4df320a..f13b0aa 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name":         "paragonie/pharaoh",
     "description":  "Compare PHARs from the Command Line",
-    "version":      "0.1.0",
+    "version":      "0.1.2",
     "keywords": [
             "tool",
             "utility",
@@ -20,15 +20,12 @@
         ],
     "support": {
         "issues":   "https://github.com/paragonie/pharaoh/issues",
-        "email":    "info@resonantcore.net",
+        "email":    "info@paragonie.com",
         "source":   "https://github.com/paragonie/pharaoh"
     },
     "autoload": {
-        "psr-4": {
-            "ParagonIE\\Pharoah\\": "src/"
-        }
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.5.*"
+        "files": [
+            "src/autoload.php"
+        ]
     }
-}
+}
\ No newline at end of file
diff --git a/pharaoh b/pharaoh
index d857db0..6907415 100755
--- a/pharaoh
+++ b/pharaoh
@@ -1,39 +1,6 @@
 #!/usr/bin/env php
 <?php
-
-\spl_autoload_register(function ($class) {
-    // Project-specific namespace prefix
-    $prefix = 'ParagonIE\\Pharaoh';
-
-    // Base directory for the namespace prefix
-    $base_dir = __DIR__.'/src/';
-
-    // Does the class use the namespace prefix?
-    $len = \strlen($prefix);
-    if (\strncmp($prefix, $class, $len) !== 0) {
-        // no, move to the next registered autoloader
-        return;
-    }
-
-    // Get the relative class name
-    $relative_class = \substr($class, $len);
-
-    // Replace the namespace prefix with the base directory, replace namespace
-    // separators with directory separators in the relative class name, append
-    // with .php
-    $file = $base_dir.
-        \str_replace(
-            ['\\', '_'],
-            '/',
-            $relative_class
-        ).'.php';
-
-    // If the file exists, require it
-    if (\file_exists($file)) {
-        require $file;
-    }
-});
-
+require_once __DIR__.'/autoload.php';
 if ($argc < 3) {
     die("Please pass two phars to diff them.\n");
 }
diff --git a/src/PharDiff.php b/src/Pharaoh/PharDiff.php
similarity index 100%
rename from src/PharDiff.php
rename to src/Pharaoh/PharDiff.php
diff --git a/src/PharError.php b/src/Pharaoh/PharError.php
similarity index 100%
rename from src/PharError.php
rename to src/Pharaoh/PharError.php
diff --git a/src/Pharaoh.php b/src/Pharaoh/Pharaoh.php
similarity index 100%
rename from src/Pharaoh.php
rename to src/Pharaoh/Pharaoh.php
diff --git a/src/autoload.php b/src/autoload.php
new file mode 100644
index 0000000..898366e
--- /dev/null
+++ b/src/autoload.php
@@ -0,0 +1,33 @@
+<?php
+\spl_autoload_register(function ($class) {
+    // Project-specific namespace prefix
+    $prefix = 'ParagonIE\\Pharaoh';
+
+    // Base directory for the namespace prefix
+    $base_dir = __DIR__.'/Pharaoh/';
+
+    // Does the class use the namespace prefix?
+    $len = \strlen($prefix);
+    if (\strncmp($prefix, $class, $len) !== 0) {
+        // no, move to the next registered autoloader
+        return;
+    }
+
+    // Get the relative class name
+    $relative_class = \substr($class, $len);
+
+    // Replace the namespace prefix with the base directory, replace namespace
+    // separators with directory separators in the relative class name, append
+    // with .php
+    $file = $base_dir.
+        \str_replace(
+            ['\\', '_'],
+            '/',
+            $relative_class
+        ).'.php';
+
+    // If the file exists, require it
+    if (\file_exists($file)) {
+        require $file;
+    }
+});
\ No newline at end of file