Merge branch 'master' into simplification

vearutop · vearutop · commit 9d410310bb2d · 2016-11-01T08:55:59.000+07:00
# Conflicts:
#	src/Types/MultiType.php
#	tests/src/Helper/LevelOneClass.php
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,10 @@
+* text          eol=lf
+*.serialized    -text
+*.dat           -text
+/tests export-ignore
+/stubs export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.scrutinizer.yml export-ignore
+/.travis.yml export-ignore
+/phpunit.xml export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 vendor
 .idea
 composer.lock
-cover.xml
+cover.xml
+build
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,34 @@
+language: php
+php:
+  - nightly
+  - hhvm
+  - 7.0
+  - 5.6
+  - 5.5
+  - 5.4
+  - 5.3
+
+sudo: false
+
+## Cache composer bits
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+# execute any number of scripts before the test run, custom env's are available as variables
+before_script:
+  - composer install --dev --no-interaction --prefer-dist
+
+matrix:
+  allow_failures:
+    - php: hhvm
+    - php: nightly
+  fast_finish: true
+
+script:
+  - mkdir -p build/logs
+  - ./vendor/bin/phpunit -v --configuration phpunit.xml --coverage-clover build/logs/clover.xml
+
+after_script:
+ - php vendor/bin/coveralls -v
+# - CODECLIMATE_REPO_TOKEN=bef21a7b3d0a531fec57b713df1720bb0da7114f5ce33a3e492ce9599b8ac8df ./vendor/bin/test-reporter
diff --git a/README.md b/README.md
@@ -0,0 +1,3 @@
+# yaoi schema
+
+JSON-schema inspired PHP versatile structures.
diff --git a/composer.json b/composer.json
@@ -6,9 +6,9 @@
     "php": ">=5.3"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8.23",
-    "phpunit/php-code-coverage": "^2.2.4",
-    "ext-xdebug": ">=2.2.1"
+    "phpunit/phpunit": "4.8.23",
+    "phpunit/php-code-coverage": "2.2.4",
+    "codeclimate/php-test-reporter": "0.1.2"
   },
   "license": "MIT",
   "authors": [
diff --git a/phpunit.xml b/phpunit.xml
@@ -13,7 +13,7 @@
         >
     <testsuites>
         <testsuite name="Yaoi PHP Schema Test Suite">
-            <directory>./tests/PHPUnit/</directory>
+            <directory>./tests/src/PHPUnit/</directory>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/src/CodeBuilder/PHPCodeBuilder.php b/src/CodeBuilder/PHPCodeBuilder.php
@@ -73,8 +73,8 @@ public function getPhpDocType(Schema $schema)
                 return 'object';
         }
 
-        print_r($schema->getPath());
-        print_r($schema->getSchemaData());
+        //print_r($schema->getPath());
+        //print_r($schema->getSchemaData());
         throw new Exception("Please im");
         return '';
     }
@@ -165,7 +165,7 @@ public function makeClassName($tracePath)
 
     public function storeToDisk($srcPath)
     {
-        print_r($this->classes);
+        //print_r($this->classes);
         
     }
 
diff --git a/src/Types/ObjectType.php b/src/Types/ObjectType.php
@@ -24,7 +24,7 @@ public function import($data)
                         $result->$name = $property->import($data[$name]);
                     }
                     catch (Exception $exception) {
-                        $exception->pushStructureTrace('Properties:' . $name);
+                        $exception->pushStructureTrace('properties:' . $name);
                         throw $exception;
                     }
                     unset($data[$name]);
@@ -38,7 +38,7 @@ public function import($data)
                     $result->$name = $additionalProperties->propertiesSchema->import($value);
                 }
                 catch (Exception $exception) {
-                    $exception->pushStructureTrace('AdditionalProperties:' . $name);
+                    $exception->pushStructureTrace('additionalProperties:' . $name);
                     throw $exception;
                 }
                 unset($data[$name]);
