Merge pull request #38 from harikt/3x81

Remove phpunit from require-dev
auraphp · Jan 28, 2022 · 37859a8 · 37859a8
2 parents fbe8ee2 + 6d1b17c
commit 37859a8
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 105 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -0,0 +1,53 @@
+name: Continuous Integration
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        operating-system:
+          - ubuntu-latest
+        php-version:
+          - '5.6'
+          - '7.0'
+          - '7.1'
+          - '7.2'
+          - '7.3'
+          - '7.4'
+          - '8.0'
+          - '8.1'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: Setup PHP ${{ matrix.php-version }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          coverage: none
+          tools: none
+          ini-values: assert.exception=1, zend.assertions=1
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-interaction --prefer-dist
+
+      - name: Run test suite
+        run: ./vendor/bin/phpunit
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,10 +1,8 @@
+build:
+    nodes:
+        analysis:
+            tests:
+                override:
+                    - php-scrutinizer-run
 filter:
     paths: ["src/*"]
-tools:
-    external_code_coverage: true
-    php_code_coverage: true
-    php_sim: true
-    php_mess_detector: true
-    php_pdepend: true
-    php_analyzer: true
-    php_cpd: true
diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -20,7 +20,10 @@
         }
     ],
     "require": {
-        "php": "^5.6|^7.0"
+        "php": "^5.6 || ^7.0 || ^8.0"
+    },
+    "require-dev": {
+        "yoast/phpunit-polyfills": "~1.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <phpunit bootstrap="./phpunit.php">
     <testsuites>
-        <testsuite>
+        <testsuite name="Aura.Intl test suite">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>

diff --git a/tests/BasicFormatterTest.php b/tests/BasicFormatterTest.php
@@ -1,7 +1,9 @@
 <?php
 namespace Aura\Intl;
 
-class BasicFormatterTest extends \PHPUnit_Framework_TestCase
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
+class BasicFormatterTest extends TestCase
 {
     protected function newFormatter()
     {

diff --git a/tests/FormatterLocatorTest.php b/tests/FormatterLocatorTest.php
@@ -1,7 +1,9 @@
 <?php
 namespace Aura\Intl;
 
-class FormatterLocatorTest extends \PHPUnit_Framework_TestCase
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
+class FormatterLocatorTest extends TestCase
 {
     public function test__constructAndGet()
     {
@@ -31,7 +33,7 @@ public function testSetAndGet()
     public function testGet_noSuchFormatter()
     {
         $formatters = new FormatterLocator;
-        $this->setExpectedException('Aura\Intl\Exception\FormatterNotMapped');
+        $this->expectException('Aura\Intl\Exception\FormatterNotMapped');
         $formatters->get('noSuchFormatter');
     }
 }
diff --git a/tests/IntlFormatterTest.php b/tests/IntlFormatterTest.php
@@ -8,7 +8,7 @@ protected function newFormatter()
         return new IntlFormatter;
     }
 
-    public function setUp()
+    public function set_up()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('This test is skipped if the Intl Extension is not loaded.');
@@ -17,7 +17,7 @@ public function setUp()
 
     public function testIntlVersion()
     {
-        $this->setExpectedException('Aura\Intl\Exception\IcuVersionTooLow');
+        $this->expectException('Aura\Intl\Exception\IcuVersionTooLow');
         $formatter = new IntlFormatter('4.7');
     }
 
@@ -139,7 +139,7 @@ public function testFormat_cannotInstantiateFormatter()
                 }
             }";
         $formatter = $this->newFormatter();
-        $this->setExpectedException('Aura\Intl\Exception\CannotFormat');
+        $this->expectException('Aura\Intl\Exception\CannotFormat');
         $actual = $formatter->format($locale, $string, array('gender' => 'female', 'count' => 5,  'from' => 'Alice', 'to' => 'Bob'));
     }
 
