Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@gchumillas
gchumillas committed Feb 17, 2014
1 parent f04f28f commit 7e33bd9
Show file tree
Hide file tree
Showing 56 changed files with 1,079 additions and 551 deletions.
4 changes: 2 additions & 2 deletions classes/arr/arguments/arr-arguments-descriptor.php
View file
Expand Up @@ -10,13 +10,13 @@
* @license https://raw.github.com/soloproyectos/core/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/core
*/
namespace com\soloproyectos\core\arr\arguments;
namespace com\soloproyectos\common\arr\arguments;

/**
* Class ArrArgumentsDescriptor.
*
* @category Tools_And_Utilities
* @package Arr
* @package ArrArguments
* @author Gonzalo Chumillas <gonzalo@soloproyectos.com>
* @license https://raw.github.com/soloproyectos/core/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/core
Expand Down
6 changes: 3 additions & 3 deletions classes/arr/arguments/arr-arguments.php
View file
Expand Up @@ -10,16 +10,16 @@
* @license https://raw.github.com/soloproyectos/core/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/core
*/
namespace com\soloproyectos\core\arr\arguments;
namespace com\soloproyectos\common\arr\arguments;
use Exception;
use com\soloproyectos\core\arr\Arr;
use com\soloproyectos\common\arr\ArrHelper;
use InvalidArgumentException;

/**
* Class ArrArguments.
*
* @category Tools_And_Utilities
* @package Arr
* @package ArrArguments
* @author Gonzalo Chumillas <gonzalo@soloproyectos.com>
* @license https://raw.github.com/soloproyectos/core/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/core
Expand Down
45 changes: 32 additions & 13 deletions classes/arr/arr.php → classes/arr/arr-helper.php
View file
@@ -1,6 +1,6 @@
<?php
/**
* This file contains the Arr class.
* This file contains the ArrHelper class.
*
* PHP Version 5.3
*
Expand All @@ -10,22 +10,21 @@
* @license https://raw.github.com/soloproyectos/core/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/core
*/
namespace com\soloproyectos\core\arr;
use com\soloproyectos\core\arr\arguments\ArrArguments;
use com\soloproyectos\core\arr\arguments\ArrArgumentsDescriptor;
namespace com\soloproyectos\common\arr;
use com\soloproyectos\common\arr\arguments\ArrArguments;
use com\soloproyectos\common\arr\arguments\ArrArgumentsDescriptor;

/**
* Class Arr.
* Class ArrHelper.
*
* @category Tools_And_Utilities
* @package Arr
* @author Gonzalo Chumillas <gonzalo@soloproyectos.com>
* @license https://raw.github.com/soloproyectos/core/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/core
*/
class Arr
class ArrHelper
{

/**
* Gets an attribute from a given array.
*
Expand Down Expand Up @@ -62,7 +61,7 @@ public static function set(&$arr, $name, $value)
*
* @return boolean
*/
public static function exist($arr, $name)
public static function is($arr, $name)
{
return array_key_exists($name, $arr);
}
Expand All @@ -82,6 +81,26 @@ public static function del(&$arr, $name)
}
}

/**
* Appends or prepends an object into an array.
*
* @param array $arr Array object (passed by reference)
* @param mixed $obj Object
* @param boolean $prepend Inserts at the beginning (default is false)
*
* @return array
*/
public function add(&$arr, $obj, $prepend = false)
{
if ($prepend) {
array_unshift($arr, $obj);
} else {
array_push($arr, $obj);
}

return $arr;
}

/**
* Fetches the elements of an array that matches a given list of descriptors.
*
Expand All @@ -94,7 +113,7 @@ public static function del(&$arr, $name)
* 'string', 'array', 'objetc', 'resource', 'function'.</p>
* <pre>
* function test($title, $message, $x, $y, $options) {
* $args = Arr::fetch(func_get_args(), array(
* $args = ArrHelper::fetch(func_get_args(), array(
* "title" => "string",
* "message" => array(
* "type" => "string",
Expand Down Expand Up @@ -137,10 +156,10 @@ public static function fetch($arr, $descriptors)
if (is_string($descriptor)) {
$types = explode("|", $descriptor);
} elseif (is_array($descriptor)) {
$types = explode("|", Arr::get($descriptor, "type"));
$default = Arr::get($descriptor, "default");
$required = Arr::get(
$descriptor, "required", !Arr::exist($descriptor, "default")
$types = explode("|", ArrHelper::get($descriptor, "type"));
$default = ArrHelper::get($descriptor, "default");
$required = ArrHelper::get(
$descriptor, "required", !ArrHelper::is($descriptor, "default")
);
}

Expand Down
14 changes: 7 additions & 7 deletions classes/autoload.php
View file
Expand Up @@ -10,11 +10,11 @@
* @license https://raw.github.com/soloproyectos/core/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/core
*/
use com\soloproyectos\core\sys\file\SysFile;
use com\soloproyectos\core\text\Text;
use com\soloproyectos\common\sys\file\SysFileHelper;
use com\soloproyectos\common\text\TextHelper;