diff --git a/tests/res/json-schema.json b/tests/res/json-schema.json
diff --git a/tests/res/swagger-schema.json b/tests/res/swagger-schema.json
diff --git a/tests/src/Helper/LevelOneClass.php b/tests/src/Helper/LevelOneClass.php
@@ -2,8 +2,7 @@
 
 namespace Yaoi\Schema\Tests\Helper;
 
-
-use Yaoi\Schema\Constraint\Properties;
+use Yaoi\Schema\ObjectFlavour\Properties;
 use Yaoi\Schema\Schema;
 use Yaoi\Schema\Structure\ClassStructure;
 
diff --git a/tests/src/PHPUnit/AdditionalPropertiesTest.php b/tests/src/PHPUnit/AdditionalPropertiesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yaoi\Schema\Tests;
+namespace Yaoi\Schema\Tests\PHPUnit;
 
 
 use Yaoi\Schema\Schema;
diff --git a/tests/src/PHPUnit/ArrayTest.php b/tests/src/PHPUnit/ArrayTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yaoi\Schema\Tests;
+namespace Yaoi\Schema\Tests\PHPUnit;
 
 use Yaoi\Schema\Constraint\Items;
 use Yaoi\Schema\Schema;
diff --git a/tests/src/PHPUnit/ClassStructure/ClassStructureTest.php b/tests/src/PHPUnit/ClassStructure/ClassStructureTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yaoi\Schema\Tests\ClassStructure;
+namespace Yaoi\Schema\Tests\PHPUnit\ClassStructure;
 
 
 use Yaoi\Schema\Exception;
