Removed the custom autoloader

s9e · Jan 5, 2017 · 25f2c23 · 25f2c23
1 parent 9deb2f7
commit 25f2c23
Show file tree

Hide file tree

Showing 32 changed files with 42 additions and 194 deletions.
diff --git a/composer.json b/composer.json
@@ -30,5 +30,10 @@
 		"psr-4": {
 			"s9e\\TextFormatter\\": "src"
 		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"s9e\\TextFormatter\\Tests\\": "tests"
+		}
 	}
 }
diff --git a/docs/Cookbook/00_Getting_started/00_Installation.md b/docs/Cookbook/00_Getting_started/00_Installation.md
@@ -4,14 +4,6 @@ s9e\\TextFormatter is developed on the latest version of PHP and is compatible w
 
 Once installed, you can try this [basic example](https://github.com/s9e/TextFormatter/blob/master/docs/examples/00_quick.php).
 
-### Direct download
-
-Download a snapshot of the library from GitHub directly: [php5.3](https://github.com/s9e/TextFormatter/archive/release/php5.3.zip), [php5.4](https://github.com/s9e/TextFormatter/archive/release/php5.4.zip), [php5.5](https://github.com/s9e/TextFormatter/archive/release/php5.5.zip), [php5.6](https://github.com/s9e/TextFormatter/archive/release/php5.6.zip). Unpack the archive, rename the directory to "TextFormatter" (optional, but it looks nicer) and use the bundled autoloader.
-
-```php
-include 'TextFormatter/src/autoloader.php';
-```
-
 ### Via Composer/[Packagist](https://packagist.org/)
 
 Add the following to your `composer.json`. It will use Composer's autoloader normally.
@@ -22,14 +14,3 @@ Add the following to your `composer.json`. It will use Composer's autoloader nor
     }
 }
 ```
-
-### Via Git
-
-Clone this repository and use the bundled autoloader.
-
-```bash
-git clone https://github.com/s9e/TextFormatter.git -b release/php5.3
-```
-```php
-include 'TextFormatter/src/autoloader.php';
-```
diff --git a/docs/Getting_started/Installation.md b/docs/Getting_started/Installation.md
@@ -23,22 +23,3 @@ composer require s9e/text-formatter
     }
 }
 ```
