Permalink
Browse files

Added Kaloa submodule. Moved common library code to Kaloa submodule.

  • Loading branch information...
1 parent 89ce358 commit efc46aec449713c059868427225f5bcd07182026 @mermshaus committed Feb 17, 2012
View
@@ -0,0 +1,3 @@
+[submodule "library/Kaloa"]
+ path = library/Kaloa
+ url = git://github.com/mermshaus/Kaloa.git
Submodule Kaloa added at 08a2d4
@@ -1,73 +0,0 @@
-<?php
-
-namespace org\ermshaus\filesystem;
-
-class PathHelper
-{
- public function normalizeDirectorySeparators($path)
- {
- if (!is_string($path)) {
- throw new \InvalidArgumentException('$path must be of type string');
- }
-
- $directorySeparatorInverse = (DIRECTORY_SEPARATOR === '/') ? '\\' : '/';
-
- return str_replace($directorySeparatorInverse, DIRECTORY_SEPARATOR,
- $path);
- }
-
- /**
- *
- * @param string $path
- * @return string
- * @throws \InvalidArgumentException
- */
- public function normalize($path)
- {
- if (!is_string($path)) {
- throw new \InvalidArgumentException('$path must be of type string');
- }
-
- $path = trim($path);
-
- $path = $this->normalizeDirectorySeparators($path);
-
- $isAbsolutePath = (substr($path, 0, 1) === '/');
-
- $components = explode('/', $path);
-
- $newComponents = array();
-
- foreach ($components as $component) {
- switch ($component) {
- case '':
- case '.':
- // Discard
- break;
- case '..':
- $c = count($newComponents);
- if (
- ($c === 0 && !$isAbsolutePath)
- || ($c > 0 && $newComponents[$c - 1] === '..')
- ) {
- // Relative paths may start with ".." components
- $newComponents[] = $component;
- } else {
- array_pop($newComponents);
- }
- break;
- default:
- $newComponents[] = $component;
- break;
- }
- }
-
- $newPath = ($isAbsolutePath ? '/' : '') . implode('/', $newComponents);
-
- if ($newPath === '') {
- $newPath = '.';
- }
-
- return $newPath;
- }
-}
@@ -5,6 +5,8 @@
namespace org\ermshaus\phpsog;
+use \Kaloa\Filesystem\PathHelper;
+
/**
*
*/
@@ -13,15 +15,15 @@ class PhpSog
/** @var array */
protected $config;
- /** @var \org\ermshaus\filesystem\PathHelper */
+ /** @var PathHelper */
protected $pathHelper;
/**
*
*/
public function __construct()
{
- $this->pathHelper = new \org\ermshaus\filesystem\PathHelper();
+ $this->pathHelper = new PathHelper();
}
/**
@@ -1,138 +0,0 @@
-<?php
-
-namespace org\ermshaus\spl;
-
-/**
- * SplClassLoader implementation that implements the technical interoperability
- * standards for PHP 5.3 namespaces and class names.
- *
- * http://groups.google.com/group/php-standards/web/final-proposal
- *
- * // Example which loads classes for the Doctrine Common package in the
- * // Doctrine\Common namespace.
- * $classLoader = new SplClassLoader('Doctrine\Common', '/path/to/doctrine');
- * $classLoader->register();
- *
- * @author Jonathan H. Wage <jonwage@gmail.com>
- * @author Roman S. Borschel <roman@code-factory.org>
- * @author Matthew Weier O'Phinney <matthew@zend.com>
- * @author Kris Wallsmith <kris.wallsmith@gmail.com>
- * @author Fabien Potencier <fabien.potencier@symfony-project.org>
- */
-class SplClassLoader
-{
- private $_fileExtension = '.php';
- private $_namespace;
- private $_includePath;
- private $_namespaceSeparator = '\\';
-
- /**
- * Creates a new <tt>SplClassLoader</tt> that loads classes of the
- * specified namespace.
- *
- * @param string $ns The namespace to use.
- */
- public function __construct($ns = null, $includePath = null)
- {
- $this->_namespace = $ns;
- $this->_includePath = $includePath;
- }
-
- /**
- * Sets the namespace separator used by classes in the namespace of this class loader.
- *
- * @param string $sep The separator to use.
- */
- public function setNamespaceSeparator($sep)
- {
- $this->_namespaceSeparator = $sep;
- }
-
- /**
- * Gets the namespace seperator used by classes in the namespace of this class loader.
- *
- * @return void
- */
- public function getNamespaceSeparator()
- {
- return $this->_namespaceSeparator;
- }
-
- /**
- * Sets the base include path for all class files in the namespace of this class loader.
- *
- * @param string $includePath
- */
- public function setIncludePath($includePath)
- {
- $this->_includePath = $includePath;
- }
-
- /**
- * Gets the base include path for all class files in the namespace of this class loader.
- *
- * @return string $includePath
- */
- public function getIncludePath()
- {
- return $this->_includePath;
- }
-
- /**
- * Sets the file extension of class files in the namespace of this class loader.
- *
- * @param string $fileExtension
- */
- public function setFileExtension($fileExtension)
- {
- $this->_fileExtension = $fileExtension;
- }
-
- /**
- * Gets the file extension of class files in the namespace of this class loader.
- *
- * @return string $fileExtension
- */
- public function getFileExtension()
- {
- return $this->_fileExtension;
- }
-
- /**
- * Installs this class loader on the SPL autoload stack.
- */
- public function register()
- {
- spl_autoload_register(array($this, 'loadClass'));
- }
-
- /**
- * Uninstalls this class loader from the SPL autoloader stack.
- */
- public function unregister()
- {
- spl_autoload_unregister(array($this, 'loadClass'));
- }
-
- /**
- * Loads the given class or interface.
- *
- * @param string $className The name of the class to load.
- * @return void
- */
- public function loadClass($className)
- {
- if (null === $this->_namespace || $this->_namespace.$this->_namespaceSeparator === substr($className, 0, strlen($this->_namespace.$this->_namespaceSeparator))) {
- $fileName = '';
- $namespace = '';
- if (false !== ($lastNsPos = strripos($className, $this->_namespaceSeparator))) {
- $namespace = substr($className, 0, $lastNsPos);
- $className = substr($className, $lastNsPos + 1);
- $fileName = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
- }
- $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
-
- require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName;
- }
- }
-}
View
@@ -2,8 +2,13 @@
namespace org\ermshaus\phpsog;
-require_once './library/org/ermshaus/spl/SplClassLoader.php';
-$loader = new \org\ermshaus\spl\SplClassLoader(null, './library');
+use \Exception;
+use \Kaloa\Loader;
+
+require_once './library/Kaloa/library/Kaloa/Loader.php';
+$loader = new Loader('org\\ermshaus', './library');
+$loader->register();
+$loader = new Loader('Kaloa', './library/Kaloa/library');
$loader->register();
function e($s)
@@ -16,7 +21,7 @@ function e($s)
);
if (!isset($_GET['config'])) {
- throw new \Exception('Config not set');
+ throw new Exception('Config not set');
} else {
$params['config'] = (string) $_GET['config'];
}

0 comments on commit efc46ae

Please sign in to comment.