Merge pull request #148 from ARCANEDEV/update-github_actions

Using GitHub Actions for testing
ARCANEDEV · Feb 5, 2020 · 373aa76 · 373aa76
2 parents 4c5588b + f1889c7
commit 373aa76
Show file tree

Hide file tree

Showing 58 changed files with 560 additions and 306 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -7,6 +7,5 @@
 .gitattributes    export-ignore
 .gitignore        export-ignore
 .scrutinizer.yml  export-ignore
-.travis.yml       export-ignore
 phpunit.xml.dist  export-ignore
 CONTRIBUTING.md   export-ignore
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -0,0 +1,46 @@
+name: run-tests
+
+on: [push]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [7.2, 7.3, 7.4]
+        laravel: [6.*]
+        dependency-version: [prefer-lowest, prefer-stable]
+
+    name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+
+      - name: Cache dependencies
+        uses: actions/cache@v1
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v1
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv, intl
+          coverage: xdebug
+
+      - name: Install dependencies
+        run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+
+      - name: Execute tests
+        run: |
+          mkdir -p build/logs
+          vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+
+      - name: Scrutinizer CI
+        run: |
+          wget https://scrutinizer-ci.com/ocular.phar
+          php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -21,8 +21,8 @@ checks:
 
 tools:
     external_code_coverage:
-        timeout: 1200
-        runs: 2
+        timeout: 600
+        runs: 6
     php_code_sniffer:
         enabled: true
         config:

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Localization [![Packagist License][badge_license]](LICENSE.md) [![For Laravel][badge_laravel]][link-github-repo]
 
-[![Travis Status][badge_build]][link-travis]
+[![Github Workflow Status][badge_build]][link-github-status]
 [![Coverage Status][badge_coverage]][link-scrutinizer]
 [![Scrutinizer Code Quality][badge_quality]][link-scrutinizer]
 [![SensioLabs Insight][badge_insight]][link-insight]
@@ -53,7 +53,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
 
 [badge_license]:   http://img.shields.io/packagist/l/arcanedev/localization.svg?style=flat-square
 [badge_laravel]:   https://img.shields.io/badge/Laravel-5.x%20|%206.x-orange.svg?style=flat-square
-[badge_build]:     http://img.shields.io/travis/ARCANEDEV/Localization.svg?style=flat-square
+[badge_build]:     https://img.shields.io/github/workflow/status/ARCANEDEV/Localization/run-tests?style=flat-square
 [badge_coverage]:  https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/Localization.svg?style=flat-square
 [badge_quality]:   https://img.shields.io/scrutinizer/g/ARCANEDEV/Localization.svg?style=flat-square
 [badge_insight]:   https://img.shields.io/sensiolabs/i/30a231b2-295e-466a-8733-fe95cf2bc48d.svg?style=flat-square
@@ -64,9 +64,9 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
 
 [link-author]:        https://github.com/arcanedev-maroc
 [link-github-repo]:   https://github.com/ARCANEDEV/Localization
+[link-github-status]: https://github.com/ARCANEDEV/localization/actions
 [link-github-issues]: https://github.com/ARCANEDEV/Localization/issues
 [link-contributors]:  https://github.com/ARCANEDEV/Localization/graphs/contributors
 [link-packagist]:     https://packagist.org/packages/arcanedev/localization
-[link-travis]:        https://travis-ci.org/ARCANEDEV/Localization
 [link-scrutinizer]:   https://scrutinizer-ci.com/g/ARCANEDEV/Localization/?branch=master
 [link-insight]:       https://insight.sensiolabs.com/projects/30a231b2-295e-466a-8733-fe95cf2bc48d
diff --git a/composer.json b/composer.json
@@ -16,11 +16,12 @@
     "require": {
         "php":               ">=7.2.0",
         "ext-json":          "*",
-        "arcanedev/support": "^5.0"
+        "arcanedev/support": "^5.1"
     },
     "require-dev": {
+        "ext-intl":            "*",
         "orchestra/testbench": "^4.0",
-        "mockery/mockery":     "^1.0",
+        "mockery/mockery":     "^1.3.1",
         "phpunit/phpcov":      "^6.0",
         "phpunit/phpunit":     "^8.0"
     },

diff --git a/helpers.php b/helpers.php
@@ -1,14 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
+use Arcanedev\Localization\Contracts\Localization;
+
 if ( ! function_exists('localization')) {
     /**
      * Get the Localization instance.
      *
      * @return Arcanedev\Localization\Contracts\Localization
      */
-    function localization()
+    function localization(): Localization
     {
-        return app(Arcanedev\Localization\Contracts\Localization::class);
+        return app(Localization::class);
     }
 }
 

diff --git a/src/Contracts/LocalesManager.php b/src/Contracts/LocalesManager.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\Localization\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\Localization\Contracts;
 
 /**
  * Interface  LocalesManager
@@ -34,7 +38,7 @@ public function getDefaultLocale();
      *
      * @param  string  $defaultLocale
      *
-     * @return self
+     * @return $this
      */
     public function setDefaultLocale($defaultLocale = null);
 
