From 1d23ed36cddc60aabde04ff2a87d2554fbe92658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ya=C4=9F=C4=B1zhan?= Date: Sat, 21 Nov 2020 19:29:56 +0300 Subject: [PATCH 1/4] #740 --- src/composer.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/composer.json b/src/composer.json index 3772d6ed9..1dfe1db7c 100644 --- a/src/composer.json +++ b/src/composer.json @@ -26,12 +26,9 @@ "mustangostang/spyc": "^0.6.3", "michelf/php-markdown": "1.9.0", "stripe/stripe-php": "2.1.1", - "guzzlehttp/guzzle": "*", + "guzzlehttp/guzzle": "*", "laminas/laminas-httphandlerrunner": "^1.2.0", - "fpdf/fpdf": "^1.82", - "docnet/tfpdf": "^2.2", - "setasign/fpdf": "^1.8" - + "docnet/tfpdf": "^2.2" }, "suggest": { "ext-gettext": "*" @@ -46,7 +43,7 @@ "require-dev": { "phpunit/phpunit": "^9.0", - "squizlabs/php_codesniffer": "1.*" + "squizlabs/php_codesniffer": "^2.8" }, "autoload-dev": { From 13a85f1d5d401af7a3d535e069259c56a47fc493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ya=C4=9F=C4=B1zhan?= Date: Sat, 21 Nov 2020 19:31:28 +0300 Subject: [PATCH 2/4] Update composer.lock --- src/composer.lock | 219 +++++++++++++--------------------------------- 1 file changed, 63 insertions(+), 156 deletions(-) diff --git a/src/composer.lock b/src/composer.lock index b8efe13b0..43577929f 100644 --- a/src/composer.lock +++ b/src/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": "3a3aeb893c1ef792a7355eb3b9018572", + "content-hash": "28b4af5f035ec4db05fb0f54c8d17a8e", "packages": [ { "name": "composer/ca-bundle", @@ -137,52 +137,6 @@ }, "time": "2019-01-21T10:55:00+00:00" }, - { - "name": "fpdf/fpdf", - "version": "1.82.1", - "source": { - "type": "git", - "url": "https://github.com/coreydoughty/Fpdf.git", - "reference": "a8eb66ba732813f282a935775bceb72ffd40b15d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/coreydoughty/Fpdf/zipball/a8eb66ba732813f282a935775bceb72ffd40b15d", - "reference": "a8eb66ba732813f282a935775bceb72ffd40b15d", - "shasum": "" - }, - "require": { - "php": ">=5.6.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Fpdf\\": "src/Fpdf" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Corey Doughty", - "email": "corey@doughty.ca" - } - ], - "description": "FPDF Composer Wrapper", - "homepage": "https://github.com/coreydoughty/Fpdf", - "keywords": [ - "fpdf", - "pdf", - "wrapper" - ], - "support": { - "issues": "https://github.com/coreydoughty/Fpdf/issues", - "source": "https://github.com/coreydoughty/Fpdf/tree/1.82.1" - }, - "time": "2020-02-15T12:05:43+00:00" - }, { "name": "geoip2/geoip2", "version": "v2.10.0", @@ -520,21 +474,21 @@ }, { "name": "laminas/laminas-httphandlerrunner", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "e1a5dad040e0043135e8095ee27d1fbf6fb640e1" + "reference": "e8f850bd12cb82b268ff235fe74b2df906e8bfe8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/e1a5dad040e0043135e8095ee27d1fbf6fb640e1", - "reference": "e1a5dad040e0043135e8095ee27d1fbf6fb640e1", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/e8f850bd12cb82b268ff235fe74b2df906e8bfe8", + "reference": "e8f850bd12cb82b268ff235fe74b2df906e8bfe8", "shasum": "" }, "require": { "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.1", + "php": "^7.3 || ~8.0.0", "psr/http-message": "^1.0", "psr/http-message-implementation": "^1.0", "psr/http-server-handler": "^1.0" @@ -544,15 +498,11 @@ }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-diactoros": "^1.7 || ^2.1.1", - "phpunit/phpunit": "^7.0.2" + "laminas/laminas-diactoros": "^2.1.1", + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev", - "dev-develop": "1.3.x-dev" - }, "laminas": { "config-provider": "Laminas\\HttpHandlerRunner\\ConfigProvider" } @@ -589,7 +539,7 @@ "type": "community_bridge" } ], - "time": "2020-06-03T15:52:17+00:00" + "time": "2020-11-19T17:12:59+00:00" }, { "name": "laminas/laminas-zendframework-bridge", @@ -717,16 +667,16 @@ }, { "name": "maxmind/web-service-common", - "version": "v0.8.0", + "version": "v0.8.1", "source": { "type": "git", "url": "https://github.com/maxmind/web-service-common-php.git", - "reference": "ba67d9532cfaf499bd71774b8170d05df4f75fb7" + "reference": "32f274051c543fc865e5a84d3a2c703913641ea8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/ba67d9532cfaf499bd71774b8170d05df4f75fb7", - "reference": "ba67d9532cfaf499bd71774b8170d05df4f75fb7", + "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/32f274051c543fc865e5a84d3a2c703913641ea8", + "reference": "32f274051c543fc865e5a84d3a2c703913641ea8", "shasum": "" }, "require": { @@ -761,9 +711,9 @@ "homepage": "https://github.com/maxmind/web-service-common-php", "support": { "issues": "https://github.com/maxmind/web-service-common-php/issues", - "source": "https://github.com/maxmind/web-service-common-php/tree/v0.8.0" + "source": "https://github.com/maxmind/web-service-common-php/tree/v0.8.1" }, - "time": "2020-10-01T15:28:36+00:00" + "time": "2020-11-02T17:00:53+00:00" }, { "name": "michelf/php-markdown", @@ -1253,48 +1203,6 @@ }, "time": "2019-03-08T08:55:37+00:00" }, - { - "name": "setasign/fpdf", - "version": "1.8.2", - "source": { - "type": "git", - "url": "https://github.com/Setasign/FPDF.git", - "reference": "d77904018090c17dc9f3ab6e944679a7a47e710a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDF/zipball/d77904018090c17dc9f3ab6e944679a7a47e710a", - "reference": "d77904018090c17dc9f3ab6e944679a7a47e710a", - "shasum": "" - }, - "type": "library", - "autoload": { - "classmap": [ - "fpdf.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Olivier Plathey", - "email": "oliver@fpdf.org", - "homepage": "http://fpdf.org/" - } - ], - "description": "FPDF is a PHP class which allows to generate PDF files with pure PHP. F from FPDF stands for Free: you may use it for any kind of usage and modify it to suit your needs.", - "homepage": "http://www.fpdf.org", - "keywords": [ - "fpdf", - "pdf" - ], - "support": { - "source": "https://github.com/Setasign/FPDF/tree/1.8.2" - }, - "time": "2019-12-08T10:32:10+00:00" - }, { "name": "stripe/stripe-php", "version": "v2.1.1", @@ -1656,36 +1564,31 @@ "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.3.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "f350df0268e904597e3bd9c4685c53e0e333feea" + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea", - "reference": "f350df0268e904597e3bd9c4685c53e0e333feea", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", + "doctrine/coding-standard": "^8.0", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.13", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-shim": "^0.11", - "phpunit/phpunit": "^7.0" + "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" @@ -1699,7 +1602,7 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" + "homepage": "https://ocramius.github.io/" } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", @@ -1710,7 +1613,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.3.x" + "source": "https://github.com/doctrine/instantiator/tree/1.4.0" }, "funding": [ { @@ -1726,20 +1629,20 @@ "type": "tidelift" } ], - "time": "2020-05-29T17:27:14+00:00" + "time": "2020-11-10T18:47:58+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.10.1", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5" + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5", - "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", "shasum": "" }, "require": { @@ -1776,7 +1679,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.x" + "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" }, "funding": [ { @@ -1784,7 +1687,7 @@ "type": "tidelift" } ], - "time": "2020-06-29T13:22:24+00:00" + "time": "2020-11-13T09:40:50+00:00" }, { "name": "nikic/php-parser", @@ -2180,23 +2083,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.2", + "version": "9.2.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "229099d7d69fe5044f6e464f669b1fd34f252e8d" + "reference": "6b20e2055f7c29b56cb3870b3de7cc463d7add41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/229099d7d69fe5044f6e464f669b1fd34f252e8d", - "reference": "229099d7d69fe5044f6e464f669b1fd34f252e8d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6b20e2055f7c29b56cb3870b3de7cc463d7add41", + "reference": "6b20e2055f7c29b56cb3870b3de7cc463d7add41", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.8", + "nikic/php-parser": "^4.10.2", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -2245,7 +2148,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.2" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.3" }, "funding": [ { @@ -2253,7 +2156,7 @@ "type": "github" } ], - "time": "2020-10-28T06:24:13+00:00" + "time": "2020-10-30T10:46:41+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2498,16 +2401,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.4.2", + "version": "9.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3866b2eeeed21b1b099c4bc0b7a1690ac6fd5baa" + "reference": "9fa359ff5ddaa5eb2be2bedb08a6a5787a5807ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3866b2eeeed21b1b099c4bc0b7a1690ac6fd5baa", - "reference": "3866b2eeeed21b1b099c4bc0b7a1690ac6fd5baa", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9fa359ff5ddaa5eb2be2bedb08a6a5787a5807ab", + "reference": "9fa359ff5ddaa5eb2be2bedb08a6a5787a5807ab", "shasum": "" }, "require": { @@ -2585,7 +2488,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.4.2" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.4.3" }, "funding": [ { @@ -2597,7 +2500,7 @@ "type": "github" } ], - "time": "2020-10-19T09:23:29+00:00" + "time": "2020-11-10T12:53:30+00:00" }, { "name": "sebastian/cli-parser", @@ -3565,32 +3468,35 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "1.5.6", + "version": "2.9.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "6f3e42d311b882b25b4d409d23a289f4d3b803d5" + "reference": "2acf168de78487db620ab4bc524135a13cfe6745" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6f3e42d311b882b25b4d409d23a289f4d3b803d5", - "reference": "6f3e42d311b882b25b4d409d23a289f4d3b803d5", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/2acf168de78487db620ab4bc524135a13cfe6745", + "reference": "2acf168de78487db620ab4bc524135a13cfe6745", "shasum": "" }, "require": { + "ext-simplexml": "*", "ext-tokenizer": "*", + "ext-xmlwriter": "*", "php": ">=5.1.2" }, - "suggest": { - "phpunit/php-timer": "dev-master" + "require-dev": { + "phpunit/phpunit": "~4.0" }, "bin": [ - "scripts/phpcs" + "scripts/phpcs", + "scripts/phpcbf" ], "type": "library", "extra": { "branch-alias": { - "dev-phpcs-fixer": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -3599,12 +3505,12 @@ "CodeSniffer/CLI.php", "CodeSniffer/Exception.php", "CodeSniffer/File.php", + "CodeSniffer/Fixer.php", "CodeSniffer/Report.php", "CodeSniffer/Reporting.php", "CodeSniffer/Sniff.php", "CodeSniffer/Tokens.php", "CodeSniffer/Reports/", - "CodeSniffer/CommentParser/", "CodeSniffer/Tokenizers/", "CodeSniffer/DocGenerators/", "CodeSniffer/Standards/AbstractPatternSniff.php", @@ -3630,17 +3536,18 @@ "role": "lead" } ], - "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", "homepage": "http://www.squizlabs.com/php-codesniffer", "keywords": [ "phpcs", "standards" ], "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name%5B%5D=PHP_CodeSniffer", - "source": "https://github.com/squizlabs/PHP_CodeSniffer" + "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", + "source": "https://github.com/squizlabs/PHP_CodeSniffer", + "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2014-12-04T22:32:15+00:00" + "time": "2018-11-07T22:31:41+00:00" }, { "name": "theseer/tokenizer", From 522347c5bbf14bfd873dfc705159496da08178b5 Mon Sep 17 00:00:00 2001 From: "Mr. Timothy G Webb Sr" Date: Sat, 21 Nov 2020 14:05:08 -0500 Subject: [PATCH 3/4] Update Service.php --- src/bb-modules/Servicehosting/Service.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bb-modules/Servicehosting/Service.php b/src/bb-modules/Servicehosting/Service.php index 82f7f7fd2..26a1f87f7 100644 --- a/src/bb-modules/Servicehosting/Service.php +++ b/src/bb-modules/Servicehosting/Service.php @@ -951,7 +951,7 @@ class Service implements InjectionAwareInterface $serviceDomainService = $this->di['mod_service']('Servicedomain'); foreach ($tlds as $model) { $result[] = $serviceDomainService->tldToApiArray($model); - } + } return $result; } From 2eaa5ca17464d297ef572911868b6522f8c74f10 Mon Sep 17 00:00:00 2001 From: "Mr. Timothy G Webb Sr" Date: Sat, 21 Nov 2020 14:10:59 -0500 Subject: [PATCH 4/4] Update Service.php --- src/bb-modules/Servicehosting/Service.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bb-modules/Servicehosting/Service.php b/src/bb-modules/Servicehosting/Service.php index 26a1f87f7..82f7f7fd2 100644 --- a/src/bb-modules/Servicehosting/Service.php +++ b/src/bb-modules/Servicehosting/Service.php @@ -951,7 +951,7 @@ class Service implements InjectionAwareInterface $serviceDomainService = $this->di['mod_service']('Servicedomain'); foreach ($tlds as $model) { $result[] = $serviceDomainService->tldToApiArray($model); - + } } return $result; }