Move class files into library/

All SimplePie classes now live in library/ except for the autoloader, which is now in autoloader.php Apologies if any of your scripts break because of this, however it brings a much nicer separation and cleans up the root directory somewhat.
angrybrad · Jul 5, 2012 · 26d3597 · 26d3597
1 parent ce9ac85
commit 26d3597
Show file tree

Hide file tree

Showing 38 changed files with 6 additions and 6 deletions.
diff --git a/SimplePieAutoloader.php → autoloader.php b/SimplePieAutoloader.php → autoloader.php
@@ -64,7 +64,7 @@ class SimplePie_Autoloader
 	 */
 	public function __construct()
 	{
-		$this->path = dirname(__FILE__);
+		$this->path = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'library';
 	}
 
 	/**

diff --git a/build/charset.php b/build/charset.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../SimplePieAutoloader.php';
+require_once '../autoloader.php';
 
 function normalize_character_set($charset)
 {

diff --git a/demo/cli_test.php b/demo/cli_test.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-include_once('../SimplePieAutoloader.php');
+include_once('../autoloader.php');
 
 // Parse it
 $feed = new SimplePie();

diff --git a/demo/index.php b/demo/index.php
@@ -5,7 +5,7 @@
 
 // Include SimplePie
 // Located in the parent directory
-include_once('../SimplePieAutoloader.php');
+include_once('../autoloader.php');
 include_once('../idn/idna_convert.class.php');
 
 // Create a new instance of the SimplePie object

diff --git a/demo/test.php b/demo/test.php
@@ -1,5 +1,5 @@
 <?php
-include_once('../SimplePieAutoloader.php');
+include_once('../autoloader.php');
 include_once('../idn/idna_convert.class.php');
 
 // Parse it

diff --git a/SimplePie.php → library/SimplePie.php b/SimplePie.php → library/SimplePie.php
diff --git a/SimplePie/Author.php → library/SimplePie/Author.php b/SimplePie/Author.php → library/SimplePie/Author.php
diff --git a/SimplePie/Cache.php → library/SimplePie/Cache.php b/SimplePie/Cache.php → library/SimplePie/Cache.php
diff --git a/SimplePie/Cache/Base.php → library/SimplePie/Cache/Base.php b/SimplePie/Cache/Base.php → library/SimplePie/Cache/Base.php
diff --git a/SimplePie/Cache/DB.php → library/SimplePie/Cache/DB.php b/SimplePie/Cache/DB.php → library/SimplePie/Cache/DB.php
diff --git a/SimplePie/Cache/File.php → library/SimplePie/Cache/File.php b/SimplePie/Cache/File.php → library/SimplePie/Cache/File.php
diff --git a/SimplePie/Cache/Memcache.php → library/SimplePie/Cache/Memcache.php b/SimplePie/Cache/Memcache.php → library/SimplePie/Cache/Memcache.php
diff --git a/SimplePie/Cache/MySQL.php → library/SimplePie/Cache/MySQL.php b/SimplePie/Cache/MySQL.php → library/SimplePie/Cache/MySQL.php
diff --git a/SimplePie/Caption.php → library/SimplePie/Caption.php b/SimplePie/Caption.php → library/SimplePie/Caption.php
diff --git a/SimplePie/Category.php → library/SimplePie/Category.php b/SimplePie/Category.php → library/SimplePie/Category.php
diff --git a/SimplePie/Content/Type/Sniffer.php → library/SimplePie/Content/Type/Sniffer.php b/SimplePie/Content/Type/Sniffer.php → library/SimplePie/Content/Type/Sniffer.php
diff --git a/SimplePie/Copyright.php → library/SimplePie/Copyright.php b/SimplePie/Copyright.php → library/SimplePie/Copyright.php
diff --git a/SimplePie/Core.php → library/SimplePie/Core.php b/SimplePie/Core.php → library/SimplePie/Core.php
diff --git a/SimplePie/Credit.php → library/SimplePie/Credit.php b/SimplePie/Credit.php → library/SimplePie/Credit.php
diff --git a/SimplePie/Decode/HTML/Entities.php → library/SimplePie/Decode/HTML/Entities.php b/SimplePie/Decode/HTML/Entities.php → library/SimplePie/Decode/HTML/Entities.php
diff --git a/SimplePie/Enclosure.php → library/SimplePie/Enclosure.php b/SimplePie/Enclosure.php → library/SimplePie/Enclosure.php
diff --git a/SimplePie/File.php → library/SimplePie/File.php b/SimplePie/File.php → library/SimplePie/File.php
diff --git a/SimplePie/HTTP/Parser.php → library/SimplePie/HTTP/Parser.php b/SimplePie/HTTP/Parser.php → library/SimplePie/HTTP/Parser.php
diff --git a/SimplePie/IRI.php → library/SimplePie/IRI.php b/SimplePie/IRI.php → library/SimplePie/IRI.php
diff --git a/SimplePie/Item.php → library/SimplePie/Item.php b/SimplePie/Item.php → library/SimplePie/Item.php
diff --git a/SimplePie/Locator.php → library/SimplePie/Locator.php b/SimplePie/Locator.php → library/SimplePie/Locator.php
diff --git a/SimplePie/Misc.php → library/SimplePie/Misc.php b/SimplePie/Misc.php → library/SimplePie/Misc.php
diff --git a/SimplePie/Net/IPv6.php → library/SimplePie/Net/IPv6.php b/SimplePie/Net/IPv6.php → library/SimplePie/Net/IPv6.php
diff --git a/SimplePie/Parse/Date.php → library/SimplePie/Parse/Date.php b/SimplePie/Parse/Date.php → library/SimplePie/Parse/Date.php
diff --git a/SimplePie/Parser.php → library/SimplePie/Parser.php b/SimplePie/Parser.php → library/SimplePie/Parser.php
diff --git a/SimplePie/Rating.php → library/SimplePie/Rating.php b/SimplePie/Rating.php → library/SimplePie/Rating.php
diff --git a/SimplePie/Registry.php → library/SimplePie/Registry.php b/SimplePie/Registry.php → library/SimplePie/Registry.php
diff --git a/SimplePie/Restriction.php → library/SimplePie/Restriction.php b/SimplePie/Restriction.php → library/SimplePie/Restriction.php
diff --git a/SimplePie/Sanitize.php → library/SimplePie/Sanitize.php b/SimplePie/Sanitize.php → library/SimplePie/Sanitize.php
diff --git a/SimplePie/Source.php → library/SimplePie/Source.php b/SimplePie/Source.php → library/SimplePie/Source.php
diff --git a/SimplePie/XML/Declaration/Parser.php → library/SimplePie/XML/Declaration/Parser.php b/SimplePie/XML/Declaration/Parser.php → library/SimplePie/XML/Declaration/Parser.php
diff --git a/SimplePie/gzdecode.php → library/SimplePie/gzdecode.php b/SimplePie/gzdecode.php → library/SimplePie/gzdecode.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,3 +1,3 @@
 <?php
 
-require_once dirname(dirname(__FILE__)) . '/SimplePieAutoloader.php';
+require_once dirname(dirname(__FILE__)) . '/autoloader.php';
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ class SimplePie_Autoloader @@
     	 */
     	public function __construct()
     	{
-    		$this->path = dirname(__FILE__);
+    		$this->path = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'library';
     	}
     	/**
@@ Expand Down @@