Updates (#28)

* updates

* Remove Travis & StyleCI

* Update README.md

* Update README.md

.github/workflows/php-cs-fixer.yml

@@ -0,0 +1,29 @@
+name: Check & fix styling
+
+on: [push]
+
+jobs:
+    style:
+        runs-on: ubuntu-latest
+
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v1
+
+            -   name: Fix style
+                uses: docker://oskarstark/php-cs-fixer-ga
+                with:
+                    args: --config=.php_cs --allow-risky=yes
+
+            -   name: Extract branch name
+                shell: bash
+                run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+                id: extract_branch
+
+            -   name: Commit changes
+                uses: stefanzweifel/[email protected]
+                with:
+                    commit_message: Fix styling
+                    branch: ${{ steps.extract_branch.outputs.branch }}
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yml

@@ -0,0 +1,37 @@
+name: tests
+
+on:
+    push:
+    pull_request:
+    schedule:
+        - cron: '0 0 * * *'
+
+jobs:
+    tests:
+
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: true
+            matrix:
+                php: [7.4, 8.0]
+                laravel: [^7.0, ^8.0]
+
+        name: P${{ matrix.php }} - L${{ matrix.laravel }}
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v2
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  extensions: curl, dom, intl, json, libxml, mbstring, openssl, zip
+                  tools: composer:v2
+                  coverage: xdebug
+            - name: Install dependencies
+              run: |
+                  composer require "illuminate/contracts=${{ matrix.laravel }}" --no-update
+                  composer update --prefer-dist --no-interaction --no-progress
+            - name: Execute tests
+              run: vendor/bin/phpunit --coverage-text

.gitignore

@@ -1,3 +1,4 @@
 composer.lock
 vendor
 .phpunit.result.cache
+.php_cs.cache

.php_cs

@@ -0,0 +1,46 @@
+<?php
+
+$finder = Symfony\Component\Finder\Finder::create()
+    ->notPath('vendor')
+    ->in([
+        __DIR__ . '/src',
+        __DIR__ . '/config',
+        __DIR__ . '/tests',
+        __DIR__ . '/database',
+    ])
+    ->name('*.php')
+    ->notName('*.blade.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+$config = new PhpCsFixer\Config();
+$config
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+        'no_unused_imports' => true,
+        'not_operator_with_successor_space' => true,
+        'trailing_comma_in_multiline_array' => true,
+        'phpdoc_scalar' => true,
+        'unary_operator_spaces' => true,
+        'binary_operator_spaces' => true,
+        'blank_line_before_statement' => [
+            'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
+        ],
+        'phpdoc_single_line_var_spacing' => true,
+        'phpdoc_var_without_name' => true,
+        'class_attributes_separation' => [
+            'elements' => [
+                'method', 'property',
+            ],
+        ],
+        'method_argument_space' => [
+            'on_multiline' => 'ensure_fully_multiline',
+            'keep_multiple_spaces_after_comma' => true,
+        ]
+    ])
+    ->setFinder($finder);
+
+return $config;

README.md

@@ -2,7 +2,7 @@
 
 [![Latest Version on Packagist][ico-version]][link-packagist]
 [![Software License][ico-license]](LICENSE.md)
-[![Build Status][ico-travis]][link-travis]
+[![Github Actions][ico-tests]][link-tests]
 [![Total Downloads][ico-downloads]][link-downloads]
 
 Easy invoice creation for Laravel. Unlike Laravel Cashier, this package is payment gateway agnostic.
@@ -27,16 +27,6 @@ Via Composer
 $ composer require sander-van-hooft/laravel-invoicable
 ```
 
-Next, you must install the service provider if you work with Laravel 5.4:
-
-``` php
-// config/app.php
-'providers' => [
-    ...
-    SanderVanHooft\Invoicable\InvoicableServiceProvider::class,
-];
-```
-
 You can publish the migration with:
 
 ``` bash
@@ -170,11 +160,11 @@ The MIT License (MIT). Please see [License File](LICENSE.md) for more informatio
 
 [ico-version]: https://img.shields.io/packagist/v/sander-van-hooft/laravel-invoicable.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square
-[ico-travis]: https://img.shields.io/travis/sandervanhooft/laravel-invoicable/master.svg?style=flat-square
+[ico-tests]: https://github.com/sandervanhooft/laravel-invoicable/workflows/tests/badge.svg
 [ico-downloads]: https://img.shields.io/packagist/dt/sander-van-hooft/laravel-invoicable.svg?style=flat-square
 
 [link-packagist]: https://packagist.org/packages/sander-van-hooft/laravel-invoicable
-[link-travis]: https://travis-ci.org/sandervanhooft/laravel-invoicable
+[link-tests]: https://github.com/sandervanhooft/laravel-invoicable/actions
 [link-downloads]: https://packagist.org/packages/sander-van-hooft/laravel-invoicable
 [link-author]: https://github.com/sandervanhooft
 [link-contributors]: ../../contributors

composer.json

@@ -22,16 +22,17 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.4 || ^8.0",
         "ext-intl": "*",
