Merge branch 'PSR2' into 0.6.x

.coveralls.yml

@@ -1,4 +1,3 @@
-src_dir: ./src
 coverage_clover: build/logs/clover.xml
 json_path: build/logs/coveralls-upload.json
 exclude_no_stmt: true

.travis.yml

@@ -1,20 +1,29 @@
 language: php
+dist: trusty
 
 php:
-  - 5.3.3
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
 
+matrix:
+  include:
+    - php: 5.3
+      dist: precise
+
+env:
+  matrix:
+    - DEPENDENCIES="--dev --no-interaction --prefer-source"
+    - DEPENDENCIES="--dev --no-interaction --prefer-source --prefer-lowest --prefer-stable"
+
 before_script:
   - composer self-update
-  - composer require satooshi/php-coveralls:0.* --dev
-  - composer install --dev --no-interaction --prefer-source
+  - composer require php-coveralls/php-coveralls '~1.0'
+  - composer update $DEPENDENCIES
 
 script:
   - mkdir -p build/logs
-  - phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml
+  - vendor/bin/phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml
 
 after_script:
   - php vendor/bin/coveralls -v -c .coveralls.yml

composer.json

@@ -1,21 +1,28 @@
 {
-    "name": "volcanus/validation",
-    "homepage": "https://github.com/k-holy/volcanus-validation",
-    "type": "library",
-    "description": "validation library",
-    "keywords": ["validation"],
-    "version": "0.4.1",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "k-holy",
-            "email": "k.holy74@gmail.com"
-        }
-    ],
-    "autoload": {
-        "psr-4": { "Volcanus\\Validation\\": "src/" }
-    },
-    "require": {
-        "php": ">=5.3.3"
+  "name": "volcanus/validation",
+  "homepage": "https://github.com/k-holy/volcanus-validation",
+  "type": "library",
+  "description": "validation library",
+  "keywords": [
+    "validation"
+  ],
+  "version": "0.4.1",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "k-holy",
+      "email": "k.holy74@gmail.com"
     }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Volcanus\\Validation\\": "src/"
+    }
+  },
+  "require": {
+    "php": ">=5.3.9"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^4.8"
+  }
 }

phpunit.xml

@@ -1,32 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="tests/bootstrap.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    forceCoversAnnotation="false"
-    processIsolation="false"
-    stopOnError="false"
-    stopOnFailure="false"
-    stopOnIncomplete="false"
-    stopOnSkipped="false"
-    syntaxCheck="true"
-    verbose="true"
->
+<phpunit bootstrap="tests/bootstrap.php">
     <testsuites>
-        <testsuite name="Volcanus_Validation">
-            <directory suffix="Test.php">./tests/Volcanus/Validation/Test</directory>
+        <testsuite>
+            <directory suffix="Test.php">tests</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist>
-            <directory>./src</directory>
+            <directory suffix=".php">src</directory>
             <exclude>
-                <directory>./tests</directory>
-                <directory>./vendor</directory>
+                <directory>tests</directory>
+                <directory>vendor</directory>
             </exclude>
         </whitelist>
     </filter>

src/Checker.php

@@ -1,48 +1,50 @@
 <?php
 /**
- * PHP versions 5
+ * Volcanus libraries for PHP
  *
- * @copyright  2011 k-holy <k.holy74@gmail.com>
- * @author     k.holy74@gmail.com
- * @license    http://www.opensource.org/licenses/mit-license.php  The MIT License (MIT)
+ * @copyright k-holy <k.holy74@gmail.com>
+ * @license The MIT License (MIT)
  */
+
 namespace Volcanus\Validation;
 
 /**
  * Volcanus_Validation_Checker
  *
- * @author     k.holy74@gmail.com
+ * @author k.holy74@gmail.com
  */
 interface Checker
 {
 
-	/* 文字長測定モード */
-	const LENGTH_BYTES = 'B'; // バイト長
-	const LENGTH_CHARS = 'C'; // 文字長
-	const LENGTH_WIDTH = 'W'; // 文字幅
+    /* 文字長測定モード */
+    const LENGTH_BYTES = 'B'; // バイト長
+    const LENGTH_CHARS = 'C'; // 文字長
+    const LENGTH_WIDTH = 'W'; // 文字幅
 
-	/**
-	 * 検証メソッドを実行します。
-	 *
-	 * @param  mixed   検証値 (文字列または__toStringメソッド実装オブジェクト)
-	 * @return boolean 検証結果
-	 */
-	public function check($value, array $options = array());
+    /**
+     * 検証メソッドを実行します。
+     *
+     * @param  mixed $value 検証値 (文字列または__toStringメソッド実装オブジェクト)
+     * @param  array $options 検証オプション
+     * @return boolean 検証結果
+     */
+    public function check($value, array $options = array());
 
-	/**
-	 * 検証前のガードメソッドを実行します。このメソッドがFALSEを返した場合は検証メソッドを実行しません。
-	 *
-	 * @param  mixed   検証値 (文字列または__toStringメソッド実装オブジェクト)
-	 * @return boolean ガード結果
-	 */
-	public function guard($value);
+    /**
+     * 検証前のガードメソッドを実行します。このメソッドがFALSEを返した場合は検証メソッドを実行しません。
+     *
+     * @param  mixed $value 検証値 (文字列または__toStringメソッド実装オブジェクト)
+     * @return boolean ガード結果
+     */
+    public function guard($value);
 
-	/**
-	 * 検証メソッド
-	 *
-	 * @param  mixed   検証値 (文字列または__toStringメソッド実装オブジェクト)
-	 * @return boolean 検証結果
-	 */
-	public function __invoke($value, array $options = array());
+    /**
+     * 検証メソッド
+     *
+     * @param  mixed $value 検証値 (文字列または__toStringメソッド実装オブジェクト)
+     * @param  array $options 検証オプション
+     * @return boolean 検証結果
+     */
+    public function __invoke($value, array $options = array());
 
 }