Enable tests in CodingStyle directory (#4340)

* Enable tests in CodingStyle directory * Enable PHP short open tags in TravisCI * Fix phpunit.xml indentation * Use HHVM-specific ini file * Check hhvm.enable_short_tags instead of short_open_tag on HHVM
concretecms · Sep 5, 2016 · 336b6ba · 336b6ba
1 parent 9927528
commit 336b6ba
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,7 @@ matrix:
     - php: nightly
 
 before_script:
+  - if [[ $TRAVIS_PHP_VERSION = hhvm ]]; then cat tests/travis.hhvm.ini >> /etc/hhvm/php.ini; else phpenv config-add tests/travis.php.ini; fi
   - travis_retry composer install --no-interaction
   - mysql -e "SET GLOBAL sql_mode = 'STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY'"
   - phpunit --version

diff --git a/phpunit.xml b/phpunit.xml
@@ -8,11 +8,12 @@
         backupStaticAttributes="false">
     <testsuites>
         <testsuite name="Tests">
-            <directory>tests/tests/Core/</directory>
             <directory>tests/tests/Asset/</directory>
-            <directory>tests/tests/Block/</directory>
             <directory>tests/tests/Attribute/</directory>
             <directory>tests/tests/AttributeValue/</directory>
+            <directory>tests/tests/Block/</directory>
+            <directory>tests/tests/CodingStyle/</directory>
+            <directory>tests/tests/Core/</directory>
             <directory>tests/tests/Localization/</directory>
         </testsuite>
     </testsuites>

diff --git a/tests/tests/CodingStyle/NoShortTagsTest.php b/tests/tests/CodingStyle/NoShortTagsTest.php
@@ -8,7 +8,11 @@ class NoShortTagsTest extends \Concrete\Tests\CodingStyleTestCase
      */
     public function testNoShortTags($phpFile)
     {
-        $sot = ini_get('short_open_tag');
+        if (defined('HHVM_VERSION')) {
+            $sot = ini_get('hhvm.enable_short_tags');
+        } else {
+            $sot = ini_get('short_open_tag');
+        }
         if (empty($sot)) {
             static::markTestSkipped('short_open_tag must be enabled in order to run the test '.__CLASS__.'::'.__FUNCTION__);
 

diff --git a/tests/travis.hhvm.ini b/tests/travis.hhvm.ini
@@ -0,0 +1 @@
+hhvm.enable_short_tags = On
diff --git a/tests/travis.php.ini b/tests/travis.php.ini
@@ -0,0 +1 @@
+short_open_tag = On