@@ -32,7 +32,7 @@ public function testSample()
     public function testSampleInvalid()
     {
         $schema = SampleStructure::makeSchema();
-        $this->setExpectedException(get_class(new Exception()), 'String required (Properties:recursion->Properties:propOne)');
+        $this->setExpectedException(get_class(new Exception()), 'String required (properties:recursion->properties:propOne)');
         $schema->import(array(
             'propOne' => '1',
             'propTwo' => 2,
diff --git a/tests/src/PHPUnit/CodeBuilder/CodeBuilderTest.php b/tests/src/PHPUnit/CodeBuilder/CodeBuilderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yaoi\Schema\Tests\CodeBuilder;
+namespace Yaoi\Schema\Tests\PHPUnit\CodeBuilder;
 
 use Yaoi\Schema\CodeBuilder\PHPCodeBuilder;
 use Yaoi\Schema\Schema;
diff --git a/tests/src/PHPUnit/RefTest.php b/tests/src/PHPUnit/RefTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yaoi\Schema\Tests;
+namespace Yaoi\Schema\Tests\PHPUnit;
 
 
 use Yaoi\Schema\Schema;
diff --git a/tests/src/PHPUnit/ReimportTest.php b/tests/src/PHPUnit/ReimportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yaoi\Schema\Tests;
+namespace Yaoi\Schema\Tests\PHPUnit;
 
 use Yaoi\Schema\Constraint\Properties;
 use Yaoi\Schema\Schema;
diff --git a/tests/src/PHPUnit/Schema/CreateTest.php b/tests/src/PHPUnit/Schema/CreateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yaoi\Schema\Tests\Schema;
+namespace Yaoi\Schema\Tests\PHPUnit\Schema;
 
 
 use Yaoi\Schema\Schema;
diff --git a/tests/src/PHPUnit/Schema/ParentFixedTest.php b/tests/src/PHPUnit/Schema/ParentFixedTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yaoi\Schema\Tests\Schema;
+namespace Yaoi\Schema\Tests\PHPUnit\Schema;
 
 
 use Yaoi\Schema\Tests\Helper\LevelOneClass;
diff --git a/tests/src/PHPUnit/Schema/ParentSymbolicTest.php b/tests/src/PHPUnit/Schema/ParentSymbolicTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yaoi\Schema\Tests\Schema;
+namespace Yaoi\Schema\Tests\PHPUnit\Schema;
 
 
 use Yaoi\Schema\Constraint\Properties;
diff --git a/tests/src/PHPUnit/Schema/ParentTest.php b/tests/src/PHPUnit/Schema/ParentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yaoi\Schema\Tests\Schema;
+namespace Yaoi\Schema\Tests\PHPUnit\Schema;
 
 
 use Yaoi\Schema\Exception;
@@ -57,7 +57,7 @@ public function testParent()
     public function testInvalidImport()
     {
         $schema = $this->deepSchema();
-        $this->setExpectedException(get_class(new Exception()), 'Integer required (Properties:level1->Properties:level2->Properties:level3)',
+        $this->setExpectedException(get_class(new Exception()), 'Integer required (properties:level1->properties:level2->properties:level3)',
             Exception::INVALID_VALUE);
         try {
             $object = $schema->import(array(
@@ -69,7 +69,7 @@ public function testInvalidImport()
             ));
         }
         catch (Exception $exception) {
-            $this->assertSame(array('Properties:level1', 'Properties:level2', 'Properties:level3'), $exception->getStructureTrace());
+            $this->assertSame(array('properties:level1', 'properties:level2', 'properties:level3'), $exception->getStructureTrace());
             throw $exception;
         }
         //$this->assertSame('abc', $object->level1->level2->level3);
diff --git a/tests/src/PHPUnit/StringTest.php b/tests/src/PHPUnit/StringTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yaoi\Schema\Tests;
+namespace Yaoi\Schema\Tests\PHPUnit;
 
 
 use Yaoi\Schema\Exception;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# yaoi schema`
	`2`	`+`
	`3`	`+JSON-schema inspired PHP versatile structures.`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`>`
`14`	`14`	`<testsuites>`
`15`	`15`	`<testsuite name="Yaoi PHP Schema Test Suite">`
`16`		`- <directory>./tests/PHPUnit/</directory>`
	`16`	`+ <directory>./tests/src/PHPUnit/</directory>`
`17`	`17`	`</testsuite>`
`18`	`18`	`</testsuites>`
`19`	`19`	`<filter>`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ public function getPhpDocType(Schema $schema)`
`73`	`73`	`return 'object';`
`74`	`74`	`}`
`75`	`75`
`76`		`- print_r($schema->getPath());`
`77`		`- print_r($schema->getSchemaData());`
	`76`	`+ //print_r($schema->getPath());`
	`77`	`+ //print_r($schema->getSchemaData());`
`78`	`78`	`throw new Exception("Please im");`
`79`	`79`	`return '';`
`80`	`80`	`}`
`@@ -165,7 +165,7 @@ public function makeClassName($tracePath)`
`165`	`165`
`166`	`166`	`public function storeToDisk($srcPath)`
`167`	`167`	`{`
`168`		`- print_r($this->classes);`
	`168`	`+ //print_r($this->classes);`
`169`	`169`
`170`	`170`	`}`
`171`	`171`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function import($data)`
`24`	`24`	`$result->$name = $property->import($data[$name]);`
`25`	`25`	`}`
`26`	`26`	`catch (Exception $exception) {`
`27`		`- $exception->pushStructureTrace('Properties:' . $name);`
	`27`	`+ $exception->pushStructureTrace('properties:' . $name);`
`28`	`28`	`throw $exception;`
`29`	`29`	`}`
`30`	`30`	`unset($data[$name]);`
`@@ -38,7 +38,7 @@ public function import($data)`
`38`	`38`	`$result->$name = $additionalProperties->propertiesSchema->import($value);`
`39`	`39`	`}`
`40`	`40`	`catch (Exception $exception) {`
`41`		`- $exception->pushStructureTrace('AdditionalProperties:' . $name);`
	`41`	`+ $exception->pushStructureTrace('additionalProperties:' . $name);`
`42`	`42`	`throw $exception;`
`43`	`43`	`}`
`44`	`44`	`unset($data[$name]);`