@@ -50,7 +54,7 @@ public function getCurrentLocale();
      *
      * @param  string  $currentLocale
      *
-     * @return self
+     * @return $this
      */
     public function setCurrentLocale($currentLocale);
 
@@ -87,7 +91,7 @@ public function getSupportedLocalesKeys();
      *
      * @param  array  $supportedLocales
      *
-     * @return self
+     * @return $this
      */
     public function setSupportedLocales(array $supportedLocales);
 

diff --git a/src/Contracts/Localization.php b/src/Contracts/Localization.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\Localization\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\Localization\Contracts;
 
 use Illuminate\Http\Request;
 
@@ -114,6 +118,8 @@ public function setLocale($locale = null);
      * Sets the base url for the site.
      *
      * @param  string  $url
+     *
+     * @return $this
      */
     public function setBaseUrl($url);
 

diff --git a/src/Contracts/Negotiator.php b/src/Contracts/Negotiator.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\Localization\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\Localization\Contracts;
 
 use Arcanedev\Localization\Entities\LocaleCollection;
 use Illuminate\Http\Request;

diff --git a/src/Contracts/RouteBindable.php b/src/Contracts/RouteBindable.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\Localization\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\Localization\Contracts;
 
 /**
  * Interface  RouteBindable

diff --git a/src/Contracts/RouteTranslator.php b/src/Contracts/RouteTranslator.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\Localization\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\Localization\Contracts;
 
 use Arcanedev\Localization\Entities\LocaleCollection;
 

diff --git a/src/Contracts/Url.php b/src/Contracts/Url.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\Localization\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\Localization\Contracts;
 
 /**
  * Interface  Url

diff --git a/src/Entities/Locale.php b/src/Entities/Locale.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\Localization\Entities;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\Localization\Entities;
 
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
@@ -115,7 +119,7 @@ public function key()
      *
      * @param  string  $key
      *
-     * @return self
+     * @return $this
      */
     private function setKey($key)
     {
@@ -140,7 +144,7 @@ public function name()
      *
      * @param  string  $name
      *
-     * @return self
+     * @return $this
      */
     private function setName($name)
     {
@@ -164,7 +168,7 @@ public function script()
      *
      * @param  string  $script
      *
-     * @return self
+     * @return $this
      */
     private function setScript($script)
     {
@@ -194,7 +198,7 @@ public function direction()
      *
      * @param  string  $direction
      *
-     * @return self
+     * @return $this
      */
     private function setDirection($direction)
     {
@@ -219,7 +223,7 @@ public function native()
      *
      * @param  string  $native
      *
-     * @return self
+     * @return $this
      */
     private function setNative($native)
     {
@@ -243,7 +247,7 @@ public function regional()
      *
      * @param  string  $regional
      *
-     * @return self
+     * @return $this
      */
     private function setRegional($regional)
     {
@@ -265,7 +269,7 @@ public function isDefault()
     /**
      * Set locale default.
      *
-     * @return self
+     * @return $this
      */
     private function setDefault()
     {
@@ -285,7 +289,7 @@ private function setDefault()
      * @param  string  $key
      * @param  array   $data
      *
-     * @return self
+     * @return $this
      */
     public static function make($key, array $data)
     {

diff --git a/src/Entities/LocaleCollection.php b/src/Entities/LocaleCollection.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\Localization\Entities;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\Localization\Entities;
 
 use Illuminate\Support\Collection;
 
@@ -32,7 +36,7 @@ class LocaleCollection extends Collection
      *
      * @param  array  $supported
      *
-     * @return self
+     * @return $this
      */
     public function setSupportedKeys(array $supported)
     {
@@ -88,7 +92,7 @@ public function toNative()
     /**
      * Load from config.
      *
-     * @return self
+     * @return $this
      */
     public function loadFromConfig()
     {
@@ -101,7 +105,7 @@ public function loadFromConfig()
      *
      * @param  array  $locales
      *
-     * @return self
+     * @return $this
      */
     public function loadFromArray(array $locales)
     {

diff --git a/src/Entities/SupportedLocaleCollection.php b/src/Entities/SupportedLocaleCollection.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\Localization\Entities;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\Localization\Entities;
 
 use Illuminate\Support\Collection;
 

diff --git a/src/Events/TranslationHasBeenSet.php b/src/Events/TranslationHasBeenSet.php
@@ -1,6 +1,8 @@
-<?php namespace Arcanedev\Localization\Events;
+<?php
 
-use Illuminate\Database\Eloquent\Model;
+declare(strict_types=1);
+
+namespace Arcanedev\Localization\Events;
 
 /**
  * Class     TranslationHasBeenSet

diff --git a/src/Exceptions/InvalidTranslationException.php b/src/Exceptions/InvalidTranslationException.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\Localization\Exceptions;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\Localization\Exceptions;
 
 /**
  * Class     InvalidTranslationException