bump deps, coveralls chg, use expectException

Use expectException as phpunit 6 removed setExpectedException method after it had been declared deprecated before. bumping deps lead to coveralls not having the binary for coverage report sending on travisci run anymore, thus I changed that to wget the binary instead on CI and removed the dev-dependency to coveralls from composer. refs #30
honeybee · Jan 30, 2018 · 262d2b5 · 262d2b5
1 parent 46efa5a
commit 262d2b5
Show file tree

Hide file tree

Showing 19 changed files with 603 additions and 722 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,14 +6,17 @@ php:
   - 7.1
   - 7.2
 
+before_install:
+  - travis_retry wget "https://github.com/php-coveralls/php-coveralls/releases/download/v2.0.0/php-coveralls.phar" --output-document="${HOME}/bin/php-coveralls" && chmod u+x "${HOME}/bin/php-coveralls"
+
 before_script:
   - composer install
 
 script:
   - composer build
 
 after_script:
-- php vendor/bin/coveralls -v
+- bin/php-coveralls -v
 
 notifications:
   irc:

diff --git a/composer.json b/composer.json
@@ -48,11 +48,10 @@
         "twig/twig": "^1.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^5.7 || ^6.0",
         "phpmd/phpmd": "^2.6",
         "squizlabs/php_codesniffer": "^2.8",
-        "mockery/mockery": "^0.9",
-        "satooshi/php-coveralls": "master@dev"
+        "mockery/mockery": "^1.0"
     },
     "autoload": {
         "psr-4": { "Trellis\\": "src/" }

diff --git a/composer.lock b/composer.lock
diff --git a/tests/CodeGen/ServiceTest.php b/tests/CodeGen/ServiceTest.php
@@ -23,7 +23,7 @@ public function testBuildSchema()
             )
         );
 
-        $codegen_service->generate($this->schema_path);
+        $this->assertNull($codegen_service->generate($this->schema_path));
         // @todo assert validity of the generated code inside the configured cache directory.
     }
 
@@ -38,8 +38,8 @@ public function testDeployMethodMove()
             )
         );
 
-        $codegen_service->generate($this->schema_path);
-        $codegen_service->deploy($this->schema_path);
+        $this->assertNull($codegen_service->generate($this->schema_path));
+        $this->assertNull($codegen_service->deploy($this->schema_path));
         // @todo assert validity of the generated code inside the configured deploy directory.
     }
 
@@ -54,8 +54,8 @@ public function testDeployMethodCopy()
             )
         );
 
-        $codegen_service->generate($this->schema_path);
-        $codegen_service->deploy($this->schema_path);
+        $this->assertNull($codegen_service->generate($this->schema_path));
+        $this->assertNull($codegen_service->deploy($this->schema_path));
         // @todo assert validity of the generated code inside the configured deploy directory.
     }
 

