Merge pull request #1 from CloCkWeRX/master

QA fixes & cleanup
pear · Nov 15, 2011 · 4eb620f · 4eb620f
2 parents 2080cae + 85e1cb0
commit 4eb620f
Show file tree

Hide file tree

Showing 36 changed files with 846 additions and 821 deletions.
diff --git a/Lite.php → Cache/Lite.php b/Lite.php → Cache/Lite.php
diff --git a/Lite/File.php → Cache/Lite/File.php b/Lite/File.php → Cache/Lite/File.php
diff --git a/Lite/Function.php → Cache/Lite/Function.php b/Lite/Function.php → Cache/Lite/Function.php
diff --git a/Lite/NestedOutput.php → Cache/Lite/NestedOutput.php b/Lite/NestedOutput.php → Cache/Lite/NestedOutput.php
diff --git a/Lite/Output.php → Cache/Lite/Output.php b/Lite/Output.php → Cache/Lite/Output.php
diff --git a/package.xml b/package.xml
diff --git a/package2.xml b/package2.xml
diff --git a/tests/Cache_Lite_File_classical.phpt b/tests/Cache_Lite_File_classical.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite_File (classical)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_file_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_file_base.inc';
 
 $master = tmpDir() . '/' . 'foobar.masterfile';
 $options = array(

diff --git a/tests/Cache_Lite_Function_classical.phpt b/tests/Cache_Lite_Function_classical.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite_Function (classical)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_function_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_function_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/Cache_Lite_Function_dontcache.phpt b/tests/Cache_Lite_Function_dontcache.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite_Function (dont cache)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_function_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_function_base.inc';
 
 // Classical
 $options = array(

diff --git a/tests/Cache_Lite_Function_drop.phpt b/tests/Cache_Lite_Function_drop.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite_Function (drop() method)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_function_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_function_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/Cache_Lite_Output_classical.phpt b/tests/Cache_Lite_Output_classical.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite_Output (classical)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_output_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_output_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/Cache_Lite_automaticCleaning.phpt b/tests/Cache_Lite_automaticCleaning.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite (automaticCleaning)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/Cache_Lite_classical.phpt b/tests/Cache_Lite_classical.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite (classical)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/Cache_Lite_error.phpt b/tests/Cache_Lite_error.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite (error)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '31451992gjhgjh'. '/', # I hope there will be no directory with that silly name

diff --git a/tests/Cache_Lite_error2.phpt b/tests/Cache_Lite_error2.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite (error2)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '31451992gjhgjh'. '/', # I hope there will be no directory with that silly name

diff --git a/tests/Cache_Lite_error3.phpt b/tests/Cache_Lite_error3.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite (error3)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '31451992gjhgjh'. '/', # I hope there will be no directory with that silly name

diff --git a/tests/Cache_Lite_eternal.phpt b/tests/Cache_Lite_eternal.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite (eternal)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/Cache_Lite_fatest.phpt b/tests/Cache_Lite_fatest.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite (fatest, no control, no lock)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/Cache_Lite_hashed.phpt b/tests/Cache_Lite_hashed.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite (hashed level 2)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/Cache_Lite_lifetime.phpt b/tests/Cache_Lite_lifetime.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite (lifetime)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/Cache_Lite_memorycache.phpt b/tests/Cache_Lite_memorycache.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite (memory cache on)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/Cache_Lite_serialization.phpt b/tests/Cache_Lite_serialization.phpt
@@ -3,9 +3,9 @@ Cache_Lite::Cache_Lite (automatic serialization on)
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/NestedOutputTest.php b/tests/NestedOutputTest.php
@@ -9,7 +9,7 @@
  * @author Markus Tacker <tacker@php.net>
  */
 
-require_once '../Lite/NestedOutput.php';
+require_once 'Cache/Lite/NestedOutput.php';
 
 class NestedOutputTest extends PHPUnit_Framework_TestCase
 {

diff --git a/tests/bench.php b/tests/bench.php
@@ -3,7 +3,7 @@
 // Bench script of Cache_Lite
 // $Id$
 
-require_once('Cache/Lite.php');
+require_once 'Cache/Lite.php';
 
 $options = array(
     'caching' => true,

diff --git a/tests/bench2.php b/tests/bench2.php
@@ -3,7 +3,7 @@
 // Bench script of Cache_Lite_Output
 // $Id$
 
-require_once('Cache/Lite/Output.php');
+require_once 'Cache/Lite/Output.php';
 
 $options = array(
     'caching' => true,

diff --git a/tests/bench3.php b/tests/bench3.php
@@ -3,7 +3,7 @@
 // Bench script of Cache_Lite_Function
 // $Id$
 
-require_once('Cache/Lite/Function.php');
+require_once 'Cache/Lite/Function.php';
 
 $options = array(
     'caching' => true,
@@ -24,7 +24,7 @@
 $data = $cache->call('bench::static_method_to_bench', 23, 66);
 echo($data);
 
-function function_to_bench($arg1, $arg2) 
+function function_to_bench($arg1, $arg2)
 {
     for($i=0;$i<10000;$i++) {
         $tmp = md5(md5(md5('Loosing time...')));
@@ -43,10 +43,10 @@ function method_to_bench($arg1, $arg2)
             $tmp = md5(md5(md5('Loosing time...')));
         }
         echo "\$obj->test = $this->test and this is the output of the method \$obj->method_to_bench($arg1, $arg2) !<br>";
-        return "\$obj->test = $this->test and this is the result of the method \$obj->method_to_bench($arg1, $arg2) !<br>";        
+        return "\$obj->test = $this->test and this is the result of the method \$obj->method_to_bench($arg1, $arg2) !<br>";
     }
-    
-    function static_method_to_bench($arg1, $arg2) 
+
+    function static_method_to_bench($arg1, $arg2)
     {
         for($i=0;$i<10000;$i++) {
             $tmp = md5(md5(md5('Loosing time...')));

diff --git a/tests/cache_lite_base.inc b/tests/cache_lite_base.inc
@@ -1,6 +1,3 @@
 <?php
-
-error_reporting(E_ALL);
 require_once('Cache/Lite.php');
-
 ?>
diff --git a/tests/cache_lite_file_base.inc b/tests/cache_lite_file_base.inc
@@ -1,6 +1,3 @@
 <?php
-
-error_reporting(E_ALL);
 require_once('Cache/Lite/File.php');
-
 ?>
diff --git a/tests/cache_lite_function_base.inc b/tests/cache_lite_function_base.inc
@@ -1,6 +1,3 @@
 <?php
-
-error_reporting(E_ALL);
 require_once('Cache/Lite/Function.php');
-
 ?>
diff --git a/tests/cache_lite_output_base.inc b/tests/cache_lite_output_base.inc
@@ -1,6 +1,3 @@
 <?php
-
-error_reporting(E_ALL);
-require_once('Cache/Lite/Output.php');
-
+require_once 'Cache/Lite/Output.php';
 ?>
diff --git a/tests/pearbug13693.phpt b/tests/pearbug13693.phpt
@@ -2,29 +2,28 @@
 pearbug13693
 --FILE--
 <?php
+require_once 'Cache/Lite.php';
 
-    require_once 'Cache/Lite.php';
-
-    // Create temp dir
-    $dir = dirname( __FILE__ ) . '/' . uniqid();
-    mkdir( $dir );
-
-    $options = array(
-        'cacheDir' => $dir,
-        'lifeTime' => 60,
-    );
-    $id = '#13693';
-    $cache = new Cache_Lite($options);
-    $cache->save('stuff', $id);
-    // Must be true
-    echo ( $cache->remove($id) === true ) ? "OK\n" : "ERROR\n";
-    // Will return a PEAR Error
-    echo ( $cache->remove($id) instanceof PEAR_Error ) ? "OK\n" : "ERROR\n";
-    // Will return true
-    echo ( $cache->remove($id, 'default', true) === true ) ? "OK\n" : "ERROR\n";
-
-    // Remove temp dir
-    rmdir( $dir );
+// Create temp dir
+$dir = dirname( __FILE__ ) . '/' . uniqid();
+mkdir($dir);
+
+$options = array(
+'cacheDir' => $dir,
+'lifeTime' => 60,
+);
+$id = '#13693';
+$cache = new Cache_Lite($options);
+$cache->save('stuff', $id);
+// Must be true
+echo $cache->remove($id) === true ? "OK\n" : "ERROR\n";
+// Will return a PEAR Error
+echo $cache->remove($id) instanceof PEAR_Error ? "OK\n" : "ERROR\n";
+// Will return true
+echo $cache->remove($id, 'default', true) === true ? "OK\n" : "ERROR\n";
+
+// Remove temp dir
+rmdir($dir);
 --EXPECT--
 OK
 OK

diff --git a/tests/pearbug18192.php b/tests/pearbug18192.php
@@ -2,16 +2,16 @@
 
 /**
  * Process for test pearbug18192
- * 
+ *
  * @see https://pear.php.net/bugs/bug.php?id=18192
  * @author Markus Tacker <tacker@php.net>
  */
 
-require_once 'Cache/Lite.php'; 
-$c = new Cache_Lite(array('cacheDir' => '.', 'lifeTime' => 60,)); 
-$id = '#18192'; 
+require_once 'Cache/Lite.php';
+$c = new Cache_Lite(array('cacheDir' => '.', 'lifeTime' => 60));
+$id = '#18192';
 for ($i = 0; $i < 100000; $i++) {
-	$str = uniqid('some-string', true); 
+	$str = uniqid('some-string', true);
 	if (!$c->save($str, $id)) fputs(STDERR, "Error saving.\n");
 	if ($c->get($id) !== $str) fputs(STDERR, "Wrong data.\n");
 }
diff --git a/tests/pearbug513.phpt b/tests/pearbug513.phpt
@@ -3,9 +3,9 @@ pearbug513
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',

diff --git a/tests/pearbug7618.phpt b/tests/pearbug7618.phpt
@@ -3,9 +3,9 @@ pearbug7618
 --FILE--
 <?php
 
-require_once('callcache.inc');
-require_once('tmpdir.inc');
-require_once('cache_lite_base.inc');
+require_once 'callcache.inc';
+require_once 'tmpdir.inc';
+require_once 'cache_lite_base.inc';
 
 $options = array(
     'cacheDir' => tmpDir() . '/',