Skip to content

Commit

Permalink
Merge pull request #8 from ray-di/spike
Browse files Browse the repository at this point in the history
Cleanup
  • Loading branch information
koriym authored Sep 6, 2017
2 parents 35a17c0 + b6527ff commit 9795918
Show file tree
Hide file tree
Showing 32 changed files with 90 additions and 440 deletions.
1 change: 1 addition & 0 deletions .php_cs.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"php":"7.1.8","version":"2.5.0:v2.5.0#63aad575ec2a29d50eb6c3b5cbc17430b28895b2","rules":{"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":{"ensure_fully_multiline":true},"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"header_comment":{"header":"This file is part of the Ray.ValidateModule package.\n\n@license http:\/\/opensource.org\/licenses\/MIT MIT","commentType":"PHPDoc","separate":"none"},"array_syntax":{"syntax":"short"},"binary_operator_spaces":{"align_equals":false,"align_double_arrow":false},"blank_line_after_opening_tag":true,"blank_line_before_return":true,"cast_spaces":true,"combine_consecutive_unsets":true,"concat_space":{"spacing":"one"},"declare_equal_normalize":true,"dir_constant":true,"ereg_to_preg":true,"function_typehint_space":true,"general_phpdoc_annotation_remove":["author","category","package","copyright","version"],"hash_to_slash_comment":true,"heredoc_to_nowdoc":true,"include":true,"linebreak_after_opening_tag":true,"lowercase_cast":true,"method_separation":true,"modernize_types_casting":true,"native_function_casing":true,"no_alias_functions":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_blank_lines_before_namespace":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_consecutive_blank_lines":["break","continue","curly_brace_block","extra","parenthesis_brace_block","return","square_brace_block","throw","use","useTrait"],"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"no_multiline_whitespace_before_semicolons":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unreachable_default_argument_value":true,"no_unused_imports":true,"no_useless_else":true,"no_useless_return":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"not_operator_with_successor_space":true,"object_operator_without_whitespace":true,"ordered_class_elements":true,"ordered_imports":true,"php_unit_construct":true,"php_unit_dedicate_assert":true,"php_unit_fqcn_annotation":true,"php_unit_strict":true,"phpdoc_align":true,"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":{"property-read":"property","property-write":"property","type":"var"},"phpdoc_no_empty_return":true,"phpdoc_no_package":true,"phpdoc_order":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"pow_to_exponentiation":true,"protected_to_private":true,"psr0":true,"psr4":true,"random_api_migration":true,"return_type_declaration":{"space_before":"one"},"self_accessor":true,"short_scalar_cast":true,"single_quote":true,"space_after_semicolon":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"strict_param":true,"ternary_to_null_coalescing":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true},"hashes":{"docs\/demo\/0.on_validate.php":1002544173,"docs\/demo\/1.on_failure.php":2001838040,"docs\/demo\/autoload.php":3746138402,"src\/Annotation\/OnFailure.php":1673711366,"src\/Annotation\/OnValidate.php":1649686926,"src\/Annotation\/Valid.php":2941387563,"src\/Exception\/ExceptionInterface.php":3771725912,"src\/Exception\/InvalidArgumentException.php":2540468408,"src\/Exception\/LogicException.php":2668402599,"src\/Exception\/RuntimeException.php":545970152,"src\/Exception\/ValidateMethodNotFound.php":3533660158,"src\/FailureInterface.php":2874172483,"src\/ValidateInterceptor.php":4172773040,"src\/ValidateModule.php":2883865094,"src\/Validation.php":530727143,"src\/ValidationInterface.php":787431138,"tests\/bootstrap.php":182070934,"tests\/ValidationTest.php":1168420616}}
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2015-2017 Akihito Koriyama

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
24 changes: 0 additions & 24 deletions Licence.txt

This file was deleted.

7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Ray.ValidateModule

[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ray-di/Ray.ValidateModule/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/ray-di/Ray.ValidateModule/?branch=develop)
[![Code Coverage](https://scrutinizer-ci.com/g/ray-di/Ray.ValidateModule/badges/coverage.png?b=develop)](https://scrutinizer-ci.com/g/ray-di/Ray.ValidateModule/?branch=develop)
[![Build Status](https://travis-ci.org/ray-di/Ray.ValidateModule.svg?branch=develop)](https://travis-ci.org/ray-di/Ray.ValidateModule)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ray-di/Ray.ValidateModule/badges/quality-score.png?b=1.x)](https://scrutinizer-ci.com/g/ray-di/Ray.ValidateModule/?branch=1.x)
[![Code Coverage](https://scrutinizer-ci.com/g/ray-di/Ray.ValidateModule/badges/coverage.png?b=1.x)](https://scrutinizer-ci.com/g/ray-di/Ray.ValidateModule/?branch=1.x)
[![Build Status](https://scrutinizer-ci.com/g/ray-di/Ray.ValidateModule/badges/build.png?b=1.x)](https://scrutinizer-ci.com/g/ray-di/Ray.ValidateModule/build-status/1.x)
[![Build Status](https://travis-ci.org/ray-di/Ray.ValidateModule.svg?branch=1.x)](https://travis-ci.org/ray-di/Ray.ValidateModule)

## Installation

Expand Down
18 changes: 8 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,25 @@
"description":"Validation module for Ray.Di",
"keywords":[
"validation",
"Ray.Di module"
"Ray.Di"
],
"require": {
"ray/di": "~2.0",
"foa/filter-input-bundle": "~1.1@dev",
"aura/filter": "~2.0@dev",
"aura/html": "^2.4"
"ray/di": "^2.0",
"nikic/php-parser": "^1.3"
},
"license": "BSD-3-Clause",
"license": "MIT",
"autoload":{
"psr-4":{
"Ray\\Validation\\": "src/"
}
},
"exclude-from-classmap": ["tests/Fake"]
},
"autoload-dev":{
"psr-4":{
"Ray\\Validation\\": "tests/",
"Ray\\Validation\\": "tests/Fake"
"Ray\\Validation\\": ["tests/", "tests/Fake"]
}
},
"require-dev": {
"phpunit/phpunit": "^5.6"
"phpunit/phpunit": "^4.8"
}
}
6 changes: 5 additions & 1 deletion docs/demo/0.on_validate.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<?php

/**
* This file is part of the Ray.ValidateModule package.
*
* @license http://opensource.org/licenses/MIT MIT
*/
use Ray\Di\Injector;
use Ray\Validation\Annotation\OnValidate;
use Ray\Validation\Annotation\Valid;
Expand Down
8 changes: 6 additions & 2 deletions docs/demo/1.on_failure.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<?php

/**
* This file is part of the Ray.ValidateModule package.
*
* @license http://opensource.org/licenses/MIT MIT
*/
use Ray\Di\Injector;
use Ray\Validation\Annotation\OnFailure;
use Ray\Validation\Annotation\OnValidate;
Expand Down Expand Up @@ -32,7 +36,7 @@ public function onPost($name)
public function onValidateOnPost($name)
{
$validation = new Validation;
if (!is_string($name)) {
if (! is_string($name)) {
$validation->addError('name', 'name should be string.');
}

Expand Down
109 changes: 0 additions & 109 deletions docs/demo/2.aura.input.php

This file was deleted.

6 changes: 5 additions & 1 deletion docs/demo/autoload.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<?php

/**
* This file is part of the Ray.ValidateModule package.
*
* @license http://opensource.org/licenses/MIT MIT
*/
use Doctrine\Common\Annotations\AnnotationRegistry;

$autoloader = dirname(dirname(__DIR__)) . '/vendor/autoload.php';
Expand Down
35 changes: 0 additions & 35 deletions src/AbstractAuraForm.php

This file was deleted.

19 changes: 0 additions & 19 deletions src/Annotation/AuraInput.php

This file was deleted.

4 changes: 2 additions & 2 deletions src/Annotation/OnFailure.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* This file is part of the Ray.ValidateModule
* This file is part of the Ray.ValidateModule package.
*
* @license http://opensource.org/licenses/bsd-license.php BSD
* @license http://opensource.org/licenses/MIT MIT
*/
namespace Ray\Validation\Annotation;

Expand Down
4 changes: 2 additions & 2 deletions src/Annotation/OnValidate.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* This file is part of the Ray.ValidateModule
* This file is part of the Ray.ValidateModule package.
*
* @license http://opensource.org/licenses/bsd-license.php BSD
* @license http://opensource.org/licenses/MIT MIT
*/
namespace Ray\Validation\Annotation;

Expand Down
4 changes: 2 additions & 2 deletions src/Annotation/Valid.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* This file is part of the Ray.ValidateModule
* This file is part of the Ray.ValidateModule package.
*
* @license http://opensource.org/licenses/bsd-license.php BSD
* @license http://opensource.org/licenses/MIT MIT
*/
namespace Ray\Validation\Annotation;

Expand Down
53 changes: 0 additions & 53 deletions src/AuraInputInterceptor.php

This file was deleted.

Loading

0 comments on commit 9795918

Please sign in to comment.