diff --git a/tests/Runtime/Attribute/AssetList/AssetListAttributeTest.php b/tests/Runtime/Attribute/AssetList/AssetListAttributeTest.php
@@ -166,7 +166,7 @@ public function testToNativeRoundtrip()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
         $attribute = new AssetListAttribute(
             'assetinvaliddefaultvalue',
             $this->getTypeMock(),

diff --git a/tests/Runtime/Attribute/BooleanList/BooleanListAttributeTest.php b/tests/Runtime/Attribute/BooleanList/BooleanListAttributeTest.php
@@ -47,7 +47,7 @@ public function testValueComparison()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
         $attribute = new BooleanListAttribute(
             'BooleanListInvalidDefault',
             $this->getTypeMock(),
@@ -58,7 +58,7 @@ public function testThrowsOnInvalidDefaultValueInConfig()
 
     public function testThrowsOnFunnyString()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
         $attribute = new BooleanListAttribute(
             'BooleanListInvalidDefault',
             $this->getTypeMock(),

diff --git a/tests/Runtime/Attribute/EmailList/EmailListAttributeTest.php b/tests/Runtime/Attribute/EmailList/EmailListAttributeTest.php
@@ -182,7 +182,7 @@ public function testAllowedPairsConstraintFails()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
 
         $attribute = new EmailListAttribute(
             'emailinvalidintegerdefaultvalue',
@@ -199,7 +199,7 @@ public function testThrowsOnInvalidDefaultValueInConfig()
 
     public function testThrowsOnInvalidEmailDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
 
         $attribute = new EmailListAttribute(
             'emailinvaliddefaultvalue',

diff --git a/tests/Runtime/Attribute/Float/FloatAttributeTest.php b/tests/Runtime/Attribute/Float/FloatAttributeTest.php
@@ -458,7 +458,7 @@ public function testToNativeNanRoundtrip()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
         $attribute = new FloatAttribute(
             'Floatinvaliddefaultvalue',
             $this->getTypeMock(),

diff --git a/tests/Runtime/Attribute/GeoPoint/GeoPointAttributeTest.php b/tests/Runtime/Attribute/GeoPoint/GeoPointAttributeTest.php
@@ -97,7 +97,7 @@ public function testSettingToNullAfterValidValueWasSetWorks()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
         $attribute = new GeoPointAttribute(
             'gpinvaliddefaultvalue',
             $this->getTypeMock(),

diff --git a/tests/Runtime/Attribute/GeoPoint/GeoPointTest.php b/tests/Runtime/Attribute/GeoPoint/GeoPointTest.php
@@ -44,14 +44,6 @@ public function testCreateFromPartialArrayFails()
         ]);
     }
 
-    public function testCreateWithZeroCoordsSucceeds()
-    {
-        $gp = new GeoPoint([
-            GeoPoint::PROPERTY_LONGITUDE => 0,
-            GeoPoint::PROPERTY_LATITUDE => 0
-        ]);
-    }
-
     public function testCreateWithZeroCoordsIsTreatedAsNullIsland()
     {
         $gp = new GeoPoint([

diff --git a/tests/Runtime/Attribute/HtmlLink/HtmlLinkAttributeTest.php b/tests/Runtime/Attribute/HtmlLink/HtmlLinkAttributeTest.php
@@ -71,7 +71,7 @@ public function testToNativeRoundtrip()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
         $attribute = new HtmlLinkAttribute(
             'linkinvaliddefaultvalue',
             $this->getTypeMock(),

diff --git a/tests/Runtime/Attribute/HtmlLinkList/HtmlLinkListAttributeTest.php b/tests/Runtime/Attribute/HtmlLinkList/HtmlLinkListAttributeTest.php
@@ -100,7 +100,7 @@ public function testToNativeRoundtrip()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
         $attribute = new HtmlLinkListAttribute(
             'linkinvaliddefaultvalue',
             $this->getTypeMock(),

diff --git a/tests/Runtime/Attribute/Image/ImageAttributeTest.php b/tests/Runtime/Attribute/Image/ImageAttributeTest.php
@@ -166,7 +166,7 @@ public function testToNativeRoundtrip()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
         $attribute = new ImageAttribute(
             'imageinvaliddefaultvalue',
             $this->getTypeMock(),

diff --git a/tests/Runtime/Attribute/ImageList/ImageListAttributeTest.php b/tests/Runtime/Attribute/ImageList/ImageListAttributeTest.php
@@ -171,7 +171,7 @@ public function testToNativeRoundtrip()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
         $attribute = new ImageListAttribute(
             'imageinvaliddefaultvalue',
             $this->getTypeMock(),

diff --git a/tests/Runtime/Attribute/Integer/IntegerAttributeTest.php b/tests/Runtime/Attribute/Integer/IntegerAttributeTest.php
@@ -226,7 +226,7 @@ public function testMinMaxConstraint()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
         $attribute = new IntegerAttribute(
             self::ATTR_NAME,
             $this->getTypeMock(),

diff --git a/tests/Runtime/Attribute/IntegerList/IntegerListAttributeTest.php b/tests/Runtime/Attribute/IntegerList/IntegerListAttributeTest.php
@@ -131,7 +131,7 @@ public function testMinMaxConstraint()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
         $attribute = new IntegerListAttribute(
             self::ATTR_NAME,
             $this->getTypeMock(),

diff --git a/tests/Runtime/Attribute/KeyValueList/KeyValueListAttributeTest.php b/tests/Runtime/Attribute/KeyValueList/KeyValueListAttributeTest.php
@@ -411,7 +411,7 @@ public function testAllowedPairsConstraintFails()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
 
         $attribute = new KeyValueListAttribute(
             'keyvalueinvalidintegerdefaultvalue',

diff --git a/tests/Runtime/Attribute/TextList/TextListAttributeTest.php b/tests/Runtime/Attribute/TextList/TextListAttributeTest.php
@@ -189,7 +189,7 @@ public function testAllowedValuesConstraintFails()
      */
     public function testThrowsOnInvalidDefaultValueInConfig($expected_exception, $invalid_default_value)
     {
-        $this->setExpectedException($expected_exception);
+        $this->expectException($expected_exception);
 
         $attribute = new TextListAttribute(
             'asdf',
@@ -215,7 +215,7 @@ public function testGetNullValueOnMissingDefaultValueInConfig()
     public function testThrowsOnMissingDefaultValueInConfig()
     {
         $attribute = new TextListAttribute('TextListwrongtypeargument', $this->getTypeMock());
-        $this->setExpectedException(InvalidTypeException::CLASS);
+        $this->expectException(InvalidTypeException::CLASS);
 
         $valueholder = $attribute->createValueHolder('false');
     }

diff --git a/tests/Runtime/Attribute/UrlList/UrlListAttributeTest.php b/tests/Runtime/Attribute/UrlList/UrlListAttributeTest.php
@@ -102,7 +102,7 @@ public function testMaxCountConstraint()
 
     public function testThrowsOnInvalidDefaultValueInConfig()
     {
-        $this->setExpectedException(BadValueException::CLASS);
+        $this->expectException(BadValueException::CLASS);
 
         $attribute = new UrlListAttribute(
             'urllistinvaliddefaultvalue',