Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Change namespace from pear2 to PEAR2, as approved by the PEAR Group.

  • Loading branch information...
commit 0355f9c0c9a6d06bd6c5caeedc16a7624ba40048 1 parent b6e65db
@saltybeagle saltybeagle authored
Showing with 77 additions and 77 deletions.
  1. +1 −1  examples/baseball/index.php
  2. +1 −1  examples/basic.php
  3. +8 −8 extrasetup.php
  4. +1 −1  package.xml
  5. +28 −28 package_compatible.xml
  6. +1 −1  src/Templates/Savant/BadMethodCallException.php
  7. +1 −1  src/Templates/Savant/BasicFastCompiler.php
  8. +2 −2 src/Templates/Savant/ClassToTemplateMapper.php
  9. +1 −1  src/Templates/Savant/CompilerException.php
  10. +1 −1  src/Templates/Savant/CompilerInterface.php
  11. +1 −1  src/Templates/Savant/Exception.php
  12. +1 −1  src/Templates/Savant/FastCompilerInterface.php
  13. +1 −1  src/Templates/Savant/FilterAbstract.php
  14. +5 −5 src/Templates/Savant/Main.php
  15. +1 −1  src/Templates/Savant/MapperInterface.php
  16. +3 −3 src/Templates/Savant/ObjectProxy.php
  17. +2 −2 src/Templates/Savant/ObjectProxy/ArrayAccess.php
  18. +2 −2 src/Templates/Savant/ObjectProxy/Traversable.php
  19. +1 −1  src/Templates/Savant/TemplateException.php
  20. +1 −1  src/Templates/Savant/UnexpectedValueException.php
  21. +1 −1  stub.php
  22. +2 −2 tests/escape/object.phpt
  23. +2 −2 tests/escape/string.phpt
  24. +2 −2 tests/render/array.phpt
  25. +3 −3 tests/render/fastcompile.phpt
  26. +2 −2 tests/render/object.phpt
  27. +2 −2 tests/render/string.phpt