-
-### Direct download
-
-Download a snapshot of the library from GitHub directly: [php5.3](https://github.com/s9e/TextFormatter/archive/release/php5.3.zip), [php5.4](https://github.com/s9e/TextFormatter/archive/release/php5.4.zip), [php5.5](https://github.com/s9e/TextFormatter/archive/release/php5.5.zip), [php5.6](https://github.com/s9e/TextFormatter/archive/release/php5.6.zip). Unpack the archive, rename the directory to "TextFormatter" (optional, but it looks nicer) and use the bundled autoloader.
-
-```php
-include 'TextFormatter/src/autoloader.php';
-```
-
-### Via Git
-
-Clone this repository and use the bundled autoloader. Replace `php5.3` with the lowest version of PHP you want to support: `php5.3`, `php5.4`, `php5.5` or `php5.6`. All versions are functionally identical.
-
-```bash
-git clone https://github.com/s9e/TextFormatter.git -b release/php5.3
-```
-```php
-include 'TextFormatter/src/autoloader.php';
-```
diff --git a/docs/examples/00_quick.php b/docs/examples/00_quick.php
@@ -1,7 +1,7 @@
 <?php
 
-// Get the autoloader (unless you have already loaded Composer's)
-include __DIR__ . '/../../src/autoloader.php';
+// Get the autoloader
+include __DIR__ . '/../../vendor/autoload.php';
 
 // Use the Forum bundle. It supports BBCodes, emoticons and autolinking
 use s9e\TextFormatter\Bundles\Forum as TextFormatter;

diff --git a/docs/examples/01_verbose.php b/docs/examples/01_verbose.php
@@ -1,6 +1,6 @@
 <?php
 
-include __DIR__ . '/../../src/autoloader.php';
+include __DIR__ . '/../../vendor/autoload.php';
 
 $configurator = new s9e\TextFormatter\Configurator;
 

diff --git a/docs/examples/10_verbose_bbcode.php b/docs/examples/10_verbose_bbcode.php
@@ -1,6 +1,6 @@
 <?php
 
-include __DIR__ . '/../../src/autoloader.php';
+include __DIR__ . '/../../vendor/autoload.php';
 
 $configurator = new s9e\TextFormatter\Configurator;
 

diff --git a/docs/examples/80_benchmark.php b/docs/examples/80_benchmark.php
@@ -14,7 +14,7 @@
 
 */
 
-include __DIR__ . '/../../src/autoloader.php';
+include __DIR__ . '/../../vendor/autoload.php';
 
 use s9e\TextFormatter\Bundles\Forum as TextFormatter;
 

diff --git a/docs/examples/90_xss.php b/docs/examples/90_xss.php
@@ -1,6 +1,6 @@
 <?php
 
-include __DIR__ . '/../../src/autoloader.php';
+include __DIR__ . '/../../vendor/autoload.php';
 
 use s9e\TextFormatter\Bundles\Forum as TextFormatter;
 

diff --git a/docs/testdox.txt b/docs/testdox.txt
@@ -1,10 +1,3 @@
-autoloader
- [x] Can load s9e\TextFormatter\Configurator
- [x] Can load s9e\TextFormatter\Configurator\\Items\\Tag
- [x] Can load s9e\TextFormatter\Parser\Logger
- [x] Can load s9e\TextFormatter\Plugins\Emoticons\Parser
- [x] Does not attempt to load a class whose name contains dots
-
 s9e\TextFormatter\Tests\Configurator\Collections\Collection
  [x] Collection is countable
  [x] Collection is iterable with foreach

diff --git a/phpunit.xml b/phpunit.xml
@@ -22,8 +22,6 @@
 
 	<testsuites>
 		<testsuite name="TextFormatter">
-			<file>tests/autoloaderTest.php</file>
-
 			<!-- Test the base classes and traits first -->
 			<file>tests/Configurator/Collections/CollectionTest.php</file>
 			<file>tests/Configurator/Collections/NormalizedCollectionTest.php</file>

diff --git a/scripts/build/5.5.convert.php b/scripts/build/5.5.convert.php
@@ -128,6 +128,6 @@ function convertDir($dir)
 	}
 }
 
-include_once __DIR__ . '/../../src/autoloader.php';
+include_once __DIR__ . '/../../vendor/autoload.php';
 convertDir(realpath(__DIR__ . '/../../src'));
 echo "\n";
diff --git a/scripts/build/cacheJavaScriptFunctions.php b/scripts/build/cacheJavaScriptFunctions.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../../src/autoloader.php';
+include __DIR__ . '/../../vendor/autoload.php';
 
 $cache = array();
 foreach (glob(realpath(__DIR__ . '/../../src/Configurator/JavaScript/functions') . '/*.js') as $filepath)

diff --git a/scripts/build/cacheJavaScriptParsers.php b/scripts/build/cacheJavaScriptParsers.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../../src/autoloader.php';
+include __DIR__ . '/../../vendor/autoload.php';
 
 $configurator = new s9e\TextFormatter\Configurator;
 foreach (glob(realpath(__DIR__ . '/../../src/Plugins') . '/*', GLOB_ONLYDIR) as $dirpath)

diff --git a/scripts/build/coalesceConfiguratorFiles.php b/scripts/build/coalesceConfiguratorFiles.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../../src/autoloader.php';
+include __DIR__ . '/../../vendor/autoload.php';
 $configurator = new s9e\TextFormatter\Configurator;
 $tag = $configurator->tags->add('X');
 $tag->attributes->add('x')->filterChain->append('#url');

diff --git a/scripts/generateBundles.php b/scripts/generateBundles.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 $bundlesDir = __DIR__ . '/../src/Bundles';
 

diff --git a/scripts/generateFatdownDemo.php b/scripts/generateFatdownDemo.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 $configurator = s9e\TextFormatter\Configurator\Bundles\Fatdown::getConfigurator();
 $configurator->enableJavaScript();