@@ -174,7 +174,7 @@ public function testEmptyStringThrowsException()
         $string = '';
         $formatter = $this->newFormatter();
         if (! defined('HHVM_VERSION')) {
-            $this->setExpectedException('Aura\Intl\Exception\CannotInstantiateFormatter');
+            $this->expectException('Aura\Intl\Exception\CannotInstantiateFormatter');
         }
         $actual = $formatter->format($locale, $string, []);
         if (defined('HHVM_VERSION')) {

diff --git a/tests/PackageLocatorTest.php b/tests/PackageLocatorTest.php
@@ -1,17 +1,19 @@
 <?php
 namespace Aura\Intl;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Test class for Package.
  * Generated by PHPUnit on 2012-10-27 at 22:46:01.
  */
-class PackageLocatorTest extends \PHPUnit_Framework_TestCase
+class PackageLocatorTest extends TestCase
 {
     protected $packages;
 
-    protected function setUp()
+    protected function set_up()
     {
-        parent::setUp();
+        parent::set_up();
         $this->packages = new PackageLocator([
             'Vendor.Foo' => [
                 'en_US' => function () {
@@ -32,7 +34,7 @@ public function testGet()
         $this->assertSame($first, $again);
 
         // try for an unregistered package
-        $this->setExpectedException('Aura\Intl\Exception');
+        $this->expectException('Aura\Intl\Exception');
         $this->packages->get('Vendor.Bar', 'en_US');
     }
 }
diff --git a/tests/PackageTest.php b/tests/PackageTest.php
@@ -1,17 +1,19 @@
 <?php
 namespace Aura\Intl;
 
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
 /**
  * Test class for Package.
  * Generated by PHPUnit on 2012-10-27 at 22:46:01.
  */
-class PackageTest extends \PHPUnit_Framework_TestCase
+class PackageTest extends TestCase
 {
     protected $package;
 
-    protected function setUp()
+    protected function set_up()
     {
-        parent::setUp();
+        parent::set_up();
         $factory = new PackageFactory;
         $this->package = $factory->newInstance([
             'fallback' => 'Vendor.Fallback',

diff --git a/tests/TranslatorLocatorFactoryTest.php b/tests/TranslatorLocatorFactoryTest.php
@@ -1,7 +1,9 @@
 <?php
 namespace Aura\Intl;
 
-class TranslatorLocatorFactoryTest extends \PHPUnit_Framework_TestCase
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
+class TranslatorLocatorFactoryTest extends TestCase
 {
     public function test__newInstance()
     {

diff --git a/tests/TranslatorLocatorTest.php b/tests/TranslatorLocatorTest.php
@@ -1,7 +1,9 @@
 <?php
 namespace Aura\Intl;
 
-class TranslatorLocatorTest extends \PHPUnit_Framework_TestCase
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
+class TranslatorLocatorTest extends TestCase
 {
     protected $factory;
 
@@ -11,7 +13,7 @@ class TranslatorLocatorTest extends \PHPUnit_Framework_TestCase
 
     protected $formatters;
 
-    protected function setUp()
+    protected function set_up()
     {
         $registry['Vendor.Package']['en_US'] = function () {
             return new \Aura\Intl\Package(
@@ -99,15 +101,15 @@ public function testIssue9()
         $this->assertSame($translator->translate('FOO'), $expect);
     }
 
-    public function testIssue9Failure()
-    {
-        $package = new Package;
-        $package->setMessages([
-            'FOO' => 'The text for "foo."',
-            'BAR' => 'The text for "bar."',
-        ]);
-        // $this->packages->set('Vendor.Package', 'en_UK', $package);
-        // $this->setExpectedException('Exception');
-        // $translator = $this->translators->get('Vendor.Package', 'en_UK');
-    }
+    // public function testIssue9Failure()
+    // {
+    //     $package = new Package;
+    //     $package->setMessages([
+    //         'FOO' => 'The text for "foo."',
+    //         'BAR' => 'The text for "bar."',
+    //     ]);
+    //     $this->packages->set('Vendor.Package', 'en_UK', $package);
+    //     $this->expectException('Exception');
+    //     $translator = $this->translators->get('Vendor.Package', 'en_UK');
+    // }
 }
diff --git a/tests/TranslatorTest.php b/tests/TranslatorTest.php
@@ -1,7 +1,9 @@
 <?php
 namespace Aura\Intl;
 
-class TranslatorTest extends \PHPUnit_Framework_TestCase
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
+class TranslatorTest extends TestCase
 {
     protected $translator;
 
@@ -28,7 +30,7 @@ protected function newTranslator(TranslatorInterface $fallback = null)
         );
     }
 
-    protected function setUp()
+    protected function set_up()
     {
         $this->factory = new TranslatorFactory;
         $this->formatter = new MockFormatter;