[WIP] develop-2

.gitignore

@@ -1 +1,3 @@
-tests/tmp
+/tests/tmp
+/vendor
+/build

.travis.yml

@@ -2,6 +2,12 @@ language: php
 php:
   - 5.4
   - 5.5
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+
 before_script:
   - cd tests
 script: phpunit

README.md

@@ -1,7 +1,7 @@
 Aura Filter
 ===========
 
-[![Build Status](https://travis-ci.org/auraphp/Aura.Filter.png)](https://travis-ci.org/auraphp/Aura.Filter)
+[![Build Status](https://travis-ci.org/auraphp/Aura.Filter.png?branch=develop)](https://travis-ci.org/auraphp/Aura.Filter)
 
 The Aura Filter package provides validation and sanitizing for data objects
 and arrays.

composer.json

@@ -12,12 +12,25 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "aura/installer-default": "1.0.0"
+        "php": ">=5.4.0"
     },
     "autoload": {
-        "psr-0": {
-            "Aura\\Filter": "src/"
+        "psr-4": {
+            "Aura\\Filter\\_Config\\": "config/",
+            "Aura\\Filter\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Aura\\Filter\\": "tests"
+        }
+    },
+    "extra": {
+        "aura": {
+            "type": "library",
+            "config": {
+                "common": "Aura\\Filter\\_Config\\Common"                
+            }
         }
     }
 }

config/Common.php

@@ -0,0 +1,77 @@
+<?php
+namespace Aura\Filter\_Config;
+
+use Aura\Di\Config;
+use Aura\Di\Container;
+
+class Common extends Config
+{
+    public function define(Container $di)
+    {
+        /**
+         * Aura\Filter\Rule\Any
+         */
+        $di->setter['Aura\Filter\Rule\Any']['setRuleLocator'] = $di->lazyNew('Aura\Filter\RuleLocator');
+
+        /**
+         * Aura\Filter\RuleCollection
+         */
+        $di->params['Aura\Filter\RuleCollection'] = [
+            'rule_locator' => $di->lazyNew('Aura\Filter\RuleLocator'),
+            'translator' => $di->lazy(
+                [$di->lazyGet('intl_translator_locator'), 'get'],
+                'Aura.Filter'
+            ),
+        ];
+
+        /**
+         * Aura\Filter\RuleLocator
+         */
+        $di->params['Aura\Filter\RuleLocator']['registry'] = [
+            'alnum'                 =>  $di->lazyNew('Aura\Filter\Rule\Alnum'),
+            'alpha'                 =>  $di->lazyNew('Aura\Filter\Rule\Alpha'),
+            'any'                   =>  $di->lazyNew('Aura\Filter\Rule\Any'),
+            'between'               =>  $di->lazyNew('Aura\Filter\Rule\Between'),
+            'blank'                 =>  $di->lazyNew('Aura\Filter\Rule\Blank'),
+            'bool'                  =>  $di->lazyNew('Aura\Filter\Rule\Bool'),
+            'closure'               =>  $di->lazyNew('Aura\Filter\Rule\Closure'),
+            'creditCard'            =>  $di->lazyNew('Aura\Filter\Rule\CreditCard'),
+            'dateTime'              =>  $di->lazyNew('Aura\Filter\Rule\DateTime'),
+            'email'                 =>  $di->lazyNew('Aura\Filter\Rule\Email'),
+            'equalToField'          =>  $di->lazyNew('Aura\Filter\Rule\EqualToField'),
+            'equalToValue'          =>  $di->lazyNew('Aura\Filter\Rule\EqualToValue'),
+            'float'                 =>  $di->lazyNew('Aura\Filter\Rule\Float'),
+            'inKeys'                =>  $di->lazyNew('Aura\Filter\Rule\InKeys'),
+            'inValues'              =>  $di->lazyNew('Aura\Filter\Rule\InValues'),
+            'int'                   =>  $di->lazyNew('Aura\Filter\Rule\Int'),
+            'ipv4'                  =>  $di->lazyNew('Aura\Filter\Rule\Ipv4'),
+            'max'                   =>  $di->lazyNew('Aura\Filter\Rule\Max'),
+            'min'                   =>  $di->lazyNew('Aura\Filter\Rule\Min'),
+            'regex'                 =>  $di->lazyNew('Aura\Filter\Rule\Regex'),
+            'strictEqualToField'    =>  $di->lazyNew('Aura\Filter\Rule\StrictEqualToField'),
+            'strictEqualToValue'    =>  $di->lazyNew('Aura\Filter\Rule\StrictEqualToValue'),
+            'string'                =>  $di->lazyNew('Aura\Filter\Rule\String'),
+            'strlen'                =>  $di->lazyNew('Aura\Filter\Rule\Strlen'),
+            'strlenBetween'         =>  $di->lazyNew('Aura\Filter\Rule\StrlenBetween'),
+            'strlenMax'             =>  $di->lazyNew('Aura\Filter\Rule\StrlenMax'),
+            'strlenMin'             =>  $di->lazyNew('Aura\Filter\Rule\StrlenMin'),
+            'trim'                  =>  $di->lazyNew('Aura\Filter\Rule\Trim'),
+            'upload'                =>  $di->lazyNew('Aura\Filter\Rule\Upload'),
+            'url'                   =>  $di->lazyNew('Aura\Filter\Rule\Url'),
+            'word'                  =>  $di->lazyNew('Aura\Filter\Rule\Word'),
+            'isbn'                  =>  $di->lazyNew('Aura\Filter\Rule\Isbn'),
+        ];
+
+        /**
+         * Aura\Intl\PackageLocator
+         */
+        $di->params['Aura\Intl\PackageLocator']['registry']['Aura.Filter']['en_US'] = $di->lazy(
+            [$di->lazyGet('intl_package_factory'), 'newInstance'],
+            $di->lazyRequire(dirname(__DIR__) . "/intl/en_US.php")
+        );
+    }
+
+    public function modify(Container $di)
+    {
+    }
+}

src/Aura/Filter/Rule/Any.php

@@ -64,6 +64,18 @@ public function setRuleLocator(RuleLocator $rule_locator)
         $this->rule_locator = $rule_locator;
     }
 
+    /**
+     * 
+     * Returns the rule locator.
+     * 
+     * @return RuleLocator
+     * 
+     */
+    public function getRuleLocator()
+    {
+        return $this->rule_locator;
+    }
+
     /**
      * 
      * Validates that the value passes at least one the rules in a list.

tests/Aura/Filter/RuleCollectionTest.php → tests/Filter/RuleCollectionTest.php

@@ -395,4 +395,21 @@ public function testInstanceScript()
         $actual = $instance->getRuleLocator()->get('any');
         $this->assertInstanceOf($expect, $actual);
     }
+
+    public function testNewRuleInAny()
+    {
+        $instance = require dirname(dirname(dirname(__DIR__))) . '/scripts/instance.php';
+        $any = $instance->getRuleLocator()->get('any');
+        $any->getRuleLocator()->set('hex', function () {
+            return new \Aura\Filter\Rule\Hex;
+        });
+        $instance->addSoftRule('hexval', $instance::IS, 'any', [
+                ['hex']
+            ]
+        );
+        $data = (object) [
+            'hexval' => 'abcdef',
+        ];
+        $this->assertTrue($instance->values($data));
+    }
 }