-        "dompdf/dompdf": "^0.8.0",
-        "illuminate/support": "^5.8|^6.0|^7.0|^8.0",
-        "nesbot/carbon": "^1.22|^2.0"
+        "dompdf/dompdf": "^1.0",
+        "illuminate/support": "^7.0 || ^8.0",
+        "nesbot/carbon": "^2.0"
     },
     "require-dev": {
-        "graham-campbell/testbench": "^5.2",
-        "phpunit/phpunit": "^7.5|^8.3",
-        "squizlabs/php_codesniffer": "^3.4"
+        "graham-campbell/testbench": "^5.6",
+        "phpunit/phpunit": "^9.0",
+        "squizlabs/php_codesniffer": "^3.4",
+        "friendsofphp/php-cs-fixer": "^2.18"
     },
     "autoload": {
         "psr-4": {
@@ -45,8 +46,7 @@
     },
     "scripts": {
         "test": "phpunit",
-        "check-style": "phpcs -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
-        "fix-style": "phpcbf -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests"
+        "format": "./vendor/bin/php-cs-fixer fix --allow-risky=yes"
     },
     "extra": {
         "branch-alias": {

config/invoicable.php

@@ -4,4 +4,4 @@
     'default_currency' => 'EUR',
     'default_status' => 'concept',
     'locale' => 'nl_NL',
-];
+];

database/migrations/2017_06_17_163005_create_invoices_tables.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateInvoicesTables extends Migration
 {

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
         >
     <testsuites>
         <testsuite name="Package Test Suite">
@@ -19,4 +18,4 @@
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
     </php>
-</phpunit>
+</phpunit>

src/InvoicableServiceProvider.php

@@ -26,7 +26,7 @@ public function boot()
         ], 'config');
 
         // Publish migrations
-         $this->publishes([
+        $this->publishes([
              __DIR__.'/../database/migrations/2017_06_17_163005_create_invoices_tables.php'
              => database_path('migrations/2017_06_17_163005_create_invoices_tables.php'),
          ], 'migrations');

src/Invoice.php

@@ -35,6 +35,7 @@ public function addAmountExclTax($amount, $description, $taxPercentage = 0)
             'tax' => $tax,
             'tax_percentage' => $taxPercentage,
         ]);
+
         return $this->recalculate();
     }
 
@@ -53,6 +54,7 @@ public function addAmountInclTax($amount, $description, $taxPercentage = 0)
             'tax' => $amount - $amount / (1 + $taxPercentage),
             'tax_percentage' => $taxPercentage,
         ]);
+
         return $this->recalculate();
     }
 
@@ -65,6 +67,7 @@ public function recalculate()
         $this->total = $this->lines()->sum('amount');
         $this->tax = $this->lines()->sum('tax');
         $this->save();
+
         return $this;
     }
 
@@ -104,6 +107,7 @@ public function pdf(array $data = [])
         $dompdf = new Dompdf;
         $dompdf->loadHtml($this->view($data)->render());
         $dompdf->render();
+
         return $dompdf->output();
     }
 

src/InvoiceLine.php

@@ -3,7 +3,6 @@
 namespace SanderVanHooft\Invoicable;
 
 use Illuminate\Database\Eloquent\Model;
-use SanderVanHooft\Invoicable\Invoice;
 
 class InvoiceLine extends Model
 {

src/InvoiceReferenceGenerator.php

@@ -9,12 +9,14 @@ class InvoiceReferenceGenerator
     public static function generate()
     {
         $date = Carbon::now();
+
         return $date->format('Y-m-d') . '-' . self::generateRandomCode();
     }
 
     protected static function generateRandomCode()
     {
         $pool = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
+
         return substr(str_shuffle(str_repeat($pool, 6)), 0, 6);
     }
 }

src/MoneyFormatter.php

@@ -4,7 +4,6 @@
 
 class MoneyFormatter
 {
-
     /**
      * The current currency.
      *
@@ -33,6 +32,7 @@ public function __construct($currency = 'EUR', $locale = 'nl_NL')
     public function format($amount)
     {
         $formatter = new \NumberFormatter($this->locale, \NumberFormatter::CURRENCY);
+
         return (string) $formatter->formatCurrency($amount / 100, $this->currency);
     }
 
@@ -64,11 +64,11 @@ public function getCurrency()
         return (string) $this->currency;
     }
 
-     /**
-     * Sets the current currency
-     * @param $currency The currency (i.e. 'EUR')
-     * @return Void
-     */
+    /**
+    * Sets the current currency
+    * @param $currency The currency (i.e. 'EUR')
+    * @return Void
+    */
     public function setCurrency(string $currency)
     {
         $this->currency = $currency;

tests/AbstractTestCase.php

@@ -3,7 +3,6 @@
 namespace SanderVanHooft\Invoicable;
 
 use GrahamCampbell\TestBench\AbstractPackageTestCase;
-use SanderVanHooft\Invoicable\InvoicableServiceProvider;
 
 class AbstractTestCase extends AbstractPackageTestCase
 {
@@ -22,12 +21,9 @@ protected function getEnvironmentSetUp($app)
 
     /**
      * Get the service provider class.
-     *
-     * @param \Illuminate\Contracts\Foundation\Application $app
-     *
      * @return string
      */
-    protected function getServiceProviderClass($app)
+    protected function getServiceProviderClass()
     {
         return InvoicableServiceProvider::class;
     }

tests/CreateTestModelsTable.php

@@ -2,9 +2,9 @@
 
 namespace SanderVanHooft\Invoicable;
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateTestModelsTable extends Migration
 {