Merge branch 'release/4.0.0'

Author: sebastiaanluca

.travis.yml

@@ -13,6 +13,8 @@ env:
   matrix:
     - LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-lowest"
     - LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-stable"
+    - LARAVEL_VERSION="^6.0" COMPOSER_FLAGS="--prefer-lowest"
+    - LARAVEL_VERSION="^6.0" COMPOSER_FLAGS="--prefer-stable"
     - LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-lowest" MINIMUM_STABILITY="dev"
     - LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-stable" MINIMUM_STABILITY="dev"
 
@@ -34,6 +36,7 @@ install:
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
 
 script:
+  - vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
   - vendor/bin/phpunit
 
 branches:

CHANGELOG.md

@@ -6,6 +6,10 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## Unreleased
 
+## 4.0.0 (2019-08-14)
+
+- Added support for Laravel 6.0
+
 ## 3.0.0 (2019-02-27)
 
 ### Added

composer.json

@@ -19,14 +19,15 @@
         }
     ],
     "require": {
-        "laravel/framework": "5.8.*",
-        "php": "^7.2"
+        "php": "^7.2",
+        "laravel/framework": "5.8.*|^6.0"
     },
     "require-dev": {
         "kint-php/kint": "^3.1",
         "nesbot/carbon": "^1.25|^2.0",
-        "orchestra/testbench": "3.8.*",
-        "phpunit/phpunit": "^8.2"
+        "orchestra/testbench": "3.8.*|^4.0",
+        "phpunit/phpunit": "^8.3",
+        "sebastiaanluca/php-codesniffer-ruleset": "^0.4.2"
     },
     "suggest": {
         "kint-php/kint": "A powerful and modern PHP debugging tool. Required for the debug collection macros.",
@@ -56,6 +57,9 @@
         }
     },
     "scripts": {
+        "composer-validate": "@composer validate --no-check-all --strict --ansi",
+        "codesniffer-check": "vendor/bin/phpcs --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1",
+        "codesniffer-fix": "vendor/bin/phpcbf --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 || exit 0",
         "test": "vendor/bin/phpunit",
         "test-lowest": [
             "composer update --prefer-lowest --prefer-dist --no-interaction --ansi",
@@ -64,6 +68,13 @@
         "test-stable": [
             "composer update --prefer-stable --prefer-dist --no-interaction --ansi",
             "@test"
+        ],
+        "check": [
+            "@composer-validate",
+            "@codesniffer-check",
+            "@test"
         ]
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

phpcs.xml.dist

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<ruleset>
+    <arg name="basepath" value="."/>
+
+    <file>./src</file>
+    <file>./tests</file>
+
+    <rule ref="./vendor/sebastiaanluca/php-codesniffer-ruleset/ruleset.xml"/>
+</ruleset>

src/Collections/CollectionMacrosServiceProvider.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SebastiaanLuca\Helpers\Collections;
 
 use Carbon\Carbon;
@@ -10,21 +12,25 @@ class CollectionMacrosServiceProvider extends ServiceProvider
 {
     /**
      * Boot the service provider.
+     *
+     * @return void
      */
-    public function boot()
+    public function boot() : void
     {
-        /**
+        /*
          * Create Carbon instances from items in a collection.
          */
+
         Collection::macro('carbonize', function () {
             return collect($this->items)->map(function ($time) {
                 return new Carbon($time);
             });
         });
 
-        /**
+        /*
          * Reduce each collection item to the value found between a given start and end string.
          */
+
         Collection::macro('between', function ($start, $end = null) {
             $end = $end ?? $start;
 
@@ -37,46 +43,51 @@ public function boot()
             });
         });
 
-        /**
+        /*
          * Perform an operation on the collection's keys.
          */
+
         Collection::macro('transformKeys', function (callable $operation) {
             return collect($this->items)->mapWithKeys(function ($item, $key) use ($operation) {
                 return [$operation($key) => $item];
             });
         });
 
-        /**
+        /*
          * Transpose (flip) a collection matrix (array of arrays).
          *
          * @see https://adamwathan.me/2016/04/06/cleaning-up-form-input-with-transpose/
          */
+
         Collection::macro('transpose', function () {
             if ($this->isEmpty()) {
                 return $this;
             }
-            
+
             $items = array_map(function (...$items) {
                 return $items;
             }, ...$this->values());
 
             return new static($items);
         });
 
-        /**
+        /*
          * Transpose (flip) a collection matrix (array of arrays) while keeping its columns and row headers intact.
          *
          * Please note that a row missing a column another row does have can only occur for one column. It cannot
          * parse more than one missing column.
          */
-        Collection::macro('transposeWithKeys', function (array $rows = null) {
+
+        Collection::macro('transposeWithKeys', function (?array $rows = null) {
             if ($this->isEmpty()) {
                 return $this;
             }
-            
-            $rows = $rows ?? $this->values()->reduce(function (array $rows, array $values) {
+
+            if ($rows === null) {
+                $rows = $this->values()->reduce(function (array $rows, array $values) {
                     return array_unique(array_merge($rows, array_keys($values)));
                 }, []);
+            }
 
             $keys = $this->keys()->toArray();
 

src/Methods/helpers.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Contracts\Auth\Authenticatable;
 
 if (! function_exists('locale')) {

tests/TestCase.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SebastiaanLuca\Helpers\Tests;
 
 use Orchestra\Testbench\TestCase as OrchestraTestCase;

tests/Unit/Collections/CollectionMacrosTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SebastiaanLuca\Helpers\Tests\Unit\Collections;
 
 use Carbon\Carbon;

tests/Unit/Methods/GlobalHelpersTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SebastiaanLuca\Helpers\Tests\Unit\Methods;
 
 use Illuminate\Contracts\Auth\Authenticatable;