More cleanup, remove outdated samples for old API, update autoload ma…

…p, update some first tests
theseer · Aug 5, 2014 · 69f3fcc · 69f3fcc
1 parent 1d5c545
commit 69f3fcc
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 84 deletions.
diff --git a/samples/sample.php b/samples/sample.php
@@ -1,8 +1,8 @@
 <?php
 
-  require __DIR__ . '/../src/classfinder.php';
+  require __DIR__ . '/../src/autoload.php';
 
-  $finder = new \TheSeer\Autoload\ClassFinder;
+  $parser = new \TheSeer\Autoload\Parser;
 
-  $rc = $finder->parseFile(__DIR__ . '/../src/classfinder.php');
-  var_dump($rc, $finder->getClasses());
+  $result = $parser->parse(new \TheSeer\Autoload\SourceFile(__DIR__ . '/../src/Parser.php'));
+  var_dump($result->getUnits(), $result->getDependenciesForUnit(strtolower(\TheSeer\Autoload\ParserException::class)));
diff --git a/samples/sample2.php b/samples/sample2.php
diff --git a/samples/sample3.php b/samples/sample3.php
diff --git a/samples/sample4.php b/samples/sample4.php
diff --git a/samples/sample5.php b/samples/sample5.php
diff --git a/samples/sample6.php b/samples/sample6.php
diff --git a/src/CollectorResult.php b/src/CollectorResult.php
@@ -23,6 +23,7 @@ public function addParseResult(\SplFileInfo $file, ParseResult $result) {
                         CollectorResultException::DuplicateUnitName
                     );
                 }
+                $unit = addslashes($unit);
                 $this->units[$unit] = $filename;
                 $this->dependencies[$unit] = $result->getDependenciesForUnit($unit);
             }

diff --git a/src/autoload.php b/src/autoload.php
@@ -7,20 +7,25 @@ function($class) {
         static $classes = null;
         if ($classes === null) {
             $classes = array(
-                'foo' => '/test/test.php',
                 'theseer\\autoload\\application' => '/Application.php',
                 'theseer\\autoload\\applicationexception' => '/Application.php',
                 'theseer\\autoload\\autoloadbuilderexception' => '/AutoloadRenderer.php',
                 'theseer\\autoload\\autoloadrenderer' => '/AutoloadRenderer.php',
                 'theseer\\autoload\\classdependencysorter' => '/DependencySorter.php',
                 'theseer\\autoload\\classdependencysorterexception' => '/DependencySorter.php',
-                'theseer\\autoload\\classfinder' => '/ClassFinder.php',
-                'theseer\\autoload\\classfinderexception' => '/ClassFinder.php',
                 'theseer\\autoload\\cli' => '/CLI.php',
+                'theseer\\autoload\\collector' => '/Collector.php',
+                'theseer\\autoload\\collectorexception' => '/Collector.php',
+                'theseer\\autoload\\collectorresult' => '/CollectorResult.php',
+                'theseer\\autoload\\collectorresultexception' => '/CollectorResult.php',
                 'theseer\\autoload\\config' => '/Config.php',
                 'theseer\\autoload\\factory' => '/Factory.php',
                 'theseer\\autoload\\logger' => '/Logger.php',
+                'theseer\\autoload\\parser' => '/Parser.php',
+                'theseer\\autoload\\parseresult' => '/ParseResult.php',
+                'theseer\\autoload\\parserexception' => '/Parser.php',
                 'theseer\\autoload\\pharbuilder' => '/PharBuilder.php',
+                'theseer\\autoload\\sourcefile' => '/SourceFile.php',
                 'theseer\\autoload\\staticrenderer' => '/StaticRenderer.php',
                 'theseer\\autoload\\version' => '/Version.php'
             );
@@ -31,4 +36,4 @@ function($class) {
         }
     }
 );
-// @codeCoverageIgnoreEnd
+// @codeCoverageIgnoreEnd
diff --git a/tests/AutoloadRenderer.test.php b/tests/AutoloadRenderer.test.php
@@ -37,7 +37,7 @@
 
 namespace TheSeer\Autoload\Tests {
 
-    use TheSeer\Autoload\ClassFinder;
+    use TheSeer\Autoload\Parser;
     use TheSeer\Autoload\AutoloadRenderer;
 
     /**

diff --git a/tests/classdependencysorter.test.php b/tests/classdependencysorter.test.php
@@ -37,7 +37,7 @@
 
 namespace TheSeer\Autoload\Tests {
 
-    use TheSeer\Autoload\ClassFinder;
+    use TheSeer\Autoload\Parser;
     use TheSeer\Autoload\AutoloadRenderer;
     use TheSeer\Autoload\ClassDependencySorter;