require_once __DIR__ . "/sys/file/sys-file.php";
require_once __DIR__ . "/text/text.php";
require_once __DIR__ . "/sys/file/sys-file-helper.php";
require_once __DIR__ . "/text/text-helper.php";

spl_autoload_register(
function ($classname) {
Expand All @@ -25,13 +25,13 @@ function ($classname) {
$items = $matches[0];
foreach ($items as $item) {
$item = strtolower($item);
$d = SysFile::concat($dir, $item);
$d = SysFileHelper::concat($dir, $item);
if (is_dir($d)) {
$dir = $d;
}
$name = Text::concat("-", $name, $item);
$name = TextHelper::concat("-", $name, $item);
}
$filename = SysFile::concat($dir, "$name.php");
$filename = SysFileHelper::concat($dir, "$name.php");

if (!is_file($filename)) {
throw new Exception("Script not found: $filename");
Expand Down
10 changes: 5 additions & 5 deletions classes/css/exception/css-exception.php
View file
Expand Up @@ -4,20 +4,20 @@
*
* PHP Version 5.3
*
* @category XML
* @package Xml
* @category CSS
* @package Css
* @author Gonzalo Chumillas <gonzalo@soloproyectos.com>
* @license https://raw2.github.com/soloproyectos/php.common-libs/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/php.common-libs
*/
namespace com\soloproyectos\core\css\exception;
namespace com\soloproyectos\common\css\exception;
use Exception;

/**
* Class CssException.
*
* @category XML
* @package Xml
* @category CSS
* @package Css
* @author Gonzalo Chumillas <gonzalo@soloproyectos.com>
* @license https://raw2.github.com/soloproyectos/php.common-libs/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/php.common-libs
Expand Down
7 changes: 3 additions & 4 deletions classes/css/parser/combinator/css-parser-combinator-adjacent.php
View file
Expand Up @@ -10,10 +10,10 @@
* @license https://raw2.github.com/soloproyectos/php.common-libs/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/php.common-libs
*/
namespace com\soloproyectos\core\css\parser\combinator;
namespace com\soloproyectos\common\css\parser\combinator;
use DOMElement;
use com\soloproyectos\core\css\parser\combinator\CssParserCombinator;
use com\soloproyectos\core\xml\dom\XmlDomHelper;
use com\soloproyectos\common\css\parser\combinator\CssParserCombinator;
use com\soloproyectos\common\xml\dom\XmlDomHelper;

/**
* Class CssParserCombinatorAdjacent.
Expand All @@ -28,7 +28,6 @@
*/
class CssParserCombinatorAdjacent extends CssParserCombinator
{

/**
* Gets the adjacent node.
*
Expand Down
7 changes: 3 additions & 4 deletions classes/css/parser/combinator/css-parser-combinator-child.php
View file
Expand Up @@ -10,10 +10,10 @@
* @license https://raw2.github.com/soloproyectos/php.common-libs/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/php.common-libs
*/
namespace com\soloproyectos\core\css\parser\combinator;
namespace com\soloproyectos\common\css\parser\combinator;
use DOMElement;
use com\soloproyectos\core\css\parser\combinator\CssParserCombinator;
use com\soloproyectos\core\xml\dom\XmlDomHelper;
use com\soloproyectos\common\css\parser\combinator\CssParserCombinator;
use com\soloproyectos\common\xml\dom\XmlDomHelper;

/**
* Class CssParserCombinatorChild.
Expand All @@ -28,7 +28,6 @@
*/
class CssParserCombinatorChild extends CssParserCombinator
{

/**
* Gets the child nodes.
*
Expand Down
7 changes: 3 additions & 4 deletions classes/css/parser/combinator/css-parser-combinator-descendant.php
View file
Expand Up @@ -10,10 +10,10 @@
* @license https://raw2.github.com/soloproyectos/php.common-libs/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/php.common-libs
*/
namespace com\soloproyectos\core\css\parser\combinator;
namespace com\soloproyectos\common\css\parser\combinator;
use DOMElement;
use com\soloproyectos\core\css\parser\combinator\CssParserCombinator;
use com\soloproyectos\core\xml\dom\XmlDomHelper;
use com\soloproyectos\common\css\parser\combinator\CssParserCombinator;
use com\soloproyectos\common\xml\dom\XmlDomHelper;

/**
* Class CssParserCombinatorDescendant.
Expand All @@ -28,7 +28,6 @@
*/
class CssParserCombinatorDescendant extends CssParserCombinator
{

/**
* Gets the descendant nodes.
*
Expand Down
6 changes: 3 additions & 3 deletions classes/css/parser/combinator/css-parser-combinator-factory.php
View file
Expand Up @@ -10,9 +10,9 @@
* @license https://raw2.github.com/soloproyectos/php.common-libs/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/php.common-libs
*/
namespace com\soloproyectos\core\css\parser\combinator;
namespace com\soloproyectos\common\css\parser\combinator;
use Closure;
use com\soloproyectos\core\css\parser\combinator\CssParserCombinator;
use com\soloproyectos\common\css\parser\combinator\CssParserCombinator;

/**
* Class CssParserCombinatorFactory.
Expand All @@ -35,7 +35,7 @@ class CssParserCombinatorFactory
*/
public static function getInstance($classname, $userDefFunction = null)
{
$class = "com\\soloproyectos\\core\\css\\parser\\combinator\\"
$class = "com\\soloproyectos\\common\\css\\parser\\combinator\\"
. $classname;
return new $class($userDefFunction);
}
Expand Down
7 changes: 3 additions & 4 deletions classes/css/parser/combinator/css-parser-combinator-general.php
View file
Expand Up @@ -10,10 +10,10 @@
* @license https://raw2.github.com/soloproyectos/php.common-libs/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/php.common-libs
*/
namespace com\soloproyectos\core\css\parser\combinator;
namespace com\soloproyectos\common\css\parser\combinator;
use DOMElement;
use com\soloproyectos\core\css\parser\combinator\CssParserCombinator;
use com\soloproyectos\core\xml\dom\XmlDomHelper;
use com\soloproyectos\common\css\parser\combinator\CssParserCombinator;
use com\soloproyectos\common\xml\dom\XmlDomHelper;

/**
* Class CssParserCombinatorGeneral.
Expand All @@ -28,7 +28,6 @@
*/
class CssParserCombinatorGeneral extends CssParserCombinator
{

/**
* Gets the general sibling nodes.
*
Expand Down
7 changes: 3 additions & 4 deletions classes/css/parser/combinator/css-parser-combinator-user-defined.php
View file
Expand Up @@ -10,11 +10,11 @@
* @license https://raw2.github.com/soloproyectos/php.common-libs/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/php.common-libs
*/
namespace com\soloproyectos\core\css\parser\combinator;
namespace com\soloproyectos\common\css\parser\combinator;
use Closure;
use DOMElement;
use com\soloproyectos\core\css\parser\exception\CssParserException;
use com\soloproyectos\core\css\parser\combinator\CssParserCombinator;
use com\soloproyectos\common\css\parser\exception\CssParserException;
use com\soloproyectos\common\css\parser\combinator\CssParserCombinator;

/**
* Class CssParserCombinatorUserDefined.
Expand All @@ -29,7 +29,6 @@
*/
class CssParserCombinatorUserDefined extends CssParserCombinator
{

/**
* User defined function.
* @var Closure
Expand Down
3 changes: 1 addition & 2 deletions classes/css/parser/combinator/css-parser-combinator.php
View file
Expand Up @@ -10,7 +10,7 @@
* @license https://raw2.github.com/soloproyectos/php.common-libs/master/LICENSE BSD 2-Clause License
* @link https://github.com/soloproyectos/php.common-libs
*/
namespace com\soloproyectos\core\css\parser\combinator;
namespace com\soloproyectos\common\css\parser\combinator;
use DOMElement;

/**
Expand All @@ -26,7 +26,6 @@
*/
abstract class CssParserCombinator
{

/**
* Gets the nodes that combines with a given node and a tag name.
*
Expand Down

0 comments on commit 7e33bd9

Please sign in to comment.