From 69b9c6cc1f6813b2febc687b9aa29e12b0e83bb4 Mon Sep 17 00:00:00 2001
From: "lee.5151" <lee.5151@osu.edu>
Date: Mon, 10 Jul 2023 13:10:46 -0400
Subject: [PATCH] Removing drupal/mobile_detect_twig_extensions (1.5.0)
---
composer.json | 1 -
composer.lock | 97 ++---
vendor/composer/installed.json | 104 ++----
vendor/composer/installed.php | 31 +-
vendor/doctrine/deprecations/README.md | 7 +-
vendor/doctrine/deprecations/composer.json | 20 +-
.../lib/Doctrine/Deprecations/Deprecation.php | 104 ++++--
vendor/doctrine/deprecations/phpstan.neon | 9 +
vendor/doctrine/deprecations/psalm.xml | 30 ++
.../email-validator/src/EmailLexer.php | 10 +-
vendor/egulias/email-validator/src/Parser.php | 6 +-
.../email-validator/src/Parser/Comment.php | 18 +-
.../Parser/CommentStrategy/DomainComment.php | 2 +-
.../Parser/CommentStrategy/LocalComment.php | 2 +-
.../src/Parser/DomainLiteral.php | 22 +-
.../email-validator/src/Parser/DomainPart.php | 68 ++--
.../src/Parser/DoubleQuote.php | 20 +-
.../src/Parser/FoldingWhiteSpace.php | 20 +-
.../email-validator/src/Parser/IDLeftPart.php | 2 +-
.../src/Parser/IDRightPart.php | 6 +-
.../email-validator/src/Parser/LocalPart.php | 30 +-
.../email-validator/src/Parser/PartParser.php | 6 +-
.../symfony/var-dumper/Caster/DateCaster.php | 2 +-
vendor/symfony/var-dumper/composer.json | 1 -
.../mobile_detect_twig_extensions/LICENSE.txt | 339 ------------------
.../mobile_detect_twig_extensions/README.md | 95 -----
.../composer.json | 23 --
.../mobile_detect_twig_extensions.info.yml | 10 -
.../mobile_detect_twig_extensions.module | 30 --
...mobile_detect_twig_extensions.services.yml | 8 -
.../src/Twig/MobileDetectTwigExtensions.php | 91 -----
31 files changed, 303 insertions(+), 911 deletions(-)
create mode 100644 vendor/doctrine/deprecations/phpstan.neon
create mode 100644 vendor/doctrine/deprecations/psalm.xml
delete mode 100644 web/modules/mobile_detect_twig_extensions/LICENSE.txt
delete mode 100644 web/modules/mobile_detect_twig_extensions/README.md
delete mode 100644 web/modules/mobile_detect_twig_extensions/composer.json
delete mode 100644 web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.info.yml
delete mode 100644 web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.module
delete mode 100644 web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.services.yml
delete mode 100644 web/modules/mobile_detect_twig_extensions/src/Twig/MobileDetectTwigExtensions.php
diff --git a/composer.json b/composer.json
index 70a7fd0dd5..0dc462b6d7 100644
--- a/composer.json
+++ b/composer.json
@@ -143,7 +143,6 @@
"drupal/migrate_plus": "6.0.1",
"drupal/migrate_tools": "6.0.1",
"drupal/mobile_detect": "^3.0",
- "drupal/mobile_detect_twig_extensions": "1.5",
"drupal/module_filter": "4.0.1",
"drupal/msqrole": "^1.0",
"drupal/multiple_fields_remove_button": "2.2.0",
diff --git a/composer.lock b/composer.lock
index 7d3f981610..0ec9c408c4 100644
--- 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": "e7563b426a09017f8207d3ccff7d6732",
+ "content-hash": "8b31fa26a5524a9c2f00df1a09e20fa7",
"packages": [
{
"name": "alchemy/zippy",
@@ -1416,25 +1416,29 @@
},
{
"name": "doctrine/deprecations",
- "version": "v1.0.0",
+ "version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
+ "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
+ "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
"shasum": ""
},
"require": {
- "php": "^7.1|^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^9",
- "phpunit/phpunit": "^7.5|^8.5|^9.5",
- "psr/log": "^1|^2|^3"
+ "phpstan/phpstan": "1.4.10 || 1.10.15",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "psalm/plugin-phpunit": "0.18.4",
+ "psr/log": "^1 || ^2 || ^3",
+ "vimeo/psalm": "4.30.0 || 5.12.0"
},
"suggest": {
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -1453,9 +1457,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
+ "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
},
- "time": "2022-05-02T15:47:09+00:00"
+ "time": "2023-06-03T09:27:29+00:00"
},
{
"name": "doctrine/lexer",
@@ -6106,54 +6110,6 @@
"irc": "irc://irc.freenode.org/drupal-contribute"
}
},
- {
- "name": "drupal/mobile_detect_twig_extensions",
- "version": "1.5.0",
- "source": {
- "type": "git",
- "url": "https://git.drupalcode.org/project/mobile_detect_twig_extensions.git",
- "reference": "8.x-1.5"
- },
- "dist": {
- "type": "zip",
- "url": "https://ftp.drupal.org/files/projects/mobile_detect_twig_extensions-8.x-1.5.zip",
- "reference": "8.x-1.5",
- "shasum": "17a8ea3cae0b2b45c53281efe15b4eb484bbbbeb"
- },
- "require": {
- "drupal/core": "^8 || ^9",
- "mobiledetect/mobiledetectlib": "^2.8"
- },
- "type": "drupal-module",
- "extra": {
- "drupal": {
- "version": "8.x-1.5",
- "datestamp": "1599481461",
- "security-coverage": {
- "status": "covered",
- "message": "Covered by Drupal's security advisory policy"
- }
- }
- },
- "notification-url": "https://packages.drupal.org/8/downloads",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "Antonio Javier Martinez Muro (nonom)",
- "homepage": "https://www.drupal.org/u/nonom",
- "role": "Maintainer"
- }
- ],
- "description": "This module uses the Mobile_Detect library and add a few twig extensions to work with.",
- "homepage": "https://drupal.org/project/mobile_detect_twig_extensions",
- "support": {
- "source": "https://cgit.drupalcode.org/mobile_detect_twig_extensions",
- "issues": "https://drupal.org/project/issues/mobile_detect_twig_extensions",
- "irc": "irc://irc.freenode.org/drupal-contribute"
- }
- },
{
"name": "drupal/module_filter",
"version": "4.0.1",
@@ -8627,16 +8583,16 @@
},
{
"name": "egulias/email-validator",
- "version": "3.2.5",
+ "version": "3.2.6",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "b531a2311709443320c786feb4519cfaf94af796"
+ "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796",
- "reference": "b531a2311709443320c786feb4519cfaf94af796",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7",
+ "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7",
"shasum": ""
},
"require": {
@@ -8682,7 +8638,7 @@
],
"support": {
"issues": "https://github.com/egulias/EmailValidator/issues",
- "source": "https://github.com/egulias/EmailValidator/tree/3.2.5"
+ "source": "https://github.com/egulias/EmailValidator/tree/3.2.6"
},
"funding": [
{
@@ -8690,7 +8646,7 @@
"type": "github"
}
],
- "time": "2023-01-02T17:26:14+00:00"
+ "time": "2023-06-01T07:04:22+00:00"
},
{
"name": "enlightn/security-checker",
@@ -16085,16 +16041,16 @@
},
{
"name": "symfony/var-dumper",
- "version": "v5.4.23",
+ "version": "v5.4.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "9a8a5b6d6508928174ded2109e29328a55342a42"
+ "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9a8a5b6d6508928174ded2109e29328a55342a42",
- "reference": "9a8a5b6d6508928174ded2109e29328a55342a42",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82269f73c0f0f9859ab9b6900eebacbe54954ede",
+ "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede",
"shasum": ""
},
"require": {
@@ -16103,7 +16059,6 @@
"symfony/polyfill-php80": "^1.16"
},
"conflict": {
- "phpunit/phpunit": "<5.4.3",
"symfony/console": "<4.4"
},
"require-dev": {
@@ -16154,7 +16109,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v5.4.23"
+ "source": "https://github.com/symfony/var-dumper/tree/v5.4.25"
},
"funding": [
{
@@ -16170,7 +16125,7 @@
"type": "tidelift"
}
],
- "time": "2023-04-18T09:26:27+00:00"
+ "time": "2023-06-20T20:56:26+00:00"
},
{
"name": "symfony/var-exporter",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 2cbb06db5d..6a9d3e04f8 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1461,31 +1461,35 @@
},
{
"name": "doctrine/deprecations",
- "version": "v1.0.0",
- "version_normalized": "1.0.0.0",
+ "version": "v1.1.1",
+ "version_normalized": "1.1.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
+ "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
+ "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
"shasum": ""
},
"require": {
- "php": "^7.1|^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^9",
- "phpunit/phpunit": "^7.5|^8.5|^9.5",
- "psr/log": "^1|^2|^3"
+ "phpstan/phpstan": "1.4.10 || 1.10.15",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "psalm/plugin-phpunit": "0.18.4",
+ "psr/log": "^1 || ^2 || ^3",
+ "vimeo/psalm": "4.30.0 || 5.12.0"
},
"suggest": {
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
},
- "time": "2022-05-02T15:47:09+00:00",
+ "time": "2023-06-03T09:27:29+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1501,7 +1505,7 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
+ "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
},
"install-path": "../doctrine/deprecations"
},
@@ -6320,57 +6324,6 @@
},
"install-path": "../../web/modules/mobile_detect"
},
- {
- "name": "drupal/mobile_detect_twig_extensions",
- "version": "1.5.0",
- "version_normalized": "1.5.0.0",
- "source": {
- "type": "git",
- "url": "https://git.drupalcode.org/project/mobile_detect_twig_extensions.git",
- "reference": "8.x-1.5"
- },
- "dist": {
- "type": "zip",
- "url": "https://ftp.drupal.org/files/projects/mobile_detect_twig_extensions-8.x-1.5.zip",
- "reference": "8.x-1.5",
- "shasum": "17a8ea3cae0b2b45c53281efe15b4eb484bbbbeb"
- },
- "require": {
- "drupal/core": "^8 || ^9",
- "mobiledetect/mobiledetectlib": "^2.8"
- },
- "type": "drupal-module",
- "extra": {
- "drupal": {
- "version": "8.x-1.5",
- "datestamp": "1599481461",
- "security-coverage": {
- "status": "covered",
- "message": "Covered by Drupal's security advisory policy"
- }
- }
- },
- "installation-source": "dist",
- "notification-url": "https://packages.drupal.org/8/downloads",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "Antonio Javier Martinez Muro (nonom)",
- "homepage": "https://www.drupal.org/u/nonom",
- "role": "Maintainer"
- }
- ],
- "description": "This module uses the Mobile_Detect library and add a few twig extensions to work with.",
- "homepage": "https://drupal.org/project/mobile_detect_twig_extensions",
- "support": {
- "source": "https://cgit.drupalcode.org/mobile_detect_twig_extensions",
- "issues": "https://drupal.org/project/issues/mobile_detect_twig_extensions",
- "irc": "irc://irc.freenode.org/drupal-contribute"
- },
- "install-path": "../../web/modules/mobile_detect_twig_extensions"
- },
{
"name": "drupal/module_filter",
"version": "4.0.1",
@@ -8947,17 +8900,17 @@
},
{
"name": "egulias/email-validator",
- "version": "3.2.5",
- "version_normalized": "3.2.5.0",
+ "version": "3.2.6",
+ "version_normalized": "3.2.6.0",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "b531a2311709443320c786feb4519cfaf94af796"
+ "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796",
- "reference": "b531a2311709443320c786feb4519cfaf94af796",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7",
+ "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7",
"shasum": ""
},
"require": {
@@ -8972,7 +8925,7 @@
"suggest": {
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
},
- "time": "2023-01-02T17:26:14+00:00",
+ "time": "2023-06-01T07:04:22+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -9005,7 +8958,7 @@
],
"support": {
"issues": "https://github.com/egulias/EmailValidator/issues",
- "source": "https://github.com/egulias/EmailValidator/tree/3.2.5"
+ "source": "https://github.com/egulias/EmailValidator/tree/3.2.6"
},
"funding": [
{
@@ -16689,17 +16642,17 @@
},
{
"name": "symfony/var-dumper",
- "version": "v5.4.23",
- "version_normalized": "5.4.23.0",
+ "version": "v5.4.25",
+ "version_normalized": "5.4.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "9a8a5b6d6508928174ded2109e29328a55342a42"
+ "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9a8a5b6d6508928174ded2109e29328a55342a42",
- "reference": "9a8a5b6d6508928174ded2109e29328a55342a42",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82269f73c0f0f9859ab9b6900eebacbe54954ede",
+ "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede",
"shasum": ""
},
"require": {
@@ -16708,7 +16661,6 @@
"symfony/polyfill-php80": "^1.16"
},
"conflict": {
- "phpunit/phpunit": "<5.4.3",
"symfony/console": "<4.4"
},
"require-dev": {
@@ -16723,7 +16675,7 @@
"ext-intl": "To show region name in time zone dump",
"symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
},
- "time": "2023-04-18T09:26:27+00:00",
+ "time": "2023-06-20T20:56:26+00:00",
"bin": [
"Resources/bin/var-dump-server"
],
@@ -16761,7 +16713,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v5.4.23"
+ "source": "https://github.com/symfony/var-dumper/tree/v5.4.25"
},
"funding": [
{
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index c11be12430..a64722136d 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'osu-asc-webservices/d8-upstream',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '8322ffc7651bab972d71fa671738ac3969b0eb9b',
+ 'reference' => '467f19657ab91922f4980095ea79aed35fa6633d',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -236,9 +236,9 @@
'dev_requirement' => false,
),
'doctrine/deprecations' => array(
- 'pretty_version' => 'v1.0.0',
- 'version' => '1.0.0.0',
- 'reference' => '0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de',
+ 'pretty_version' => 'v1.1.1',
+ 'version' => '1.1.1.0',
+ 'reference' => '612a3ee5ab0d5dd97b7cf3874a6efe24325efac3',
'type' => 'library',
'install_path' => __DIR__ . '/../doctrine/deprecations',
'aliases' => array(),
@@ -1039,15 +1039,6 @@
'aliases' => array(),
'dev_requirement' => false,
),
- 'drupal/mobile_detect_twig_extensions' => array(
- 'pretty_version' => '1.5.0',
- 'version' => '1.5.0.0',
- 'reference' => '8.x-1.5',
- 'type' => 'drupal-module',
- 'install_path' => __DIR__ . '/../../web/modules/mobile_detect_twig_extensions',
- 'aliases' => array(),
- 'dev_requirement' => false,
- ),
'drupal/module_filter' => array(
'pretty_version' => '4.0.1',
'version' => '4.0.1.0',
@@ -1400,9 +1391,9 @@
'dev_requirement' => false,
),
'egulias/email-validator' => array(
- 'pretty_version' => '3.2.5',
- 'version' => '3.2.5.0',
- 'reference' => 'b531a2311709443320c786feb4519cfaf94af796',
+ 'pretty_version' => '3.2.6',
+ 'version' => '3.2.6.0',
+ 'reference' => 'e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7',
'type' => 'library',
'install_path' => __DIR__ . '/../egulias/email-validator',
'aliases' => array(),
@@ -1621,7 +1612,7 @@
'osu-asc-webservices/d8-upstream' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '8322ffc7651bab972d71fa671738ac3969b0eb9b',
+ 'reference' => '467f19657ab91922f4980095ea79aed35fa6633d',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -2523,9 +2514,9 @@
'dev_requirement' => false,
),
'symfony/var-dumper' => array(
- 'pretty_version' => 'v5.4.23',
- 'version' => '5.4.23.0',
- 'reference' => '9a8a5b6d6508928174ded2109e29328a55342a42',
+ 'pretty_version' => 'v5.4.25',
+ 'version' => '5.4.25.0',
+ 'reference' => '82269f73c0f0f9859ab9b6900eebacbe54954ede',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/var-dumper',
'aliases' => array(),
diff --git a/vendor/doctrine/deprecations/README.md b/vendor/doctrine/deprecations/README.md
index 22f0cced3e..93caf83f82 100644
--- a/vendor/doctrine/deprecations/README.md
+++ b/vendor/doctrine/deprecations/README.md
@@ -19,13 +19,16 @@ Enable Doctrine deprecations to be sent to a PSR3 logger:
```
Enable Doctrine deprecations to be sent as `@trigger_error($message, E_USER_DEPRECATED)`
-messages.
+messages by setting the `DOCTRINE_DEPRECATIONS` environment variable to `trigger`.
+Alternatively, call:
```php
\Doctrine\Deprecations\Deprecation::enableWithTriggerError();
```
-If you only want to enable deprecation tracking, without logging or calling `trigger_error` then call:
+If you only want to enable deprecation tracking, without logging or calling `trigger_error`
+then set the `DOCTRINE_DEPRECATIONS` environment variable to `track`.
+Alternatively, call:
```php
\Doctrine\Deprecations\Deprecation::enableTrackingDeprecations();
diff --git a/vendor/doctrine/deprecations/composer.json b/vendor/doctrine/deprecations/composer.json
index c79e38cdcd..f8319f9a2a 100644
--- a/vendor/doctrine/deprecations/composer.json
+++ b/vendor/doctrine/deprecations/composer.json
@@ -1,22 +1,28 @@
{
"name": "doctrine/deprecations",
- "type": "library",
"description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
- "homepage": "https://www.doctrine-project.org/",
"license": "MIT",
+ "type": "library",
+ "homepage": "https://www.doctrine-project.org/",
"require": {
- "php": "^7.1|^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^7.5|^8.5|^9.5",
- "psr/log": "^1|^2|^3",
- "doctrine/coding-standard": "^9"
+ "doctrine/coding-standard": "^9",
+ "phpstan/phpstan": "1.4.10 || 1.10.15",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "psalm/plugin-phpunit": "0.18.4",
+ "psr/log": "^1 || ^2 || ^3",
+ "vimeo/psalm": "4.30.0 || 5.12.0"
},
"suggest": {
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
},
"autoload": {
- "psr-4": {"Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"}
+ "psr-4": {
+ "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+ }
},
"autoload-dev": {
"psr-4": {
diff --git a/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php b/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php
index 1029372faa..07cb43b6ce 100644
--- a/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php
+++ b/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php
@@ -8,6 +8,7 @@
use function array_key_exists;
use function array_reduce;
+use function assert;
use function debug_backtrace;
use function sprintf;
use function strpos;
@@ -46,8 +47,8 @@ class Deprecation
private const TYPE_TRIGGER_ERROR = 2;
private const TYPE_PSR_LOGGER = 4;
- /** @var int */
- private static $type = self::TYPE_NONE;
+ /** @var int-mask-of<self::TYPE_*>|null */
+ private static $type;
/** @var LoggerInterface|null */
private static $logger;
@@ -56,6 +57,9 @@ class Deprecation
private static $ignoredPackages = [];
/** @var array<string,int> */
+ private static $triggeredDeprecations = [];
+
+ /** @var array<string,bool> */
private static $ignoredLinks = [];
/** @var bool */
@@ -68,21 +72,27 @@ class Deprecation
* deprecation. It is additionally used to de-duplicate the trigger of the
* same deprecation during a request.
*
- * @param mixed $args
+ * @param float|int|string $args
*/
public static function trigger(string $package, string $link, string $message, ...$args): void
{
- if (self::$type === self::TYPE_NONE) {
+ $type = self::$type ?? self::getTypeFromEnv();
+
+ if ($type === self::TYPE_NONE) {
+ return;
+ }
+
+ if (isset(self::$ignoredLinks[$link])) {
return;
}
- if (array_key_exists($link, self::$ignoredLinks)) {
- self::$ignoredLinks[$link]++;
+ if (array_key_exists($link, self::$triggeredDeprecations)) {
+ self::$triggeredDeprecations[$link]++;
} else {
- self::$ignoredLinks[$link] = 1;
+ self::$triggeredDeprecations[$link] = 1;
}
- if (self::$deduplication === true && self::$ignoredLinks[$link] > 1) {
+ if (self::$deduplication === true && self::$triggeredDeprecations[$link] > 1) {
return;
}
@@ -114,18 +124,20 @@ public static function trigger(string $package, string $link, string $message, .
* deprecation tracking is enabled even during deduplication, because it
* needs to call {@link debug_backtrace()}
*
- * @param mixed $args
+ * @param float|int|string $args
*/
public static function triggerIfCalledFromOutside(string $package, string $link, string $message, ...$args): void
{
- if (self::$type === self::TYPE_NONE) {
+ $type = self::$type ?? self::getTypeFromEnv();
+
+ if ($type === self::TYPE_NONE) {
return;
}
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
// first check that the caller is not from a tests folder, in which case we always let deprecations pass
- if (strpos($backtrace[1]['file'], DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR) === false) {
+ if (isset($backtrace[1]['file'], $backtrace[0]['file']) && strpos($backtrace[1]['file'], DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR) === false) {
$path = DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . $package . DIRECTORY_SEPARATOR;
if (strpos($backtrace[0]['file'], $path) === false) {
@@ -137,13 +149,17 @@ public static function triggerIfCalledFromOutside(string $package, string $link,
}
}
- if (array_key_exists($link, self::$ignoredLinks)) {
- self::$ignoredLinks[$link]++;
+ if (isset(self::$ignoredLinks[$link])) {
+ return;
+ }
+
+ if (array_key_exists($link, self::$triggeredDeprecations)) {
+ self::$triggeredDeprecations[$link]++;
} else {
- self::$ignoredLinks[$link] = 1;
+ self::$triggeredDeprecations[$link] = 1;
}
- if (self::$deduplication === true && self::$ignoredLinks[$link] > 1) {
+ if (self::$deduplication === true && self::$triggeredDeprecations[$link] > 1) {
return;
}
@@ -157,31 +173,35 @@ public static function triggerIfCalledFromOutside(string $package, string $link,
}
/**
- * @param array<mixed> $backtrace
+ * @param list<array{function: string, line?: int, file?: string, class?: class-string, type?: string, args?: mixed[], object?: object}> $backtrace
*/
private static function delegateTriggerToBackend(string $message, array $backtrace, string $link, string $package): void
{
- if ((self::$type & self::TYPE_PSR_LOGGER) > 0) {
+ $type = self::$type ?? self::getTypeFromEnv();
+
+ if (($type & self::TYPE_PSR_LOGGER) > 0) {
$context = [
- 'file' => $backtrace[0]['file'],
- 'line' => $backtrace[0]['line'],
+ 'file' => $backtrace[0]['file'] ?? null,
+ 'line' => $backtrace[0]['line'] ?? null,
'package' => $package,
'link' => $link,
];
+ assert(self::$logger !== null);
+
self::$logger->notice($message, $context);
}
- if (! ((self::$type & self::TYPE_TRIGGER_ERROR) > 0)) {
+ if (! (($type & self::TYPE_TRIGGER_ERROR) > 0)) {
return;
}
$message .= sprintf(
' (%s:%d called by %s:%d, %s, package %s)',
- self::basename($backtrace[0]['file']),
- $backtrace[0]['line'],
- self::basename($backtrace[1]['file']),
- $backtrace[1]['line'],
+ self::basename($backtrace[0]['file'] ?? 'native code'),
+ $backtrace[0]['line'] ?? 0,
+ self::basename($backtrace[1]['file'] ?? 'native code'),
+ $backtrace[1]['line'] ?? 0,
$link,
$package
);
@@ -205,16 +225,19 @@ private static function basename(string $filename): string
public static function enableTrackingDeprecations(): void
{
+ self::$type = self::$type ?? 0;
self::$type |= self::TYPE_TRACK_DEPRECATIONS;
}
public static function enableWithTriggerError(): void
{
+ self::$type = self::$type ?? 0;
self::$type |= self::TYPE_TRIGGER_ERROR;
}
public static function enableWithPsrLogger(LoggerInterface $logger): void
{
+ self::$type = self::$type ?? 0;
self::$type |= self::TYPE_PSR_LOGGER;
self::$logger = $logger;
}
@@ -229,9 +252,10 @@ public static function disable(): void
self::$type = self::TYPE_NONE;
self::$logger = null;
self::$deduplication = true;
+ self::$ignoredLinks = [];
- foreach (self::$ignoredLinks as $link => $count) {
- self::$ignoredLinks[$link] = 0;
+ foreach (self::$triggeredDeprecations as $link => $count) {
+ self::$triggeredDeprecations[$link] = 0;
}
}
@@ -243,13 +267,13 @@ public static function ignorePackage(string $packageName): void
public static function ignoreDeprecations(string ...$links): void
{
foreach ($links as $link) {
- self::$ignoredLinks[$link] = 0;
+ self::$ignoredLinks[$link] = true;
}
}
public static function getUniqueTriggeredDeprecationsCount(): int
{
- return array_reduce(self::$ignoredLinks, static function (int $carry, int $count) {
+ return array_reduce(self::$triggeredDeprecations, static function (int $carry, int $count) {
return $carry + $count;
}, 0);
}
@@ -261,6 +285,28 @@ public static function getUniqueTriggeredDeprecationsCount(): int
*/
public static function getTriggeredDeprecations(): array
{
- return self::$ignoredLinks;
+ return self::$triggeredDeprecations;
+ }
+
+ /**
+ * @return int-mask-of<self::TYPE_*>
+ */
+ private static function getTypeFromEnv(): int
+ {
+ switch ($_SERVER['DOCTRINE_DEPRECATIONS'] ?? $_ENV['DOCTRINE_DEPRECATIONS'] ?? null) {
+ case 'trigger':
+ self::$type = self::TYPE_TRIGGER_ERROR;
+ break;
+
+ case 'track':
+ self::$type = self::TYPE_TRACK_DEPRECATIONS;
+ break;
+
+ default:
+ self::$type = self::TYPE_NONE;
+ break;
+ }
+
+ return self::$type;
}
}
diff --git a/vendor/doctrine/deprecations/phpstan.neon b/vendor/doctrine/deprecations/phpstan.neon
new file mode 100644
index 0000000000..4ee286b8a7
--- /dev/null
+++ b/vendor/doctrine/deprecations/phpstan.neon
@@ -0,0 +1,9 @@
+parameters:
+ level: 6
+ paths:
+ - lib
+ - tests
+
+includes:
+ - vendor/phpstan/phpstan-phpunit/extension.neon
+ - vendor/phpstan/phpstan-phpunit/rules.neon
diff --git a/vendor/doctrine/deprecations/psalm.xml b/vendor/doctrine/deprecations/psalm.xml
new file mode 100644
index 0000000000..ad76e32e3c
--- /dev/null
+++ b/vendor/doctrine/deprecations/psalm.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<psalm
+ errorLevel="1"
+ resolveFromConfigFile="true"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="https://getpsalm.org/schema/config"
+ xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+ findUnusedBaselineEntry="true"
+ findUnusedCode="false"
+>
+ <projectFiles>
+ <directory name="lib/Doctrine/Deprecations" />
+ <directory name="tests/Doctrine/Deprecations" />
+ <ignoreFiles>
+ <directory name="vendor" />
+ </ignoreFiles>
+ </projectFiles>
+ <plugins>
+ <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
+ </plugins>
+ <issueHandlers>
+ <DeprecatedMethod>
+ <errorLevel type="suppress">
+ <!-- Remove when dropping support for PHPUnit 9.6 -->
+ <referencedMethod name="PHPUnit\Framework\TestCase::expectDeprecation"/>
+ <referencedMethod name="PHPUnit\Framework\TestCase::expectDeprecationMessage"/>
+ </errorLevel>
+ </DeprecatedMethod>
+ </issueHandlers>
+</psalm>
diff --git a/vendor/egulias/email-validator/src/EmailLexer.php b/vendor/egulias/email-validator/src/EmailLexer.php
index 6add6bd2b9..4099758ce5 100644
--- a/vendor/egulias/email-validator/src/EmailLexer.php
+++ b/vendor/egulias/email-validator/src/EmailLexer.php
@@ -213,13 +213,11 @@ public function find($type) : bool
public function moveNext() : bool
{
if ($this->hasToRecord && $this->previous === self::$nullToken) {
- $this->accumulator .= $this->token['value'];
+ $this->accumulator .= ((array) $this->token)['value'];
}
- $this->previous = $this->token instanceof Token
- ? ['value' => $this->token->value, 'type' => $this->token->type, 'position' => $this->token->position]
- : $this->token;
-
+ $this->previous = (array) $this->token;
+
if($this->lookahead === null) {
$this->lookahead = self::$nullToken;
}
@@ -227,7 +225,7 @@ public function moveNext() : bool
$hasNext = parent::moveNext();
if ($this->hasToRecord) {
- $this->accumulator .= $this->token['value'];
+ $this->accumulator .= ((array) $this->token)['value'];
}
return $hasNext;
diff --git a/vendor/egulias/email-validator/src/Parser.php b/vendor/egulias/email-validator/src/Parser.php
index b1905f9abf..4e5ac7d1f6 100644
--- a/vendor/egulias/email-validator/src/Parser.php
+++ b/vendor/egulias/email-validator/src/Parser.php
@@ -29,7 +29,7 @@ abstract protected function preLeftParsing() : Result;
public function __construct(EmailLexer $lexer)
{
- $this->lexer = $lexer;
+ $this->lexer = $lexer;
}
public function parse(string $str) : Result
@@ -51,7 +51,7 @@ public function parse(string $str) : Result
return $localPartResult;
}
- $domainPartResult = $this->parseRightFromAt();
+ $domainPartResult = $this->parseRightFromAt();
if ($domainPartResult->isInvalid()) {
return $domainPartResult;
@@ -73,6 +73,6 @@ protected function hasAtToken() : bool
$this->lexer->moveNext();
$this->lexer->moveNext();
- return $this->lexer->token['type'] !== EmailLexer::S_AT;
+ return ((array) $this->lexer->token)['type'] !== EmailLexer::S_AT;
}
}
diff --git a/vendor/egulias/email-validator/src/Parser/Comment.php b/vendor/egulias/email-validator/src/Parser/Comment.php
index d6f3032fc3..34ef97263d 100644
--- a/vendor/egulias/email-validator/src/Parser/Comment.php
+++ b/vendor/egulias/email-validator/src/Parser/Comment.php
@@ -31,15 +31,15 @@ public function __construct(EmailLexer $lexer, CommentStrategy $commentStrategy)
public function parse() : Result
{
- if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENPARENTHESIS) {
$this->openedParenthesis++;
if($this->noClosingParenthesis()) {
- return new InvalidEmail(new UnclosedComment(), $this->lexer->token['value']);
+ return new InvalidEmail(new UnclosedComment(), ((array) $this->lexer->token)['value']);
}
}
- if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
- return new InvalidEmail(new UnOpenedComment(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+ return new InvalidEmail(new UnOpenedComment(), ((array) $this->lexer->token)['value']);
}
$this->warnings[WarningComment::CODE] = new WarningComment();
@@ -58,10 +58,10 @@ public function parse() : Result
}
if($this->openedParenthesis >= 1) {
- return new InvalidEmail(new UnclosedComment(), $this->lexer->token['value']);
+ return new InvalidEmail(new UnclosedComment(), ((array) $this->lexer->token)['value']);
}
if ($this->openedParenthesis < 0) {
- return new InvalidEmail(new UnOpenedComment(), $this->lexer->token['value']);
+ return new InvalidEmail(new UnOpenedComment(), ((array) $this->lexer->token)['value']);
}
$finalValidations = $this->commentStrategy->endOfLoopValidations($this->lexer);
@@ -78,7 +78,7 @@ public function parse() : Result
private function warnEscaping() : bool
{
//Backslash found
- if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
+ if (((array) $this->lexer->token)['type'] !== EmailLexer::S_BACKSLASH) {
return false;
}
@@ -87,12 +87,12 @@ private function warnEscaping() : bool
}
$this->warnings[QuotedPart::CODE] =
- new QuotedPart($this->lexer->getPrevious()['type'], $this->lexer->token['type']);
+ new QuotedPart($this->lexer->getPrevious()['type'], ((array) $this->lexer->token)['type']);
return true;
}
- private function noClosingParenthesis() : bool
+ private function noClosingParenthesis() : bool
{
try {
$this->lexer->find(EmailLexer::S_CLOSEPARENTHESIS);
diff --git a/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php b/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php
index cbbe3f201b..17b686be1c 100644
--- a/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php
+++ b/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php
@@ -23,7 +23,7 @@ public function endOfLoopValidations(EmailLexer $lexer) : Result
{
//test for end of string
if (!$lexer->isNextToken(EmailLexer::S_DOT)) {
- return new InvalidEmail(new ExpectingATEXT('DOT not found near CLOSEPARENTHESIS'), $lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT('DOT not found near CLOSEPARENTHESIS'), ((array) $lexer->token)['value']);
}
//add warning
//Address is valid within the message but cannot be used unmodified for the envelope
diff --git a/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php b/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php
index e72319a215..179802b833 100644
--- a/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php
+++ b/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php
@@ -24,7 +24,7 @@ public function exitCondition(EmailLexer $lexer, int $openedParenthesis) : bool
public function endOfLoopValidations(EmailLexer $lexer) : Result
{
if (!$lexer->isNextToken(EmailLexer::S_AT)) {
- return new InvalidEmail(new ExpectingATEXT('ATEX is not expected after closing comments'), $lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT('ATEX is not expected after closing comments'), ((array) $lexer->token)['value']);
}
$this->warnings[CFWSNearAt::CODE] = new CFWSNearAt();
return new ValidEmail();
diff --git a/vendor/egulias/email-validator/src/Parser/DomainLiteral.php b/vendor/egulias/email-validator/src/Parser/DomainLiteral.php
index e6d66d0bd8..10486346ad 100644
--- a/vendor/egulias/email-validator/src/Parser/DomainLiteral.php
+++ b/vendor/egulias/email-validator/src/Parser/DomainLiteral.php
@@ -39,14 +39,14 @@ public function parse() : Result
$addressLiteral = '';
do {
- if ($this->lexer->token['type'] === EmailLexer::C_NUL) {
- return new InvalidEmail(new ExpectingDTEXT(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::C_NUL) {
+ return new InvalidEmail(new ExpectingDTEXT(), ((array) $this->lexer->token)['value']);
}
$this->addObsoleteWarnings();
if ($this->lexer->isNextTokenAny(array(EmailLexer::S_OPENBRACKET, EmailLexer::S_OPENBRACKET))) {
- return new InvalidEmail(new ExpectingDTEXT(), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingDTEXT(), ((array) $this->lexer->token)['value']);
}
if ($this->lexer->isNextTokenAny(
@@ -57,21 +57,21 @@ public function parse() : Result
}
if ($this->lexer->isNextToken(EmailLexer::S_CR)) {
- return new InvalidEmail(new CRNoLF(), $this->lexer->token['value']);
+ return new InvalidEmail(new CRNoLF(), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH) {
- return new InvalidEmail(new UnusualElements($this->lexer->token['value']), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_BACKSLASH) {
+ return new InvalidEmail(new UnusualElements(((array) $this->lexer->token)['value']), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_IPV6TAG) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_IPV6TAG) {
$IPv6TAG = true;
}
- if ($this->lexer->token['type'] === EmailLexer::S_CLOSEBRACKET) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_CLOSEBRACKET) {
break;
}
- $addressLiteral .= $this->lexer->token['value'];
+ $addressLiteral .= ((array) $this->lexer->token)['value'];
} while ($this->lexer->moveNext());
@@ -144,7 +144,7 @@ public function checkIPV6Tag($addressLiteral, $maxGroups = 8) : void
$this->warnings[IPV6Deprecated::CODE] = new IPV6Deprecated();
}
}
-
+
public function convertIPv4ToIPv6(string $addressLiteralIPv4) : string
{
$matchesIP = [];
@@ -189,7 +189,7 @@ protected function checkIPV4Tag($addressLiteral) : bool
private function addObsoleteWarnings() : void
{
- if(in_array($this->lexer->token['type'], self::OBSOLETE_WARNINGS)) {
+ if(in_array(((array) $this->lexer->token)['type'], self::OBSOLETE_WARNINGS)) {
$this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
}
}
diff --git a/vendor/egulias/email-validator/src/Parser/DomainPart.php b/vendor/egulias/email-validator/src/Parser/DomainPart.php
index e1f5b3bef3..84a4180f36 100644
--- a/vendor/egulias/email-validator/src/Parser/DomainPart.php
+++ b/vendor/egulias/email-validator/src/Parser/DomainPart.php
@@ -50,8 +50,8 @@ public function parse() : Result
return $domainChecks;
}
- if ($this->lexer->token['type'] === EmailLexer::S_AT) {
- return new InvalidEmail(new ConsecutiveAt(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_AT) {
+ return new InvalidEmail(new ConsecutiveAt(), ((array) $this->lexer->token)['value']);
}
$result = $this->doParseDomainPart();
@@ -69,7 +69,7 @@ public function parse() : Result
$length = strlen($this->domainPart);
if ($length > self::DOMAIN_MAX_LENGTH) {
- return new InvalidEmail(new DomainTooLong(), $this->lexer->token['value']);
+ return new InvalidEmail(new DomainTooLong(), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
@@ -79,13 +79,13 @@ private function checkEndOfDomain() : Result
{
$prev = $this->lexer->getPrevious();
if ($prev['type'] === EmailLexer::S_DOT) {
- return new InvalidEmail(new DotAtEnd(), $this->lexer->token['value']);
+ return new InvalidEmail(new DotAtEnd(), ((array) $this->lexer->token)['value']);
}
if ($prev['type'] === EmailLexer::S_HYPHEN) {
return new InvalidEmail(new DomainHyphened('Hypen found at the end of the domain'), $prev['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_SP) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_SP) {
return new InvalidEmail(new CRLFAtTheEnd(), $prev['value']);
}
return new ValidEmail();
@@ -98,13 +98,13 @@ private function performDomainStartChecks() : Result
if ($invalidTokens->isInvalid()) {
return $invalidTokens;
}
-
+
$missingDomain = $this->checkEmptyDomain();
if ($missingDomain->isInvalid()) {
return $missingDomain;
}
- if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENPARENTHESIS) {
$this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
}
return new ValidEmail();
@@ -112,12 +112,12 @@ private function performDomainStartChecks() : Result
private function checkEmptyDomain() : Result
{
- $thereIsNoDomain = $this->lexer->token['type'] === EmailLexer::S_EMPTY ||
- ($this->lexer->token['type'] === EmailLexer::S_SP &&
+ $thereIsNoDomain = ((array) $this->lexer->token)['type'] === EmailLexer::S_EMPTY ||
+ (((array) $this->lexer->token)['type'] === EmailLexer::S_SP &&
!$this->lexer->isNextToken(EmailLexer::GENERIC));
if ($thereIsNoDomain) {
- return new InvalidEmail(new NoDomainPart(), $this->lexer->token['value']);
+ return new InvalidEmail(new NoDomainPart(), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
@@ -125,11 +125,11 @@ private function checkEmptyDomain() : Result
private function checkInvalidTokensAfterAT() : Result
{
- if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
- return new InvalidEmail(new DotAtStart(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT) {
+ return new InvalidEmail(new DotAtStart(), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
- return new InvalidEmail(new DomainHyphened('After AT'), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_HYPHEN) {
+ return new InvalidEmail(new DomainHyphened('After AT'), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
}
@@ -156,8 +156,8 @@ protected function doParseDomainPart() : Result
return $notAllowedChars;
}
- if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS ||
- $this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS ) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENPARENTHESIS ||
+ ((array) $this->lexer->token)['type'] === EmailLexer::S_CLOSEPARENTHESIS ) {
$hasComments = true;
$commentsResult = $this->parseComments();
@@ -172,7 +172,7 @@ protected function doParseDomainPart() : Result
return $dotsResult;
}
- if ($this->lexer->token['type'] === EmailLexer::S_OPENBRACKET) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENBRACKET) {
$literalResult = $this->parseDomainLiteral();
$this->addTLDWarnings($tldMissing);
@@ -189,9 +189,9 @@ protected function doParseDomainPart() : Result
return $FwsResult;
}
- $domain .= $this->lexer->token['value'];
+ $domain .= ((array) $this->lexer->token)['value'];
- if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::GENERIC)) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::GENERIC)) {
$tldMissing = false;
}
@@ -201,7 +201,7 @@ protected function doParseDomainPart() : Result
}
$this->lexer->moveNext();
- } while (null !== $this->lexer->token['type']);
+ } while (null !== ((array) $this->lexer->token)['type']);
$labelCheck = $this->checkLabelLength(true);
if ($labelCheck->isInvalid()) {
@@ -219,8 +219,8 @@ protected function doParseDomainPart() : Result
private function checkNotAllowedChars($token) : Result
{
$notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
- if (isset($notAllowed[$token['type']])) {
- return new InvalidEmail(new CharNotAllowed(), $token['value']);
+ if (isset($notAllowed[((array) $token)['type']])) {
+ return new InvalidEmail(new CharNotAllowed(), ((array) $token)['value']);
}
return new ValidEmail();
}
@@ -233,7 +233,7 @@ protected function parseDomainLiteral() : Result
try {
$this->lexer->find(EmailLexer::S_CLOSEBRACKET);
} catch (\RuntimeException $e) {
- return new InvalidEmail(new ExpectingDomainLiteralClose(), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingDomainLiteralClose(), ((array) $this->lexer->token)['value']);
}
$domainLiteralParser = new DomainLiteralParser($this->lexer);
@@ -244,17 +244,17 @@ protected function parseDomainLiteral() : Result
protected function checkDomainPartExceptions(array $prev, bool $hasComments) : Result
{
- if ($this->lexer->token['type'] === EmailLexer::S_OPENBRACKET && $prev['type'] !== EmailLexer::S_AT) {
- return new InvalidEmail(new ExpectingATEXT('OPENBRACKET not after AT'), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENBRACKET && $prev['type'] !== EmailLexer::S_AT) {
+ return new InvalidEmail(new ExpectingATEXT('OPENBRACKET not after AT'), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
- return new InvalidEmail(new DomainHyphened('Hypen found near DOT'), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+ return new InvalidEmail(new DomainHyphened('Hypen found near DOT'), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_BACKSLASH
&& $this->lexer->isNextToken(EmailLexer::GENERIC)) {
- return new InvalidEmail(new ExpectingATEXT('Escaping following "ATOM"'), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT('Escaping following "ATOM"'), ((array) $this->lexer->token)['value']);
}
return $this->validateTokens($hasComments);
@@ -273,8 +273,8 @@ protected function validateTokens(bool $hasComments) : Result
$validDomainTokens[EmailLexer::S_CLOSEPARENTHESIS] = true;
}
- if (!isset($validDomainTokens[$this->lexer->token['type']])) {
- return new InvalidEmail(new ExpectingATEXT('Invalid token in domain: ' . $this->lexer->token['value']), $this->lexer->token['value']);
+ if (!isset($validDomainTokens[((array) $this->lexer->token)['type']])) {
+ return new InvalidEmail(new ExpectingATEXT('Invalid token in domain: ' . ((array) $this->lexer->token)['value']), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
@@ -282,13 +282,13 @@ protected function validateTokens(bool $hasComments) : Result
private function checkLabelLength(bool $isEndOfDomain = false) : Result
{
- if ($this->lexer->token['type'] === EmailLexer::S_DOT || $isEndOfDomain) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT || $isEndOfDomain) {
if ($this->isLabelTooLong($this->label)) {
- return new InvalidEmail(new LabelTooLong(), $this->lexer->token['value']);
+ return new InvalidEmail(new LabelTooLong(), ((array) $this->lexer->token)['value']);
}
$this->label = '';
}
- $this->label .= $this->lexer->token['value'];
+ $this->label .= ((array) $this->lexer->token)['value'];
return new ValidEmail();
}
diff --git a/vendor/egulias/email-validator/src/Parser/DoubleQuote.php b/vendor/egulias/email-validator/src/Parser/DoubleQuote.php
index b32e2b6b23..d722292d4e 100644
--- a/vendor/egulias/email-validator/src/Parser/DoubleQuote.php
+++ b/vendor/egulias/email-validator/src/Parser/DoubleQuote.php
@@ -30,24 +30,24 @@ public function parse() : Result
EmailLexer::S_CR => true,
EmailLexer::S_LF => true
];
-
+
$setSpecialsWarning = true;
$this->lexer->moveNext();
- while ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE && null !== $this->lexer->token['type']) {
- if (isset($special[$this->lexer->token['type']]) && $setSpecialsWarning) {
+ while (((array) $this->lexer->token)['type'] !== EmailLexer::S_DQUOTE && null !== ((array) $this->lexer->token)['type']) {
+ if (isset($special[((array) $this->lexer->token)['type']]) && $setSpecialsWarning) {
$this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
$setSpecialsWarning = false;
}
- if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH && $this->lexer->isNextToken(EmailLexer::S_DQUOTE)) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_BACKSLASH && $this->lexer->isNextToken(EmailLexer::S_DQUOTE)) {
$this->lexer->moveNext();
}
$this->lexer->moveNext();
- if (!$this->escaped() && isset($invalid[$this->lexer->token['type']])) {
- return new InvalidEmail(new ExpectingATEXT("Expecting ATEXT between DQUOTE"), $this->lexer->token['value']);
+ if (!$this->escaped() && isset($invalid[((array) $this->lexer->token)['type']])) {
+ return new InvalidEmail(new ExpectingATEXT("Expecting ATEXT between DQUOTE"), ((array) $this->lexer->token)['value']);
}
}
@@ -59,7 +59,7 @@ public function parse() : Result
}
if (!$this->lexer->isNextToken(EmailLexer::S_AT) && $prev['type'] !== EmailLexer::S_BACKSLASH) {
- return new InvalidEmail(new ExpectingATEXT("Expecting ATEXT between DQUOTE"), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT("Expecting ATEXT between DQUOTE"), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
@@ -71,15 +71,15 @@ protected function checkDQUOTE() : Result
if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] === EmailLexer::GENERIC) {
$description = 'https://tools.ietf.org/html/rfc5322#section-3.2.4 - quoted string should be a unit';
- return new InvalidEmail(new ExpectingATEXT($description), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT($description), ((array) $this->lexer->token)['value']);
}
try {
$this->lexer->find(EmailLexer::S_DQUOTE);
} catch (\Exception $e) {
- return new InvalidEmail(new UnclosedQuotedString(), $this->lexer->token['value']);
+ return new InvalidEmail(new UnclosedQuotedString(), ((array) $this->lexer->token)['value']);
}
- $this->warnings[QuotedString::CODE] = new QuotedString($previous['value'], $this->lexer->token['value']);
+ $this->warnings[QuotedString::CODE] = new QuotedString($previous['value'], ((array) $this->lexer->token)['value']);
return new ValidEmail();
}
diff --git a/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php b/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php
index fff6ec3ef5..be4b05b82f 100644
--- a/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php
+++ b/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php
@@ -36,16 +36,16 @@ public function parse() : Result
return $resultCRLF;
}
- if ($this->lexer->token['type'] === EmailLexer::S_CR) {
- return new InvalidEmail(new CRNoLF(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_CR) {
+ return new InvalidEmail(new CRNoLF(), ((array) $this->lexer->token)['value']);
}
if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] !== EmailLexer::S_AT) {
- return new InvalidEmail(new AtextAfterCFWS(), $this->lexer->token['value']);
+ return new InvalidEmail(new AtextAfterCFWS(), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_LF || $this->lexer->token['type'] === EmailLexer::C_NUL) {
- return new InvalidEmail(new ExpectingCTEXT(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_LF || ((array) $this->lexer->token)['type'] === EmailLexer::C_NUL) {
+ return new InvalidEmail(new ExpectingCTEXT(), ((array) $this->lexer->token)['value']);
}
if ($this->lexer->isNextToken(EmailLexer::S_AT) || $previous['type'] === EmailLexer::S_AT) {
@@ -59,28 +59,28 @@ public function parse() : Result
protected function checkCRLFInFWS() : Result
{
- if ($this->lexer->token['type'] !== EmailLexer::CRLF) {
+ if (((array) $this->lexer->token)['type'] !== EmailLexer::CRLF) {
return new ValidEmail();
}
if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
- return new InvalidEmail(new CRLFX2(), $this->lexer->token['value']);
+ return new InvalidEmail(new CRLFX2(), ((array) $this->lexer->token)['value']);
}
//this has no coverage. Condition is repeated from above one
if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
- return new InvalidEmail(new CRLFAtTheEnd(), $this->lexer->token['value']);
+ return new InvalidEmail(new CRLFAtTheEnd(), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
}
-
+
protected function isFWS() : bool
{
if ($this->escaped()) {
return false;
}
- return in_array($this->lexer->token['type'], self::FWS_TYPES);
+ return in_array(((array) $this->lexer->token)['type'], self::FWS_TYPES);
}
}
diff --git a/vendor/egulias/email-validator/src/Parser/IDLeftPart.php b/vendor/egulias/email-validator/src/Parser/IDLeftPart.php
index 5fd9cdf992..3b01ae2902 100644
--- a/vendor/egulias/email-validator/src/Parser/IDLeftPart.php
+++ b/vendor/egulias/email-validator/src/Parser/IDLeftPart.php
@@ -10,6 +10,6 @@ class IDLeftPart extends LocalPart
{
protected function parseComments(): Result
{
- return new InvalidEmail(new CommentsInIDRight(), $this->lexer->token['value']);
+ return new InvalidEmail(new CommentsInIDRight(), ((array) $this->lexer->token)['value']);
}
}
diff --git a/vendor/egulias/email-validator/src/Parser/IDRightPart.php b/vendor/egulias/email-validator/src/Parser/IDRightPart.php
index 1a1268f2df..d19e05ab6f 100644
--- a/vendor/egulias/email-validator/src/Parser/IDRightPart.php
+++ b/vendor/egulias/email-validator/src/Parser/IDRightPart.php
@@ -20,9 +20,9 @@ protected function validateTokens(bool $hasComments) : Result
EmailLexer::S_GREATERTHAN => true,
EmailLexer::S_LOWERTHAN => true,
];
-
- if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
- return new InvalidEmail(new ExpectingATEXT('Invalid token in domain: ' . $this->lexer->token['value']), $this->lexer->token['value']);
+
+ if (isset($invalidDomainTokens[((array) $this->lexer->token)['type']])) {
+ return new InvalidEmail(new ExpectingATEXT('Invalid token in domain: ' . ((array) $this->lexer->token)['value']), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
}
diff --git a/vendor/egulias/email-validator/src/Parser/LocalPart.php b/vendor/egulias/email-validator/src/Parser/LocalPart.php
index 154521b27f..3f2ef7d8ed 100644
--- a/vendor/egulias/email-validator/src/Parser/LocalPart.php
+++ b/vendor/egulias/email-validator/src/Parser/LocalPart.php
@@ -36,12 +36,12 @@ public function parse() : Result
{
$this->lexer->startRecording();
- while ($this->lexer->token['type'] !== EmailLexer::S_AT && null !== $this->lexer->token['type']) {
+ while (((array) $this->lexer->token)['type'] !== EmailLexer::S_AT && null !== ((array) $this->lexer->token)['type']) {
if ($this->hasDotAtStart()) {
- return new InvalidEmail(new DotAtStart(), $this->lexer->token['value']);
+ return new InvalidEmail(new DotAtStart(), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_DQUOTE) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DQUOTE) {
$dquoteParsingResult = $this->parseDoubleQuote();
//Invalid double quote parsing
@@ -50,8 +50,8 @@ public function parse() : Result
}
}
- if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS ||
- $this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS ) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENPARENTHESIS ||
+ ((array) $this->lexer->token)['type'] === EmailLexer::S_CLOSEPARENTHESIS ) {
$commentsResult = $this->parseComments();
//Invalid comment parsing
@@ -60,14 +60,14 @@ public function parse() : Result
}
}
- if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
- return new InvalidEmail(new ConsecutiveDot(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+ return new InvalidEmail(new ConsecutiveDot(), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT &&
$this->lexer->isNextToken(EmailLexer::S_AT)
) {
- return new InvalidEmail(new DotAtEnd(), $this->lexer->token['value']);
+ return new InvalidEmail(new DotAtEnd(), ((array) $this->lexer->token)['value']);
}
$resultEscaping = $this->validateEscaping();
@@ -99,8 +99,8 @@ public function parse() : Result
protected function validateTokens(bool $hasComments) : Result
{
- if (isset(self::INVALID_TOKENS[$this->lexer->token['type']])) {
- return new InvalidEmail(new ExpectingATEXT('Invalid token found'), $this->lexer->token['value']);
+ if (isset(self::INVALID_TOKENS[((array) $this->lexer->token)['type']])) {
+ return new InvalidEmail(new ExpectingATEXT('Invalid token found'), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
}
@@ -110,7 +110,7 @@ public function localPart() : string
return $this->localPart;
}
- private function parseLocalFWS() : Result
+ private function parseLocalFWS() : Result
{
$foldingWS = new FoldingWhiteSpace($this->lexer);
$resultFWS = $foldingWS->parse();
@@ -122,7 +122,7 @@ private function parseLocalFWS() : Result
private function hasDotAtStart() : bool
{
- return $this->lexer->token['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type'];
+ return ((array) $this->lexer->token)['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type'];
}
private function parseDoubleQuote() : Result
@@ -148,12 +148,12 @@ protected function parseComments(): Result
private function validateEscaping() : Result
{
//Backslash found
- if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
+ if (((array) $this->lexer->token)['type'] !== EmailLexer::S_BACKSLASH) {
return new ValidEmail();
}
if ($this->lexer->isNextToken(EmailLexer::GENERIC)) {
- return new InvalidEmail(new ExpectingATEXT('Found ATOM after escaping'), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT('Found ATOM after escaping'), ((array) $this->lexer->token)['value']);
}
if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB, EmailLexer::C_DEL))) {
diff --git a/vendor/egulias/email-validator/src/Parser/PartParser.php b/vendor/egulias/email-validator/src/Parser/PartParser.php
index a75a172acb..7fc6d7bf31 100644
--- a/vendor/egulias/email-validator/src/Parser/PartParser.php
+++ b/vendor/egulias/email-validator/src/Parser/PartParser.php
@@ -45,8 +45,8 @@ protected function parseFWS() : Result
protected function checkConsecutiveDots() : Result
{
- if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
- return new InvalidEmail(new ConsecutiveDot(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+ return new InvalidEmail(new ConsecutiveDot(), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
@@ -58,6 +58,6 @@ protected function escaped() : bool
return $previous && $previous['type'] === EmailLexer::S_BACKSLASH
&&
- $this->lexer->token['type'] !== EmailLexer::GENERIC;
+ ((array) $this->lexer->token)['type'] !== EmailLexer::GENERIC;
}
}
diff --git a/vendor/symfony/var-dumper/Caster/DateCaster.php b/vendor/symfony/var-dumper/Caster/DateCaster.php
index 18641fbc1d..d07bac5831 100644
--- a/vendor/symfony/var-dumper/Caster/DateCaster.php
+++ b/vendor/symfony/var-dumper/Caster/DateCaster.php
@@ -27,7 +27,7 @@ class DateCaster
public static function castDateTime(\DateTimeInterface $d, array $a, Stub $stub, bool $isNested, int $filter)
{
$prefix = Caster::PREFIX_VIRTUAL;
- $location = $d->getTimezone()->getLocation();
+ $location = $d->getTimezone() ? $d->getTimezone()->getLocation() : null;
$fromNow = (new \DateTime())->diff($d);
$title = $d->format('l, F j, Y')
diff --git a/vendor/symfony/var-dumper/composer.json b/vendor/symfony/var-dumper/composer.json
index dc46f58d99..fc127d721a 100644
--- a/vendor/symfony/var-dumper/composer.json
+++ b/vendor/symfony/var-dumper/composer.json
@@ -28,7 +28,6 @@
"twig/twig": "^2.13|^3.0.4"
},
"conflict": {
- "phpunit/phpunit": "<5.4.3",
"symfony/console": "<4.4"
},
"suggest": {
diff --git a/web/modules/mobile_detect_twig_extensions/LICENSE.txt b/web/modules/mobile_detect_twig_extensions/LICENSE.txt
deleted file mode 100644
index d159169d10..0000000000
--- a/web/modules/mobile_detect_twig_extensions/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/web/modules/mobile_detect_twig_extensions/README.md b/web/modules/mobile_detect_twig_extensions/README.md
deleted file mode 100644
index 2a8e2a77a8..0000000000
--- a/web/modules/mobile_detect_twig_extensions/README.md
+++ /dev/null
@@ -1,95 +0,0 @@
-CONTENTS OF THIS FILE
----------------------
-
- * Introduction
- * Requirements
- * Recommended modules
- * Installation
- * Configuration
- * Troubleshooting
- * FAQ
- * Maintainers
-
-
-INTRODUCTION
-------------
-
-The Administration Menu module displays the entire administrative menu tree
-(and most local tasks) in a drop-down menu, providing administrators one- or
-two-click access to most pages. Other modules may also add menu links to the
-menu using hook_admin_menu_output_alter().
-
- * For a full description of the module, visit the project page:
- https://www.drupal.org/project/mobile_detect_twig_extensions
-
- * To submit bug reports and feature suggestions, or track changes:
- https://www.drupal.org/project/issues/mobile_detect_twig_extensions
-
-REQUIREMENTS
-------------
-
-This module doesn't requires any modules.
-
-RECOMMENDED MODULES
--------------------
-
- * Twig_tweak (https://www.drupal.org/project/twig_tweak):
- When enabled, you can test any extension. Useful for case estudies.
-
-INSTALLATION
-------------
-
- * Install as you would normally install a contributed Drupal module. Visit
- https://www.drupal.org/documentation/install/modules-themes/modules-8
- for further information.
-
- * Edit your twig templates and enjoy mobile_detect_twig_extensions
-
-
-CONFIGURATION
--------------
-
-The module has no menu or modifiable settings. There is no configuration. When
-enabled, the module will prevent the links from appearing.
-
-NOTE: It's a library interface, so it means just give support to different twig extensions:
-
-Extensions allowed:
-
- 'is_mobile' => new \Twig_Function_Function(array($this, 'isMobile')),
- 'is_tablet' => new \Twig_Function_Function(array($this, 'isTablet')),
- 'is_device' => new \Twig_Function_Function(array($this, 'isDevice')),
- 'is_ios' => new \Twig_Function_Function(array($this, 'isIOS')),
- 'is_android_os' => new \Twig_Function_Function(array($this, 'isAndroidOS')),
-
-TROUBLESHOOTING
----------------
-
- * If the menu does not display, check the following:
-
- - Are the "Access administration menu" and "Use the administration pages
- and help" permissions enabled for the appropriate roles?
-
- - Does html.tpl.php of your theme output the $page_bottom variable?
-
-FAQ
----
-
-Q: I enabled "Aggregate and compress CSS files", but admin_menu.css is still
- there. Is this normal?
-
-A: Yes, this is the intended behavior. the administration menu module only loads
- its stylesheet as needed (i.e., on page requests by logged-on, administrative
- users).
-
-MAINTAINERS
------------
-
-Current maintainers:
- * Antonio MartÃnez (nonom) - https://www.drupal.org/user/54136
-
-This project has been sponsored by:
- * nonomartinez.com
- Specialized in consulting and planning of Drupal powered sites, nonomartinez.com
- offers installation, development, theming, customization, and hosting
- to get you started. Visit https://www.nonomartinez.com for more information.
diff --git a/web/modules/mobile_detect_twig_extensions/composer.json b/web/modules/mobile_detect_twig_extensions/composer.json
deleted file mode 100644
index 2d44f21a24..0000000000
--- a/web/modules/mobile_detect_twig_extensions/composer.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "drupal/mobile_detect_twig_extensions",
- "description": "This module uses the Mobile_Detect library and add a few twig extensions to work with.",
- "type": "drupal-module",
- "homepage": "https://drupal.org/project/mobile_detect_twig_extensions",
- "authors": [
- {
- "name": "Antonio Javier Martinez Muro (nonom)",
- "homepage": "https://www.drupal.org/u/nonom",
- "role": "Maintainer"
- }
- ],
- "support": {
- "issues": "https://drupal.org/project/issues/mobile_detect_twig_extensions",
- "irc": "irc://irc.freenode.org/drupal-contribute",
- "source": "https://cgit.drupalcode.org/mobile_detect_twig_extensions"
- },
- "license": "GPL-2.0-or-later",
- "minimum-stability": "dev",
- "require": {
- "mobiledetect/mobiledetectlib": "^2.8"
- }
-}
\ No newline at end of file
diff --git a/web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.info.yml b/web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.info.yml
deleted file mode 100644
index b34f7b8d92..0000000000
--- a/web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.info.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: Mobile Detect Twig Extensions
-type: module
-description: This module declares a service for MobileDetect.php library, and adds a Twig extensions handler.
-core_version_requirement: ^8 || ^9
-package: Twig
-
-# Information added by Drupal.org packaging script on 2020-09-07
-version: '8.x-1.5'
-project: 'mobile_detect_twig_extensions'
-datestamp: 1599481463
diff --git a/web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.module b/web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.module
deleted file mode 100644
index f45986766e..0000000000
--- a/web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.module
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains mobile_detect_twig_extensions.module.
- */
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Implements hook_help().
- */
-function mobile_detect_twig_extensions_help($route_name, RouteMatchInterface $route_match) {
- switch ($route_name) {
- // Main module help for the mobile_detect_twig_extensions module.
- case 'help.page.mobile_detect_twig_extensions':
- $output = '';
- $output .= '<h3>' . t('About') . '</h3>';
- $output .= '<p>' . t('Mobile detect Twig Extensions') . '</p>';
- return $output;
- }
-}
-
-/**
- * Implements hook_theme().
- */
-function mobile_detect_twig_extensions_theme() {
- $theme = [];
-
- return $theme;
-}
diff --git a/web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.services.yml b/web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.services.yml
deleted file mode 100644
index f6cc59fc7c..0000000000
--- a/web/modules/mobile_detect_twig_extensions/mobile_detect_twig_extensions.services.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-services:
- mobile_detect:
- class: Detection\MobileDetect
- mobile_detect_twig_extensions.twig.extension:
- class: Drupal\mobile_detect_twig_extensions\Twig\MobileDetectTwigExtensions
- arguments: ["@mobile_detect"]
- tags:
- - { name: twig.extension }
diff --git a/web/modules/mobile_detect_twig_extensions/src/Twig/MobileDetectTwigExtensions.php b/web/modules/mobile_detect_twig_extensions/src/Twig/MobileDetectTwigExtensions.php
deleted file mode 100644
index c14f3fb8da..0000000000
--- a/web/modules/mobile_detect_twig_extensions/src/Twig/MobileDetectTwigExtensions.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Drupal\mobile_detect_twig_extensions\Twig;
-
-use Detection\MobileDetect;
-
-/**
- * MobileDetectTwigExtensions class.
- *
- */
-class MobileDetectTwigExtensions extends \Twig_Extension {
-
- /**
- * @var MobileDetect
- */
- protected $mobileDetector;
-
- /**
- * Constructor
- * @param MobileDetect $mobileDetector
- */
- public function __construct(MobileDetect $mobileDetector) {
- $this->mobileDetector = $mobileDetector;
- }
-
- /**
- * Get extension twig function
- * @return array
- */
- public function getFunctions() {
- return array(
- 'is_mobile' => new \Twig_Function_Function(array($this, 'isMobile')),
- 'is_tablet' => new \Twig_Function_Function(array($this, 'isTablet')),
- 'is_device' => new \Twig_Function_Function(array($this, 'isDevice')),
- 'is_ios' => new \Twig_Function_Function(array($this, 'isIOS')),
- 'is_android_os' => new \Twig_Function_Function(array($this, 'isAndroidOS')),
- );
- }
-
- /**
- * Is mobile
- * @return boolean
- */
- public function isMobile() {
- return $this->mobileDetector->isMobile();
- }
-
- /**
- * Is tablet
- * @return boolean
- */
- public function isTablet() {
- return $this->mobileDetector->isTablet();
- }
-
- /**
- * Is device
- * @param string $deviceName is[iPhone|BlackBerry|HTC|Nexus|Dell|Motorola|Samsung|Sony|Asus|Palm|Vertu|...]
- * @return boolean
- */
- public function isDevice($deviceName) {
- $magicMethodName = 'is' . strtolower((string) $deviceName);
-
- return $this->mobileDetector->$magicMethodName();
- }
-
- /**
- * Is iOS
- * @return boolean
- */
- public function isIOS() {
- return $this->mobileDetector->isIOS();
- }
-
- /**
- * Is Android OS
- * @return boolean
- */
- public function isAndroidOS() {
- return $this->mobileDetector->isAndroidOS();
- }
-
- /**
- * Extension name
- * @return string
- */
- public function getName() {
- return 'mobile_detect_twig_extensions.twig.extension';
- }
-
-}
--
GitLab