Correct test for PHP >= 7.2

zephir-lang · Nov 26, 2018 · e15e1ab · e15e1ab
1 parent 07e58f5
commit e15e1ab
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -71,27 +71,27 @@ before_script:
 script:
   - zephir --ansi
   - |
-    # Running tests
-    if [ "$(php-config --vernum)" -lt "70000" ]; then
-      test_suite="Extension_Php56"
-    elif [ "$(php-config --vernum)" -lt "70200" ]; then
-      test_suite="Extension_Php70"
-    else
-      test_suite="Extension_Php72"
-    fi
-
-    php \
-      -d extension=ext/modules/test.so \
-      vendor/bin/simple-phpunit \
-      --colors=always \
-      --bootstrap unit-tests/ext-bootstrap.php \
-      --testsuite $test_suite
-
-    php \
-      -d extension=ext/modules/test.so \
-      vendor/bin/simple-phpunit \
-      --colors=always \
-      --testsuite Zephir
+      if [ "$(php-config --vernum)" -lt "70000" ]; then
+        test_suite="Extension_Php56"
+      elif [ "$(php-config --vernum)" -lt "70200" ]; then
+        test_suite="Extension_Php70"
+      else
+        test_suite="Extension_Php72"
+      fi
+
+      php \
+        -d extension=ext/modules/test.so \
+        vendor/bin/simple-phpunit \
+        --colors=always \
+        --bootstrap unit-tests/ext-bootstrap.php \
+        --testsuite $test_suite
+
+  - |
+      php \
+        -d extension=ext/modules/test.so \
+        vendor/bin/simple-phpunit \
+        --colors=always \
+        --testsuite Zephir
 
 after_success:
   - .ci/after-success.sh

diff --git a/test/oo/ooparams.zep b/test/oo/ooparams.zep
@@ -52,7 +52,12 @@ class OoParams
 		return average;
 	}
 
-	public function setStrictName(string! name)
+	public function setStrictNameFromZephirLand()
+	{
+		return this->setStrictName(12345);
+	}
+
+	public function setStrictName(string! name) -> string
 	{
 		return name;
 	}

diff --git a/unit-tests/Extension/TypeHinting/AbstractTest.php b/unit-tests/Extension/TypeHinting/AbstractTest.php
@@ -22,8 +22,8 @@ class AbstractTest extends TestCase
      */
     public static function setUpBeforeClass()
     {
-        if (\PHP_VERSION_ID < 70000) {
-            throw new SkippedTestError('Scalar type hint are avalibale in PHP 7 only');
+        if (\PHP_VERSION_ID < 70200) {
+            throw new SkippedTestError('Scalar type hints are available since PHP 7.2');
         }
     }