diff --git a/scripts/generateLiveDemo.php b/scripts/generateLiveDemo.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 $configurator = new s9e\TextFormatter\Configurator;
 $configurator->enableJavaScript();

diff --git a/scripts/generateMediaEmbedTestPage.php b/scripts/generateMediaEmbedTestPage.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 $configurator = new s9e\TextFormatter\Configurator;
 $configurator->plugins->load('MediaEmbed', ['captureURLs' => false]);

diff --git a/scripts/patchBundledBBCodesCookbook.php b/scripts/patchBundledBBCodesCookbook.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 $dom = new DOMDocument;
 $dom->load(__DIR__ . '/../src/Plugins/BBCodes/Configurator/repository.xml');

diff --git a/scripts/patchCachedSiteDefinitionCollection.php b/scripts/patchCachedSiteDefinitionCollection.php
@@ -4,7 +4,7 @@
 use s9e\TextFormatter\Configurator\TemplateNormalizer;
 use s9e\TextFormatter\Plugins\MediaEmbed\Configurator\Collections\XmlFileDefinitionCollection;
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 function export(array $arr)
 {

diff --git a/scripts/patchCollectionProxies.php b/scripts/patchCollectionProxies.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 function getMethodAnnotations($className)
 {

diff --git a/scripts/patchDocs.php b/scripts/patchDocs.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 function patchDir($dirpath)
 {

diff --git a/scripts/patchExamples.php b/scripts/patchExamples.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 function patchDir($dirpath)
 {

diff --git a/scripts/patchLitedownSyntax.php b/scripts/patchLitedownSyntax.php
@@ -27,7 +27,7 @@ function ($m)
 	}
 }
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 $configurator = new s9e\TextFormatter\Configurator;
 $configurator->Litedown;
 extract($configurator->finalize());

diff --git a/scripts/patchMediaEmbedDoc.php b/scripts/patchMediaEmbedDoc.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 $html = [];
 $html[] = '<table>';

diff --git a/scripts/patchRegexpConvertor.php b/scripts/patchRegexpConvertor.php
@@ -2,7 +2,7 @@
 <?php
 
 use s9e\TextFormatter\Configurator\Helpers\RegexpBuilder;
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 $filepath = __DIR__ . '/../src/Configurator/JavaScript/RegexpConvertor.php';
 

diff --git a/scripts/patchTemplateHelper.php b/scripts/patchTemplateHelper.php
@@ -4,7 +4,7 @@
 use s9e\SimpleDOM\SimpleDOM;
 use s9e\TextFormatter\Configurator\Helpers\RegexpBuilder;
 
-include __DIR__ . '/../src/autoloader.php';
+include __DIR__ . '/../vendor/autoload.php';
 
 function loadPage($url, $filename = null)
 {

diff --git a/scripts/travis/installComposer.sh b/scripts/travis/installComposer.sh
@@ -1,10 +1,17 @@
 #!/bin/bash
 
-cd $(dirname $(dirname $(dirname "$0")))
+cd $(dirname "$0")
+cd ../..
+
+if [ "$TRAVIS_PHP_VERSION" = '5.3.3' ]
+then
+	composer config disable-tls true
+	composer config secure-http false
+fi
 
 if [ -n "$COVERAGE" ]
 then
 	composer require --no-interaction satooshi/php-coveralls
 fi
 
-composer install --no-interaction
+composer install --no-interaction --ignore-platform-reqs
diff --git a/scripts/travis/setup.sh b/scripts/travis/setup.sh
@@ -24,11 +24,11 @@ echo "Installing Closure Compiler"
 # The cache dir lets the MediaEmbed plugin cache scraped content
 mkdir ../../tests/.cache
 
+wait
+
 # Prepare the files as for a release branch
 ../build/prepareFiles.sh
 
-wait
-
 # Start a local webserver for the Http helper's tests
 if [ "$TRAVIS_PHP_VERSION" != '5.3.3' ]
 then

diff --git a/src/autoloader.php b/src/autoloader.php