Merge pull request #5122 from turbo124/v5-stable

5.1.25
2024-11-10 21:22:58 +01:00 · 2021-03-14 19:53:00 +11:00 · 2021-03-14 19:53:00 +11:00 · 6c8af1bcca
commit 6c8af1bcca
parent ef8985293d fa441e5d9d
8 changed files with 103 additions and 96 deletions
--- a/VERSION.txt
+++ b/VERSION.txt
@ -1 +1 @@
-5.1.24
+5.1.25
--- a/composer.json
+++ b/composer.json
@ -38,7 +38,7 @@
        "coconutcraig/laravel-postmark": "^2.10",
        "composer/composer": "^2",
        "czproject/git-php": "^3.17",
-        "dacastro4/laravel-gmail": "dev-master",
+        "dacastro4/laravel-gmail": "^5.1",
        "doctrine/dbal": "^2.10",
        "fideloper/proxy": "^4.2",
        "fzaninotto/faker": "^1.4",
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "d9ca08ed1ffaa0ed07c40e014a96d52a",
+    "content-hash": "113acad46f6d9eea9f9f5bd4501428d1",
    "packages": [
        {
            "name": "authorizenet/authorizenet",
@ -55,16 +55,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.173.25",
+            "version": "3.173.28",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "69e4653acf8cd855e9010ec4e0e0a7d074c77ee1"
+                "reference": "593baa5930896bb443c437032daf4016e1e3878d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/69e4653acf8cd855e9010ec4e0e0a7d074c77ee1",
-                "reference": "69e4653acf8cd855e9010ec4e0e0a7d074c77ee1",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/593baa5930896bb443c437032daf4016e1e3878d",
+                "reference": "593baa5930896bb443c437032daf4016e1e3878d",
                "shasum": ""
            },
            "require": {
@ -139,9 +139,9 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.173.25"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.173.28"
            },
-            "time": "2021-03-09T19:14:56+00:00"
+            "time": "2021-03-12T19:29:55+00:00"
        },
        {
            "name": "bacon/bacon-qr-code",
@ -1011,16 +1011,16 @@
        },
        {
            "name": "dacastro4/laravel-gmail",
-            "version": "dev-master",
+            "version": "v5.1",
            "source": {
                "type": "git",
                "url": "https://github.com/dacastro4/laravel-gmail.git",
-                "reference": "a7137e7e7aa0672ec963e4d24da6c5f22a0208c0"
+                "reference": "6d4cabe04f8cdd02b25ef73a1a489099b5e790bd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/dacastro4/laravel-gmail/zipball/a7137e7e7aa0672ec963e4d24da6c5f22a0208c0",
-                "reference": "a7137e7e7aa0672ec963e4d24da6c5f22a0208c0",
+                "url": "https://api.github.com/repos/dacastro4/laravel-gmail/zipball/6d4cabe04f8cdd02b25ef73a1a489099b5e790bd",
+                "reference": "6d4cabe04f8cdd02b25ef73a1a489099b5e790bd",
                "shasum": ""
            },
            "require": {
@ -1031,16 +1031,15 @@
                "illuminate/routing": "~5.8|^6.0|^7.0|^8.0",
                "illuminate/session": "~5.8|^6.0|^7.0|^8.0",
                "illuminate/support": "~5.8|^6.0|^7.0|^8.0",
-                "php": "^7.3|^8.0",
+                "php": "^7.2",
                "swiftmailer/swiftmailer": "~5.8|^6.0"
            },
            "require-dev": {
                "mockery/mockery": "^1.0",
-                "orchestra/testbench": "^4.0|^5.0|^6.0",
-                "phpunit/phpunit": "^8.5|^9.0",
+                "orchestra/testbench": "^4.0",
+                "phpunit/phpunit": "^8.5",
                "squizlabs/php_codesniffer": "~3.4"
            },
-            "default-branch": true,
            "type": "library",
            "extra": {
                "laravel": {
@ -1076,9 +1075,9 @@
            ],
            "support": {
                "issues": "https://github.com/dacastro4/laravel-gmail/issues",
-                "source": "https://github.com/dacastro4/laravel-gmail/tree/master"
+                "source": "https://github.com/dacastro4/laravel-gmail/tree/v5.1"
            },
-            "time": "2021-03-02T17:18:12+00:00"
+            "time": "2020-12-13T19:17:07+00:00"
        },
        {
            "name": "dasprid/enum",
@ -5447,16 +5446,16 @@
        },
        {
            "name": "phpseclib/phpseclib",
-            "version": "3.0.5",
+            "version": "3.0.6",
            "source": {
                "type": "git",
                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "7c751ea006577e4c2e83326d90c8b1e8c11b8ede"
+                "reference": "906a5fafabe5e6ba51ef3dc65b2722a677908837"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7c751ea006577e4c2e83326d90c8b1e8c11b8ede",
-                "reference": "7c751ea006577e4c2e83326d90c8b1e8c11b8ede",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/906a5fafabe5e6ba51ef3dc65b2722a677908837",
+                "reference": "906a5fafabe5e6ba51ef3dc65b2722a677908837",
                "shasum": ""
            },
            "require": {
@ -5538,7 +5537,7 @@
            ],
            "support": {
                "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.5"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.6"
            },
            "funding": [
                {
@ -5554,7 +5553,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-02-12T16:18:16+00:00"
+            "time": "2021-03-10T13:58:31+00:00"
        },
        {
            "name": "pragmarx/google2fa",
@ -6097,16 +6096,16 @@
        },
        {
            "name": "psy/psysh",
-            "version": "v0.10.6",
+            "version": "v0.10.7",
            "source": {
                "type": "git",
                "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "6f990c19f91729de8b31e639d6e204ea59f19cf3"
+                "reference": "a395af46999a12006213c0c8346c9445eb31640c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/6f990c19f91729de8b31e639d6e204ea59f19cf3",
-                "reference": "6f990c19f91729de8b31e639d6e204ea59f19cf3",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a395af46999a12006213c0c8346c9445eb31640c",
+                "reference": "a395af46999a12006213c0c8346c9445eb31640c",
                "shasum": ""
            },
            "require": {
@ -6167,9 +6166,9 @@
            ],
            "support": {
                "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.10.6"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.10.7"
            },
-            "time": "2021-01-18T15:53:43+00:00"
+            "time": "2021-03-14T02:14:56+00:00"
        },
        {
            "name": "ralouphie/getallheaders",
@ -7056,16 +7055,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v5.2.4",
+            "version": "v5.2.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "d6d0cc30d8c0fda4e7b213c20509b0159a8f4556"
+                "reference": "938ebbadae1b0a9c9d1ec313f87f9708609f1b79"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/d6d0cc30d8c0fda4e7b213c20509b0159a8f4556",
-                "reference": "d6d0cc30d8c0fda4e7b213c20509b0159a8f4556",
+                "url": "https://api.github.com/repos/symfony/console/zipball/938ebbadae1b0a9c9d1ec313f87f9708609f1b79",
+                "reference": "938ebbadae1b0a9c9d1ec313f87f9708609f1b79",
                "shasum": ""
            },
            "require": {
@ -7133,7 +7132,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v5.2.4"
+                "source": "https://github.com/symfony/console/tree/v5.2.5"
            },
            "funding": [
                {
@ -7149,7 +7148,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-02-23T10:08:49+00:00"
+            "time": "2021-03-06T13:42:15+00:00"
        },
        {
            "name": "symfony/css-selector",
@ -7879,16 +7878,16 @@
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v5.2.4",
+            "version": "v5.2.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "c452dbe4f385f030c3957821bf921b13815d6140"
+                "reference": "b8c63ef63c2364e174c3b3e0ba0bf83455f97f73"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c452dbe4f385f030c3957821bf921b13815d6140",
-                "reference": "c452dbe4f385f030c3957821bf921b13815d6140",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b8c63ef63c2364e174c3b3e0ba0bf83455f97f73",
+                "reference": "b8c63ef63c2364e174c3b3e0ba0bf83455f97f73",
                "shasum": ""
            },
            "require": {
@ -7971,7 +7970,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.2.4"
+                "source": "https://github.com/symfony/http-kernel/tree/v5.2.5"
            },
            "funding": [
                {
@ -7987,20 +7986,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-04T18:05:55+00:00"
+            "time": "2021-03-10T17:07:35+00:00"
        },
        {
            "name": "symfony/mime",
-            "version": "v5.2.4",
+            "version": "v5.2.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mime.git",
-                "reference": "5155d2fe14ef1eb150e3bdbbc1ec1455df95e9cd"
+                "reference": "554ba128f1955038b45db5e1fa7e93bfc683b139"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/5155d2fe14ef1eb150e3bdbbc1ec1455df95e9cd",
-                "reference": "5155d2fe14ef1eb150e3bdbbc1ec1455df95e9cd",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/554ba128f1955038b45db5e1fa7e93bfc683b139",
+                "reference": "554ba128f1955038b45db5e1fa7e93bfc683b139",
                "shasum": ""
            },
            "require": {
@ -8011,12 +8010,13 @@
                "symfony/polyfill-php80": "^1.15"
            },
            "conflict": {
+                "egulias/email-validator": "~3.0.0",
                "phpdocumentor/reflection-docblock": "<3.2.2",
                "phpdocumentor/type-resolver": "<1.4.0",
                "symfony/mailer": "<4.4"
            },
            "require-dev": {
-                "egulias/email-validator": "^2.1.10",
+                "egulias/email-validator": "^2.1.10|^3.1",
                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
                "symfony/dependency-injection": "^4.4|^5.0",
                "symfony/property-access": "^4.4|^5.1",
@ -8053,7 +8053,7 @@
                "mime-type"
            ],
            "support": {
-                "source": "https://github.com/symfony/mime/tree/v5.2.4"
+                "source": "https://github.com/symfony/mime/tree/v5.2.5"
            },
            "funding": [
                {
@ -8069,7 +8069,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-02-15T18:55:04+00:00"
+            "time": "2021-03-07T16:08:20+00:00"
        },
        {
            "name": "symfony/options-resolver",
@ -9352,16 +9352,16 @@
        },
        {
            "name": "symfony/translation",
-            "version": "v5.2.4",
+            "version": "v5.2.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "74b0353ab34ff4cca827a2cf909e325d96815e60"
+                "reference": "0947ab1e3aabd22a6bef393874b2555d2bb976da"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/74b0353ab34ff4cca827a2cf909e325d96815e60",
-                "reference": "74b0353ab34ff4cca827a2cf909e325d96815e60",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/0947ab1e3aabd22a6bef393874b2555d2bb976da",
+                "reference": "0947ab1e3aabd22a6bef393874b2555d2bb976da",
                "shasum": ""
            },
            "require": {
@ -9425,7 +9425,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v5.2.4"
+                "source": "https://github.com/symfony/translation/tree/v5.2.5"
            },
            "funding": [
                {
@ -9441,7 +9441,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-04T15:41:09+00:00"
+            "time": "2021-03-06T07:59:01+00:00"
        },
        {
            "name": "symfony/translation-contracts",
@ -9523,16 +9523,16 @@
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v5.2.4",
+            "version": "v5.2.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "6a81fec0628c468cf6d5c87a4d003725e040e223"
+                "reference": "002ab5a36702adf0c9a11e6d8836623253e9045e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6a81fec0628c468cf6d5c87a4d003725e040e223",
-                "reference": "6a81fec0628c468cf6d5c87a4d003725e040e223",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/002ab5a36702adf0c9a11e6d8836623253e9045e",
+                "reference": "002ab5a36702adf0c9a11e6d8836623253e9045e",
                "shasum": ""
            },
            "require": {
@ -9591,7 +9591,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.2.4"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.2.5"
            },
            "funding": [
                {
@ -9607,7 +9607,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-02-18T23:11:19+00:00"
+            "time": "2021-03-06T07:59:01+00:00"
        },
        {
            "name": "tijsverkoyen/css-to-inline-styles",
@ -11150,16 +11150,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.18.2",
+            "version": "v2.18.3",
            "source": {
                "type": "git",
                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "18f8c9d184ba777380794a389fabc179896ba913"
+                "reference": "ab99202fccff2a9f97592fbe1b5c76dd06df3513"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/18f8c9d184ba777380794a389fabc179896ba913",
-                "reference": "18f8c9d184ba777380794a389fabc179896ba913",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ab99202fccff2a9f97592fbe1b5c76dd06df3513",
+                "reference": "ab99202fccff2a9f97592fbe1b5c76dd06df3513",
                "shasum": ""
            },
            "require": {
@ -11221,6 +11221,7 @@
                    "tests/Test/IntegrationCaseFactoryInterface.php",
                    "tests/Test/InternalIntegrationCaseFactory.php",
                    "tests/Test/IsIdenticalConstraint.php",
+                    "tests/Test/TokensWithObservedTransformers.php",
                    "tests/TestCase.php"
                ]
            },
@ -11241,7 +11242,7 @@
            "description": "A tool to automatically fix PHP code style",
            "support": {
                "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
-                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.2"
+                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.3"
            },
            "funding": [
                {
@ -11249,7 +11250,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-01-26T00:22:21+00:00"
+            "time": "2021-03-10T19:39:05+00:00"
        },
        {
            "name": "hamcrest/hamcrest-php",
@ -13467,16 +13468,16 @@
        },
        {
            "name": "swagger-api/swagger-ui",
-            "version": "v3.44.1",
+            "version": "v3.45.0",
            "source": {
                "type": "git",
                "url": "https://github.com/swagger-api/swagger-ui.git",
-                "reference": "db830fbb51ba987dc9931172c891b318ba444d39"
+                "reference": "1ba7af074f97c872a64a415e0507c11cf8f3601b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/db830fbb51ba987dc9931172c891b318ba444d39",
-                "reference": "db830fbb51ba987dc9931172c891b318ba444d39",
+                "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/1ba7af074f97c872a64a415e0507c11cf8f3601b",
+                "reference": "1ba7af074f97c872a64a415e0507c11cf8f3601b",
                "shasum": ""
            },
            "type": "library",
@ -13522,9 +13523,9 @@
            ],
            "support": {
                "issues": "https://github.com/swagger-api/swagger-ui/issues",
-                "source": "https://github.com/swagger-api/swagger-ui/tree/v3.44.1"
+                "source": "https://github.com/swagger-api/swagger-ui/tree/v3.45.0"
            },
-            "time": "2021-03-04T18:13:06+00:00"
+            "time": "2021-03-11T17:20:14+00:00"
        },
        {
            "name": "symfony/debug",
@ -13727,16 +13728,16 @@
        },
        {
            "name": "symfony/yaml",
-            "version": "v5.2.4",
+            "version": "v5.2.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",
-                "reference": "7d6ae0cce3c33965af681a4355f1c4de326ed277"
+                "reference": "298a08ddda623485208506fcee08817807a251dd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/7d6ae0cce3c33965af681a4355f1c4de326ed277",
-                "reference": "7d6ae0cce3c33965af681a4355f1c4de326ed277",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/298a08ddda623485208506fcee08817807a251dd",
+                "reference": "298a08ddda623485208506fcee08817807a251dd",
                "shasum": ""
            },
            "require": {
@ -13782,7 +13783,7 @@
            "description": "Loads and dumps YAML files",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/yaml/tree/v5.2.4"
+                "source": "https://github.com/symfony/yaml/tree/v5.2.5"
            },
            "funding": [
                {
@ -13798,7 +13799,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-02-22T15:48:39+00:00"
+            "time": "2021-03-06T07:59:01+00:00"
        },
        {
            "name": "theseer/tokenizer",
@ -14080,7 +14081,6 @@
    "aliases": [],
    "minimum-stability": "dev",
    "stability-flags": {
-        "dacastro4/laravel-gmail": 20,
        "webpatser/laravel-countries": 20
    },
    "prefer-stable": true,
--- a/config/ninja.php
+++ b/config/ninja.php
@ -13,7 +13,7 @@ return [
    'require_https' => env('REQUIRE_HTTPS', true),
    'app_url' => rtrim(env('APP_URL', ''), '/'),
    'app_domain' => env('APP_DOMAIN', ''),
-    'app_version' => '5.1.24',
+    'app_version' => '5.1.25',
    'minimum_client_version' => '5.0.16',
    'terms_version' => '1.0.1',
    'api_secret' => env('API_SECRET', false),
--- a/resources/views/email/admin/generic.blade.php
+++ b/resources/views/email/admin/generic.blade.php
@ -22,10 +22,6 @@
        @lang($button)
    @endcomponent

-    @slot('signature')
-        {{ $signature }}
-    @endslot
-
    @if(isset($whitelabel) && !$whitelabel)
        @slot('footer')
            @component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '&copy; InvoiceNinja'])
--- a/resources/views/email/template/dark.blade.php
+++ b/resources/views/email/template/dark.blade.php
@ -6,10 +6,12 @@

    {!! $body !!}

-    @slot('below_card')
-        @if($signature)
-            {{ $signature }}
-        @endif
-    @endslot
+@if($signature)
+<br>
+<br>
+<p>
+    {{ $signature }}
+</p>
+@endif

@endcomponent
--- a/resources/views/email/template/light.blade.php
+++ b/resources/views/email/template/light.blade.php
@ -6,10 +6,12 @@

 {!! $body !!}

-@slot('below_card')
-    @if($signature)
-        {{ $signature }}
-    @endif
-@endslot
+@if($signature)
+<br>
+<br>
+<p>
+    {{ $signature }}
+</p>
+@endif

@endcomponent
--- a/resources/views/email/template/plain.blade.php
+++ b/resources/views/email/template/plain.blade.php
@ -24,6 +24,13 @@
                        </table>
                    </td>
                </tr>
+                @if($signature)
+                    <tr>
+                        <td>
+                            <p>{{ $signature }}</p>
+                        </td>
+                    </tr>
+                @endif
                <tr>
                    @isset($whitelabel)
                        @if(!$whitelabel)
 @ -1 +1 @@
 .1.24
 .1.25