View
2  examples/baseball/index.php
@@ -49,6 +49,6 @@ function __construct($start, $end = null)
$team = new BaseballTeam();
$team->name = 'Phillies';
-$savant = new pear2\Templates\Savant\Main();
+$savant = new PEAR2\Templates\Savant\Main();
$savant->setEscape('htmlspecialchars');
echo $savant->render($team);
View
2  examples/basic.php
@@ -7,7 +7,7 @@
$class = new stdClass();
$class->var1 = '<p>This is var1 inside a standard class</p>';
-$savant = new \pear2\Templates\Savant\Main();
+$savant = new \PEAR2\Templates\Savant\Main();
$savant->addTemplatePath(__DIR__ . '/templates');
// Display a simple string
View
16 extrasetup.php
@@ -6,17 +6,17 @@
* for example:
if (basename(__DIR__) == 'trunk') {
$extrafiles = array(
- new \pear2\Pyrus\Package(__DIR__ . '/../../HTTP_Request/trunk/package.xml'),
- new \pear2\Pyrus\Package(__DIR__ . '/../../sandbox/Console_CommandLine/trunk/package.xml'),
- new \pear2\Pyrus\Package(__DIR__ . '/../../MultiErrors/trunk/package.xml'),
- new \pear2\Pyrus\Package(__DIR__ . '/../../Exception/trunk/package.xml'),
+ new \PEAR2\Pyrus\Package(__DIR__ . '/../../HTTP_Request/trunk/package.xml'),
+ new \PEAR2\Pyrus\Package(__DIR__ . '/../../sandbox/Console_CommandLine/trunk/package.xml'),
+ new \PEAR2\Pyrus\Package(__DIR__ . '/../../MultiErrors/trunk/package.xml'),
+ new \PEAR2\Pyrus\Package(__DIR__ . '/../../Exception/trunk/package.xml'),
);
} else {
$extrafiles = array(
- new \pear2\Pyrus\Package(__DIR__ . '/../HTTP_Request/package.xml'),
- new \pear2\Pyrus\Package(__DIR__ . '/../sandbox/Console_CommandLine/package.xml'),
- new \pear2\Pyrus\Package(__DIR__ . '/../MultiErrors/package.xml'),
- new \pear2\Pyrus\Package(__DIR__ . '/../Exception/package.xml'),
+ new \PEAR2\Pyrus\Package(__DIR__ . '/../HTTP_Request/package.xml'),
+ new \PEAR2\Pyrus\Package(__DIR__ . '/../sandbox/Console_CommandLine/package.xml'),
+ new \PEAR2\Pyrus\Package(__DIR__ . '/../MultiErrors/package.xml'),
+ new \PEAR2\Pyrus\Package(__DIR__ . '/../Exception/package.xml'),
);
}
*/
View
2  package.xml
@@ -54,7 +54,7 @@ Package PEAR2_Templates_Savant API release notes for version 0.1.0.</notes>
</dir>
<file role="doc" name="basic.php"/>
</dir>
- <dir name="src" baseinstalldir="pear2">
+ <dir name="src" baseinstalldir="PEAR2">
<dir name="Templates">
<dir name="Savant">
<dir name="ObjectProxy">
View
56 package_compatible.xml
@@ -51,20 +51,20 @@ Package PEAR2_Templates_Savant API release notes for version 0.1.0.</notes>
<file role="test" name="test/PEAR2_Templates_Savant/pear2.php.net/escape/escape/object.phpt"/>
<file role="test" name="test/PEAR2_Templates_Savant/pear2.php.net/escape/escape/Foo.tpl.php"/>
<file role="test" name="test/PEAR2_Templates_Savant/pear2.php.net/escape/escape/echostring.tpl.php"/>
- <file role="php" name="php/pear2/Templates/Savant/UnexpectedValueException.php"/>
- <file role="php" name="php/pear2/Templates/Savant/TemplateException.php"/>
- <file role="php" name="php/pear2/Templates/Savant/ObjectProxy/Traversable.php"/>
- <file role="php" name="php/pear2/Templates/Savant/ObjectProxy/ArrayAccess.php"/>
- <file role="php" name="php/pear2/Templates/Savant/ObjectProxy.php"/>
- <file role="php" name="php/pear2/Templates/Savant/MapperInterface.php"/>
- <file role="php" name="php/pear2/Templates/Savant/Main.php"/>
- <file role="php" name="php/pear2/Templates/Savant/FilterAbstract.php"/>
- <file role="php" name="php/pear2/Templates/Savant/FastCompilerInterface.php"/>
- <file role="php" name="php/pear2/Templates/Savant/Exception.php"/>
- <file role="php" name="php/pear2/Templates/Savant/CompilerInterface.php"/>
- <file role="php" name="php/pear2/Templates/Savant/CompilerException.php"/>
- <file role="php" name="php/pear2/Templates/Savant/ClassToTemplateMapper.php"/>
- <file role="php" name="php/pear2/Templates/Savant/BasicFastCompiler.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/UnexpectedValueException.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/TemplateException.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/ObjectProxy/Traversable.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/ObjectProxy/ArrayAccess.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/ObjectProxy.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/MapperInterface.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/Main.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/FilterAbstract.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/FastCompilerInterface.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/Exception.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/CompilerInterface.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/CompilerException.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/ClassToTemplateMapper.php"/>
+ <file role="php" name="php/PEAR2/Templates/Savant/BasicFastCompiler.php"/>
<file role="doc" name="doc/PEAR2_Templates_Savant/pear2.php.net/examples/templates/examples/templates/StringView.tpl.php"/>
<file role="doc" name="doc/PEAR2_Templates_Savant/pear2.php.net/examples/templates/examples/templates/stdClass.tpl.php"/>
<file role="doc" name="doc/PEAR2_Templates_Savant/pear2.php.net/examples/templates/examples/templates/MyTemplate.tpl.php"/>
@@ -97,20 +97,20 @@ Package PEAR2_Templates_Savant API release notes for version 0.1.0.</notes>
<install name="doc/PEAR2_Templates_Savant/pear2.php.net/examples/templates/examples/templates/MyTemplate.tpl.php" as="pear2.php.net/examples/templates/examples/templates/MyTemplate.tpl.php"/>
<install name="doc/PEAR2_Templates_Savant/pear2.php.net/examples/templates/examples/templates/stdClass.tpl.php" as="pear2.php.net/examples/templates/examples/templates/stdClass.tpl.php"/>
<install name="doc/PEAR2_Templates_Savant/pear2.php.net/examples/templates/examples/templates/StringView.tpl.php" as="pear2.php.net/examples/templates/examples/templates/StringView.tpl.php"/>
- <install name="php/pear2/Templates/Savant/BasicFastCompiler.php" as="pear2/Templates/Savant/BasicFastCompiler.php"/>
- <install name="php/pear2/Templates/Savant/ClassToTemplateMapper.php" as="pear2/Templates/Savant/ClassToTemplateMapper.php"/>
- <install name="php/pear2/Templates/Savant/CompilerException.php" as="pear2/Templates/Savant/CompilerException.php"/>
- <install name="php/pear2/Templates/Savant/CompilerInterface.php" as="pear2/Templates/Savant/CompilerInterface.php"/>
- <install name="php/pear2/Templates/Savant/Exception.php" as="pear2/Templates/Savant/Exception.php"/>
- <install name="php/pear2/Templates/Savant/FastCompilerInterface.php" as="pear2/Templates/Savant/FastCompilerInterface.php"/>
- <install name="php/pear2/Templates/Savant/FilterAbstract.php" as="pear2/Templates/Savant/FilterAbstract.php"/>
- <install name="php/pear2/Templates/Savant/Main.php" as="pear2/Templates/Savant/Main.php"/>
- <install name="php/pear2/Templates/Savant/MapperInterface.php" as="pear2/Templates/Savant/MapperInterface.php"/>
- <install name="php/pear2/Templates/Savant/ObjectProxy.php" as="pear2/Templates/Savant/ObjectProxy.php"/>
- <install name="php/pear2/Templates/Savant/ObjectProxy/ArrayAccess.php" as="pear2/Templates/Savant/ObjectProxy/ArrayAccess.php"/>
- <install name="php/pear2/Templates/Savant/ObjectProxy/Traversable.php" as="pear2/Templates/Savant/ObjectProxy/Traversable.php"/>
- <install name="php/pear2/Templates/Savant/TemplateException.php" as="pear2/Templates/Savant/TemplateException.php"/>
- <install name="php/pear2/Templates/Savant/UnexpectedValueException.php" as="pear2/Templates/Savant/UnexpectedValueException.php"/>
+ <install name="php/PEAR2/Templates/Savant/BasicFastCompiler.php" as="PEAR2/Templates/Savant/BasicFastCompiler.php"/>
+ <install name="php/PEAR2/Templates/Savant/ClassToTemplateMapper.php" as="PEAR2/Templates/Savant/ClassToTemplateMapper.php"/>
+ <install name="php/PEAR2/Templates/Savant/CompilerException.php" as="PEAR2/Templates/Savant/CompilerException.php"/>
+ <install name="php/PEAR2/Templates/Savant/CompilerInterface.php" as="PEAR2/Templates/Savant/CompilerInterface.php"/>
+ <install name="php/PEAR2/Templates/Savant/Exception.php" as="PEAR2/Templates/Savant/Exception.php"/>
+ <install name="php/PEAR2/Templates/Savant/FastCompilerInterface.php" as="PEAR2/Templates/Savant/FastCompilerInterface.php"/>
+ <install name="php/PEAR2/Templates/Savant/FilterAbstract.php" as="PEAR2/Templates/Savant/FilterAbstract.php"/>
+ <install name="php/PEAR2/Templates/Savant/Main.php" as="PEAR2/Templates/Savant/Main.php"/>
+ <install name="php/PEAR2/Templates/Savant/MapperInterface.php" as="PEAR2/Templates/Savant/MapperInterface.php"/>
+ <install name="php/PEAR2/Templates/Savant/ObjectProxy.php" as="PEAR2/Templates/Savant/ObjectProxy.php"/>
+ <install name="php/PEAR2/Templates/Savant/ObjectProxy/ArrayAccess.php" as="PEAR2/Templates/Savant/ObjectProxy/ArrayAccess.php"/>
+ <install name="php/PEAR2/Templates/Savant/ObjectProxy/Traversable.php" as="PEAR2/Templates/Savant/ObjectProxy/Traversable.php"/>
+ <install name="php/PEAR2/Templates/Savant/TemplateException.php" as="PEAR2/Templates/Savant/TemplateException.php"/>
+ <install name="php/PEAR2/Templates/Savant/UnexpectedValueException.php" as="PEAR2/Templates/Savant/UnexpectedValueException.php"/>
<install name="test/PEAR2_Templates_Savant/pear2.php.net/escape/escape/echostring.tpl.php" as="pear2.php.net/escape/escape/echostring.tpl.php"/>
<install name="test/PEAR2_Templates_Savant/pear2.php.net/escape/escape/Foo.tpl.php" as="pear2.php.net/escape/escape/Foo.tpl.php"/>
<install name="test/PEAR2_Templates_Savant/pear2.php.net/escape/escape/object.phpt" as="pear2.php.net/escape/escape/object.phpt"/>
View
2  src/Templates/Savant/BadMethodCallException.php
@@ -1,5 +1,5 @@
<?php
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
class BadMethodCallException extends \BadMethodCallException implements Exception
{
View
2  src/Templates/Savant/BasicFastCompiler.php
@@ -1,6 +1,6 @@
<?php
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
class BasicFastCompiler implements FastCompilerInterface
{
View
4 src/Templates/Savant/ClassToTemplateMapper.php
@@ -1,6 +1,6 @@
<?php
/**
- * pear2\Templates\Savant\ClassToTemplateMapper
+ * PEAR2\Templates\Savant\ClassToTemplateMapper
*
* PHP version 5
*
@@ -26,7 +26,7 @@
* @license http://www.opensource.org/licenses/bsd-license.php New BSD License
* @link http://svn.php.net/repository/pear2/PEAR2_Templates_Savant
*/
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
class ClassToTemplateMapper implements MapperInterface
{
/**
View
2  src/Templates/Savant/CompilerException.php
@@ -1,5 +1,5 @@
<?php
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
class CompilerException extends \Exception implements Exception {}
?>
View
2  src/Templates/Savant/CompilerInterface.php
@@ -1,6 +1,6 @@
<?php
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
interface CompilerInterface
{
View
2  src/Templates/Savant/Exception.php
@@ -1,5 +1,5 @@
<?php
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
interface Exception
{
View
2  src/Templates/Savant/FastCompilerInterface.php
@@ -1,6 +1,6 @@
<?php
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
interface FastCompilerInterface extends CompilerInterface
{
View
2  src/Templates/Savant/FilterAbstract.php
@@ -26,7 +26,7 @@
* @author Paul M. Jones <pmjones@ciaweb.net>
*
*/
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
abstract class FilterAbstract
{
View
10 src/Templates/Savant/Main.php
@@ -1,6 +1,6 @@
<?php
/**
- * pear2\Templates\Savant\Main
+ * PEAR2\Templates\Savant\Main
*
* PHP version 5
*
@@ -23,7 +23,7 @@
* @license http://www.opensource.org/licenses/bsd-license.php New BSD License
* @link http://svn.php.net/repository/pear2/PEAR2_Templates_Savant
*/
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
class Main
{
/**
@@ -119,7 +119,7 @@ class Main
* @param array $config An associative array of configuration keys for
* the Main object. Any, or none, of the keys may be set.
*
- * @return pear2\Templates\Savant\Main A pear2\Templates\Savant\Main instance.
+ * @return PEAR2\Templates\Savant\Main A PEAR2\Templates\Savant\Main instance.
*
*/
@@ -726,8 +726,8 @@ protected function fetch($mixed, $template = null)
*
* @return string The full path to the compiled template script.
*
- * @throws pear2\Templates\Savant\UnexpectedValueException
- * @throws pear2\Templates\Savant\Exception
+ * @throws PEAR2\Templates\Savant\UnexpectedValueException
+ * @throws PEAR2\Templates\Savant\Exception
*
*/
View
2  src/Templates/Savant/MapperInterface.php
@@ -1,6 +1,6 @@
<?php
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
interface MapperInterface
{
View
6 src/Templates/Savant/ObjectProxy.php
@@ -1,6 +1,6 @@
<?php
/**
- * pear2\Templates\Savant\ObjectProxy
+ * PEAR2\Templates\Savant\ObjectProxy
*
* PHP version 5
*
@@ -27,7 +27,7 @@
* @license http://www.opensource.org/licenses/bsd-license.php New BSD License
* @link http://svn.php.net/repository/pear2/PEAR2_Templates_Savant
*/
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
class ObjectProxy implements \Countable
{
/**
@@ -40,7 +40,7 @@ class ObjectProxy implements \Countable
/**
* The savant templating system
*
- * @var pear2\Templates\Savant\Main
+ * @var PEAR2\Templates\Savant\Main
*/
protected $savant;
View
4 src/Templates/Savant/ObjectProxy/ArrayAccess.php
@@ -1,6 +1,6 @@
<?php
-namespace pear2\Templates\Savant\ObjectProxy;
-use pear2\Templates\Savant\ObjectProxy;
+namespace PEAR2\Templates\Savant\ObjectProxy;
+use PEAR2\Templates\Savant\ObjectProxy;
class ArrayAccess extends ObjectProxy implements \ArrayAccess
{
function offsetExists($offset)
View
4 src/Templates/Savant/ObjectProxy/Traversable.php
@@ -1,6 +1,6 @@
<?php
-namespace pear2\Templates\Savant\ObjectProxy;
-use pear2\Templates\Savant\ObjectProxy;
+namespace PEAR2\Templates\Savant\ObjectProxy;
+use PEAR2\Templates\Savant\ObjectProxy;
class Traversable extends ObjectProxy implements \Iterator
{
View
2  src/Templates/Savant/TemplateException.php
@@ -1,5 +1,5 @@
<?php
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
class TemplateException extends \Exception implements Exception {}
?>
View
2  src/Templates/Savant/UnexpectedValueException.php
@@ -1,5 +1,5 @@
<?php
-namespace pear2\Templates\Savant;
+namespace PEAR2\Templates\Savant;
class UnexpectedValueException extends \UnexpectedValueException implements Exception
{
View
2  stub.php
@@ -44,7 +44,7 @@ function PEAR2_Templates_Savant_autoload($class)
// your package-specific stuff here, for instance, here is what Pyrus does:
/**
- * $frontend = new \pear2\Pyrus\ScriptFrontend\Commands;
+ * $frontend = new \PEAR2\Pyrus\ScriptFrontend\Commands;
* @array_shift($_SERVER['argv']);
* $frontend->run($_SERVER['argv']);
*/
View
4 tests/escape/object.phpt
@@ -1,10 +1,10 @@
--TEST--
-\pear2\Templates\Savant\Main::addEscaoe() object variable escaping test
+\PEAR2\Templates\Savant\Main::addEscaoe() object variable escaping test
--FILE--
<?php
require dirname(__FILE__) . '/../test_framework.php.inc';
chdir(__DIR__);
-$savant = new \pear2\Templates\Savant\Main();
+$savant = new \PEAR2\Templates\Savant\Main();
$savant->setEscape('htmlspecialchars');
class Foo
View
4 tests/escape/string.phpt
@@ -1,10 +1,10 @@
--TEST--
-\pear2\Templates\Savant\Main::render() string with addEscape() test
+\PEAR2\Templates\Savant\Main::render() string with addEscape() test
--FILE--
<?php
require dirname(__FILE__) . '/../test_framework.php.inc';
chdir(__DIR__);
-$savant = new \pear2\Templates\Savant\Main();
+$savant = new \PEAR2\Templates\Savant\Main();
$savant->setEscape('htmlspecialchars');
$string = 'test';
View
4 tests/render/array.phpt
@@ -1,10 +1,10 @@
--TEST--
-\pear2\Templates\Savant\Main::render() array test
+\PEAR2\Templates\Savant\Main::render() array test
--FILE--
<?php
require dirname(__FILE__) . '/../test_framework.php.inc';
chdir(__DIR__);
-$savant = new \pear2\Templates\Savant\Main();
+$savant = new \PEAR2\Templates\Savant\Main();
$array = array(1,2,3);
$test->assertEquals('123', $savant->render($array), 'render array');
View
6 tests/render/fastcompile.phpt
@@ -1,10 +1,10 @@
--TEST--
-\pear2\Templates\Savant\Main::render() fast compiler test
+\PEAR2\Templates\Savant\Main::render() fast compiler test
--FILE--
<?php
require dirname(__FILE__) . '/../test_framework.php.inc';
chdir(__DIR__);
-$savant = new \pear2\Templates\Savant\Main();
+$savant = new \PEAR2\Templates\Savant\Main();
class Foo
{
@@ -20,7 +20,7 @@ $object->var1 = ' is my class';
$savant->setEscape();
mkdir(__DIR__ . '/compiled');
-$compiler = new pear2\Templates\Savant\BasicFastCompiler(__DIR__ . DIRECTORY_SEPARATOR . 'compiled');
+$compiler = new PEAR2\Templates\Savant\BasicFastCompiler(__DIR__ . DIRECTORY_SEPARATOR . 'compiled');
$savant->setCompiler($compiler);
$test->assertEquals(__DIR__ . DIRECTORY_SEPARATOR . 'compiled' . DIRECTORY_SEPARATOR .
View
4 tests/render/object.phpt
@@ -1,10 +1,10 @@
--TEST--
-\pear2\Templates\Savant\Main::render() object test
+\PEAR2\Templates\Savant\Main::render() object test
--FILE--
<?php
require dirname(__FILE__) . '/../test_framework.php.inc';
chdir(__DIR__);
-$savant = new \pear2\Templates\Savant\Main();
+$savant = new \PEAR2\Templates\Savant\Main();
class Foo
{
View
4 tests/render/string.phpt
@@ -1,10 +1,10 @@
--TEST--
-\pear2\Templates\Savant\Main::render() string test
+\PEAR2\Templates\Savant\Main::render() string test
--FILE--
<?php
require dirname(__FILE__) . '/../test_framework.php.inc';
chdir(__DIR__);
-$savant = new \pear2\Templates\Savant\Main();
+$savant = new \PEAR2\Templates\Savant\Main();
$savant->setEscape('htmlspecialchars');
$string = 'test';
Please sign in to comment.
Something went wrong with that request. Please try again.