From d977a242083511041e85f1f6a216ad93812eb654 Mon Sep 17 00:00:00 2001 From: Chris Klosowski Date: Thu, 9 Nov 2023 17:09:05 -0700 Subject: [PATCH] Adding 3.2.5 --- Gruntfile.js | 9 -- composer.json | 14 ++- composer.lock | 48 ++++---- easy-digital-downloads.php | 4 +- includes/admin/import/class-batch-import.php | 9 +- includes/class-easy-digital-downloads.php | 2 +- includes/orders/functions/orders.php | 2 +- includes/process-purchase.php | 6 +- languages/easy-digital-downloads.pot | 67 +++------- .../MessageFormatterMapperStrongType.php | 2 +- .../MessageFormatterMapperWeakType.php | 4 +- .../lazy/Carbon/TranslatorStrongType.php | 2 +- .../Carbon/src/Carbon/AbstractTranslator.php | 6 +- .../Carbon/src/Carbon/CarbonInterface.php | 20 +-- .../Carbon/src/Carbon/CarbonInterval.php | 4 +- .../Exceptions/NotLocaleAwareException.php | 2 +- libraries/Carbon/src/Carbon/Factory.php | 2 +- .../Carbon/src/Carbon/FactoryImmutable.php | 2 +- libraries/Carbon/src/Carbon/Lang/be.php | 2 +- .../Carbon/src/Carbon/Lang/ca_ES_Valencia.php | 2 +- libraries/Carbon/src/Carbon/Lang/oc.php | 2 +- libraries/Carbon/src/Carbon/Lang/sh.php | 2 +- .../Carbon/src/Carbon/Lang/sr_Cyrl_BA.php | 2 +- .../Carbon/src/Carbon/Lang/sr_Cyrl_ME.php | 2 +- .../Carbon/src/Carbon/Lang/sr_Cyrl_XK.php | 2 +- .../Carbon/src/Carbon/Lang/sr_Latn_BA.php | 2 +- .../Carbon/src/Carbon/Lang/sr_Latn_ME.php | 2 +- .../Carbon/src/Carbon/Lang/sr_Latn_XK.php | 2 +- .../MessageFormatterMapper.php | 4 +- .../Carbon/src/Carbon/Traits/Creator.php | 2 +- .../Carbon/src/Carbon/Traits/Localization.php | 32 ++--- libraries/Carbon/src/Carbon/Translator.php | 4 +- .../Carbon/src/Carbon/TranslatorImmutable.php | 2 +- .../Carbon/TranslatorStrongTypeInterface.php | 2 +- .../Component/Translation}/CHANGELOG.md | 0 .../Catalogue/AbstractOperation.php | 10 +- .../Translation}/Catalogue/MergeOperation.php | 4 +- .../Catalogue/OperationInterface.php | 4 +- .../Catalogue/TargetOperation.php | 4 +- .../CatalogueMetadataAwareInterface.php | 2 +- .../Command/TranslationPullCommand.php | 12 +- .../Command/TranslationPushCommand.php | 10 +- .../Translation}/Command/TranslationTrait.php | 8 +- .../Translation}/Command/XliffLintCommand.php | 6 +- .../TranslationDataCollector.php | 4 +- .../Translation}/DataCollectorTranslator.php | 8 +- .../TranslationDumperPass.php | 2 +- .../TranslationExtractorPass.php | 2 +- .../DependencyInjection/TranslatorPass.php | 2 +- .../TranslatorPathsPass.php | 2 +- .../Translation}/Dumper/CsvFileDumper.php | 4 +- .../Translation}/Dumper/DumperInterface.php | 4 +- .../Translation}/Dumper/FileDumper.php | 8 +- .../Translation}/Dumper/IcuResFileDumper.php | 4 +- .../Translation}/Dumper/IniFileDumper.php | 4 +- .../Translation}/Dumper/JsonFileDumper.php | 4 +- .../Translation}/Dumper/MoFileDumper.php | 6 +- .../Translation}/Dumper/PhpFileDumper.php | 4 +- .../Translation}/Dumper/PoFileDumper.php | 4 +- .../Translation}/Dumper/QtFileDumper.php | 4 +- .../Translation}/Dumper/XliffFileDumper.php | 6 +- .../Translation}/Dumper/YamlFileDumper.php | 8 +- .../Exception/ExceptionInterface.php | 2 +- .../Exception/IncompleteDsnException.php | 2 +- .../Exception/InvalidArgumentException.php | 2 +- .../Exception/InvalidResourceException.php | 2 +- .../Translation}/Exception/LogicException.php | 2 +- .../MissingRequiredOptionException.php | 2 +- .../Exception/NotFoundResourceException.php | 2 +- .../Exception/ProviderException.php | 2 +- .../Exception/ProviderExceptionInterface.php | 2 +- .../Exception/RuntimeException.php | 2 +- .../Exception/UnsupportedSchemeException.php | 6 +- .../Extractor/AbstractFileExtractor.php | 4 +- .../Translation}/Extractor/ChainExtractor.php | 4 +- .../Extractor/ExtractorInterface.php | 4 +- .../Extractor/PhpAstExtractor.php | 6 +- .../Translation}/Extractor/PhpExtractor.php | 8 +- .../Extractor/PhpStringTokenParser.php | 2 +- .../Extractor/Visitor/AbstractVisitor.php | 4 +- .../Extractor/Visitor/ConstraintVisitor.php | 2 +- .../Extractor/Visitor/TransMethodVisitor.php | 2 +- .../Visitor/TranslatableMessageVisitor.php | 2 +- .../Translation}/Formatter/IntlFormatter.php | 6 +- .../Formatter/IntlFormatterInterface.php | 2 +- .../Formatter/MessageFormatter.php | 6 +- .../Formatter/MessageFormatterInterface.php | 2 +- .../Translation}/IdentityTranslator.php | 8 +- .../Symfony/Component/Translation}/LICENSE | 0 .../Translation}/Loader/ArrayLoader.php | 4 +- .../Translation}/Loader/CsvFileLoader.php | 4 +- .../Translation}/Loader/FileLoader.php | 8 +- .../Translation}/Loader/IcuDatFileLoader.php | 8 +- .../Translation}/Loader/IcuResFileLoader.php | 8 +- .../Translation}/Loader/IniFileLoader.php | 2 +- .../Translation}/Loader/JsonFileLoader.php | 4 +- .../Translation}/Loader/LoaderInterface.php | 8 +- .../Translation}/Loader/MoFileLoader.php | 4 +- .../Translation}/Loader/PhpFileLoader.php | 2 +- .../Translation}/Loader/PoFileLoader.php | 2 +- .../Translation}/Loader/QtFileLoader.php | 10 +- .../Translation}/Loader/XliffFileLoader.php | 12 +- .../Translation}/Loader/YamlFileLoader.php | 6 +- .../Component/Translation}/LocaleSwitcher.php | 4 +- .../Translation}/LoggingTranslator.php | 8 +- .../Translation}/MessageCatalogue.php | 4 +- .../MessageCatalogueInterface.php | 2 +- .../Translation}/MetadataAwareInterface.php | 2 +- .../Provider/AbstractProviderFactory.php | 4 +- .../Component/Translation}/Provider/Dsn.php | 6 +- .../Provider/FilteringProvider.php | 6 +- .../Translation}/Provider/NullProvider.php | 6 +- .../Provider/NullProviderFactory.php | 4 +- .../Provider/ProviderFactoryInterface.php | 6 +- .../Provider/ProviderInterface.php | 6 +- .../TranslationProviderCollection.php | 4 +- .../TranslationProviderCollectionFactory.php | 4 +- .../PseudoLocalizationTranslator.php | 4 +- .../Symfony/Component/Translation}/README.md | 0 .../Translation}/Reader/TranslationReader.php | 6 +- .../Reader/TranslationReaderInterface.php | 4 +- .../Resources/bin/translation-status.php | 0 .../Translation}/Resources/data/parents.json | 1 + .../Translation}/Resources/functions.php | 2 +- .../schemas/xliff-core-1.2-transitional.xsd | 0 .../Resources/schemas/xliff-core-2.0.xsd | 0 .../Translation}/Resources/schemas/xml.xsd | 0 .../Test/ProviderFactoryTestCase.php | 16 +-- .../Translation}/Test/ProviderTestCase.php | 10 +- .../Translation}/TranslatableMessage.php | 6 +- .../Component/Translation}/Translator.php | 24 ++-- .../Component/Translation}/TranslatorBag.php | 6 +- .../Translation}/TranslatorBagInterface.php | 4 +- .../Translation}/Util/ArrayConverter.php | 2 +- .../Translation}/Util/XliffUtils.php | 6 +- .../Translation}/Writer/TranslationWriter.php | 10 +- .../Writer/TranslationWriterInterface.php | 6 +- .../Component/Translation}/composer.json | 0 .../Contracts/Translation}/CHANGELOG.md | 0 .../Symfony/Contracts/Translation}/LICENSE | 0 .../Translation}/LocaleAwareInterface.php | 2 +- .../Symfony/Contracts/Translation}/README.md | 0 .../Translation}/Test/TranslatorTest.php | 6 +- .../Translation}/TranslatableInterface.php | 2 +- .../Translation}/TranslatorInterface.php | 2 +- .../Translation}/TranslatorTrait.php | 2 +- .../Contracts/Translation}/composer.json | 0 .../Symfony/Polyfill/Mbstring}/LICENSE | 0 .../Symfony/Polyfill/Mbstring}/Mbstring.php | 2 +- .../Symfony/Polyfill/Mbstring}/README.md | 0 .../Resources/unidata/caseFolding.php | 0 .../Mbstring}/Resources/unidata/lowerCase.php | 0 .../Resources/unidata/titleCaseRegexp.php | 0 .../Mbstring}/Resources/unidata/upperCase.php | 0 .../Symfony/Polyfill/Mbstring}/bootstrap.php | 2 +- .../Polyfill/Mbstring}/bootstrap80.php | 2 +- .../Symfony/Polyfill/Mbstring}/composer.json | 0 package.json | 2 +- readme.txt | 8 +- src/Telemetry/Environment.php | 18 ++- src/Telemetry/Settings.php | 33 ++--- src/Telemetry/Traits/Anonymize.php | 48 ++++++++ tests/tests-telemetry.php | 108 ++++++++++++++++ vendor/autoload.php | 2 +- vendor/composer/ClassLoader.php | 96 ++++++++------- vendor/composer/InstalledVersions.php | 17 +-- vendor/composer/autoload_files.php | 3 +- vendor/composer/autoload_psr4.php | 4 +- vendor/composer/autoload_real.php | 10 +- vendor/composer/autoload_static.php | 27 ++-- vendor/composer/installed.json | 54 ++++---- vendor/composer/installed.php | 28 ++--- .../service-contracts/Attribute/Required.php | 25 ---- .../Attribute/SubscribedService.php | 47 ------- vendor/symfony/service-contracts/README.md | 9 -- .../service-contracts/ResetInterface.php | 33 ----- .../service-contracts/ServiceLocatorTrait.php | 115 ------------------ .../ServiceProviderInterface.php | 45 ------- .../ServiceSubscriberInterface.php | 62 ---------- .../ServiceSubscriberTrait.php | 78 ------------ .../Test/ServiceLocatorTest.php | 23 ---- .../Test/ServiceLocatorTestCase.php | 92 -------------- .../symfony/service-contracts/composer.json | 41 ------- .../translation-contracts/CHANGELOG.md | 5 - vendor/symfony/translation-contracts/LICENSE | 19 --- 185 files changed, 674 insertions(+), 1152 deletions(-) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/CHANGELOG.md (100%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Catalogue/AbstractOperation.php (94%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Catalogue/MergeOperation.php (95%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Catalogue/OperationInterface.php (92%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Catalogue/TargetOperation.php (96%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/CatalogueMetadataAwareInterface.php (96%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Command/TranslationPullCommand.php (94%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Command/TranslationPushCommand.php (95%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Command/TranslationTrait.php (89%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Command/XliffLintCommand.php (98%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/DataCollector/TranslationDataCollector.php (96%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/DataCollectorTranslator.php (94%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/DependencyInjection/TranslationDumperPass.php (93%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/DependencyInjection/TranslationExtractorPass.php (94%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/DependencyInjection/TranslatorPass.php (98%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/DependencyInjection/TranslatorPathsPass.php (98%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/CsvFileDumper.php (91%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/DumperInterface.php (84%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/FileDumper.php (92%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/IcuResFileDumper.php (95%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/IniFileDumper.php (87%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/JsonFileDumper.php (85%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/MoFileDumper.php (91%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/PhpFileDumper.php (85%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/PoFileDumper.php (96%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/QtFileDumper.php (93%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/XliffFileDumper.php (97%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Dumper/YamlFileDumper.php (83%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Exception/ExceptionInterface.php (87%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Exception/IncompleteDsnException.php (90%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Exception/InvalidArgumentException.php (88%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Exception/InvalidResourceException.php (87%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Exception/LogicException.php (87%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Exception/MissingRequiredOptionException.php (90%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Exception/NotFoundResourceException.php (87%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Exception/ProviderException.php (94%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Exception/ProviderExceptionInterface.php (89%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Exception/RuntimeException.php (87%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Exception/UnsupportedSchemeException.php (90%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Extractor/AbstractFileExtractor.php (91%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Extractor/ChainExtractor.php (90%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Extractor/ExtractorInterface.php (88%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Extractor/PhpAstExtractor.php (92%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Extractor/PhpExtractor.php (97%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Extractor/PhpStringTokenParser.php (98%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Extractor/Visitor/AbstractVisitor.php (96%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Extractor/Visitor/ConstraintVisitor.php (97%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Extractor/Visitor/TransMethodVisitor.php (95%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Extractor/Visitor/TranslatableMessageVisitor.php (95%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Formatter/IntlFormatter.php (90%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Formatter/IntlFormatterInterface.php (91%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Formatter/MessageFormatter.php (88%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Formatter/MessageFormatterInterface.php (92%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/IdentityTranslator.php (64%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/LICENSE (100%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/ArrayLoader.php (91%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/CsvFileLoader.php (92%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/FileLoader.php (83%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/IcuDatFileLoader.php (84%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/IcuResFileLoader.php (89%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/IniFileLoader.php (89%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/JsonFileLoader.php (90%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/LoaderInterface.php (71%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/MoFileLoader.php (96%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/PhpFileLoader.php (94%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/PoFileLoader.php (98%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/QtFileLoader.php (87%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/XliffFileLoader.php (95%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Loader/YamlFileLoader.php (87%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/LocaleSwitcher.php (93%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/LoggingTranslator.php (92%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/MessageCatalogue.php (98%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/MessageCatalogueInterface.php (98%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/MetadataAwareInterface.php (96%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Provider/AbstractProviderFactory.php (87%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Provider/Dsn.php (92%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Provider/FilteringProvider.php (88%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Provider/NullProvider.php (79%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Provider/NullProviderFactory.php (83%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Provider/ProviderFactoryInterface.php (68%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Provider/ProviderInterface.php (80%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Provider/TranslationProviderCollection.php (89%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Provider/TranslationProviderCollectionFactory.php (91%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/PseudoLocalizationTranslator.php (98%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/README.md (100%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Reader/TranslationReader.php (89%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Reader/TranslationReaderInterface.php (83%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Resources/bin/translation-status.php (100%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Resources/data/parents.json (99%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Resources/functions.php (90%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Resources/schemas/xliff-core-1.2-transitional.xsd (100%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Resources/schemas/xliff-core-2.0.xsd (100%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Resources/schemas/xml.xsd (100%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Test/ProviderFactoryTestCase.php (87%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Test/ProviderTestCase.php (87%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/TranslatableMessage.php (88%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Translator.php (94%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/TranslatorBag.php (93%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/TranslatorBagInterface.php (85%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Util/ArrayConverter.php (98%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Util/XliffUtils.php (96%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Writer/TranslationWriter.php (84%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/Writer/TranslationWriterInterface.php (79%) rename {vendor/symfony/translation => libraries/Symfony/Component/Translation}/composer.json (100%) rename {vendor/symfony/service-contracts => libraries/Symfony/Contracts/Translation}/CHANGELOG.md (100%) rename {vendor/symfony/service-contracts => libraries/Symfony/Contracts/Translation}/LICENSE (100%) rename {vendor/symfony/translation-contracts => libraries/Symfony/Contracts/Translation}/LocaleAwareInterface.php (91%) rename {vendor/symfony/translation-contracts => libraries/Symfony/Contracts/Translation}/README.md (100%) rename {vendor/symfony/translation-contracts => libraries/Symfony/Contracts/Translation}/Test/TranslatorTest.php (98%) rename {vendor/symfony/translation-contracts => libraries/Symfony/Contracts/Translation}/TranslatableInterface.php (88%) rename {vendor/symfony/translation-contracts => libraries/Symfony/Contracts/Translation}/TranslatorInterface.php (97%) rename {vendor/symfony/translation-contracts => libraries/Symfony/Contracts/Translation}/TranslatorTrait.php (99%) rename {vendor/symfony/translation-contracts => libraries/Symfony/Contracts/Translation}/composer.json (100%) rename {vendor/symfony/polyfill-mbstring => libraries/Symfony/Polyfill/Mbstring}/LICENSE (100%) rename {vendor/symfony/polyfill-mbstring => libraries/Symfony/Polyfill/Mbstring}/Mbstring.php (99%) rename {vendor/symfony/polyfill-mbstring => libraries/Symfony/Polyfill/Mbstring}/README.md (100%) rename {vendor/symfony/polyfill-mbstring => libraries/Symfony/Polyfill/Mbstring}/Resources/unidata/caseFolding.php (100%) rename {vendor/symfony/polyfill-mbstring => libraries/Symfony/Polyfill/Mbstring}/Resources/unidata/lowerCase.php (100%) rename {vendor/symfony/polyfill-mbstring => libraries/Symfony/Polyfill/Mbstring}/Resources/unidata/titleCaseRegexp.php (100%) rename {vendor/symfony/polyfill-mbstring => libraries/Symfony/Polyfill/Mbstring}/Resources/unidata/upperCase.php (100%) rename {vendor/symfony/polyfill-mbstring => libraries/Symfony/Polyfill/Mbstring}/bootstrap.php (99%) rename {vendor/symfony/polyfill-mbstring => libraries/Symfony/Polyfill/Mbstring}/bootstrap80.php (99%) rename {vendor/symfony/polyfill-mbstring => libraries/Symfony/Polyfill/Mbstring}/composer.json (100%) create mode 100644 src/Telemetry/Traits/Anonymize.php create mode 100644 tests/tests-telemetry.php delete mode 100644 vendor/symfony/service-contracts/Attribute/Required.php delete mode 100644 vendor/symfony/service-contracts/Attribute/SubscribedService.php delete mode 100644 vendor/symfony/service-contracts/README.md delete mode 100644 vendor/symfony/service-contracts/ResetInterface.php delete mode 100644 vendor/symfony/service-contracts/ServiceLocatorTrait.php delete mode 100644 vendor/symfony/service-contracts/ServiceProviderInterface.php delete mode 100644 vendor/symfony/service-contracts/ServiceSubscriberInterface.php delete mode 100644 vendor/symfony/service-contracts/ServiceSubscriberTrait.php delete mode 100644 vendor/symfony/service-contracts/Test/ServiceLocatorTest.php delete mode 100644 vendor/symfony/service-contracts/Test/ServiceLocatorTestCase.php delete mode 100644 vendor/symfony/service-contracts/composer.json delete mode 100644 vendor/symfony/translation-contracts/CHANGELOG.md delete mode 100644 vendor/symfony/translation-contracts/LICENSE diff --git a/Gruntfile.js b/Gruntfile.js index ac44878dce..cf18127fd6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -79,9 +79,6 @@ module.exports = function ( grunt ) { 'vendor/symfony/deprecation-contracts/**', 'vendor/symfony/polyfill-php80/**', 'vendor/symfony/polyfill-mbstring/**', - 'vendor/symfony/service-contracts/**', - 'vendor/symfony/translation/**', - 'vendor/symfony/translation-contracts/**', ], dest: 'build/<%= pkg.name %>-pro/', }, @@ -118,9 +115,6 @@ module.exports = function ( grunt ) { 'vendor/symfony/deprecation-contracts/**', 'vendor/symfony/polyfill-php80/**', 'vendor/symfony/polyfill-mbstring/**', - 'vendor/symfony/service-contracts/**', - 'vendor/symfony/translation/**', - 'vendor/symfony/translation-contracts/**', ], dest: 'build/<%= pkg.name %>/', }, @@ -149,9 +143,6 @@ module.exports = function ( grunt ) { 'vendor/symfony/deprecation-contracts/**', 'vendor/symfony/polyfill-php80/**', 'vendor/symfony/polyfill-mbstring/**', - 'vendor/symfony/service-contracts/**', - 'vendor/symfony/translation/**', - 'vendor/symfony/translation-contracts/**', ], dest: 'build/<%= pkg.name %>-public/', } diff --git a/composer.json b/composer.json index c6a20ccfb2..4dccd85d20 100755 --- a/composer.json +++ b/composer.json @@ -39,9 +39,13 @@ "psr-4": { "EDD\\": "src/", "EDD\\Vendor\\Stripe\\": "libraries/Stripe/lib/", - "EDD\\Vendor\\Carbon\\": "libraries/Carbon/src/Carbon/" + "EDD\\Vendor\\Carbon\\": "libraries/Carbon/src/Carbon/", + "EDD\\Vendor\\Symfony\\Polyfill\\Mbstring\\": "libraries/Symfony/Polyfill/Mbstring/" }, - "files": [ "src/Globals/Polyfills/PHP.php" ] + "files": [ + "src/Globals/Polyfills/PHP.php", + "libraries/Symfony/Polyfill/Mbstring/bootstrap.php" + ] }, "autoload-dev": { "classmap": ["src/", "tests/"] @@ -60,10 +64,8 @@ "nesbot/carbon" ], "excluded_packages": [ - "symfony/polyfill-mbstring", - "symfony/polyfill-php80", - "symfony/translation-contracts", - "symfony/translation" + "symfony/deprecation-contracts", + "symfony/polyfill-php80" ], "delete_vendor_directories": true, "override_autoload": { diff --git a/composer.lock b/composer.lock index 71a4287ed2..7f46588984 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": "34258be2dbc87a48db930bbcf2459a7b", + "content-hash": "ae501374d2957404094ff57456d85a10", "packages": [ { "name": "nesbot/carbon", @@ -455,16 +455,16 @@ }, { "name": "symfony/translation", - "version": "v6.3.6", + "version": "v6.3.7", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "869b26c7a9d4b8a48afdd77ab36031909c87e3a2" + "reference": "30212e7c87dcb79c83f6362b00bde0e0b1213499" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/869b26c7a9d4b8a48afdd77ab36031909c87e3a2", - "reference": "869b26c7a9d4b8a48afdd77ab36031909c87e3a2", + "url": "https://api.github.com/repos/symfony/translation/zipball/30212e7c87dcb79c83f6362b00bde0e0b1213499", + "reference": "30212e7c87dcb79c83f6362b00bde0e0b1213499", "shasum": "" }, "require": { @@ -530,7 +530,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.3.6" + "source": "https://github.com/symfony/translation/tree/v6.3.7" }, "funding": [ { @@ -546,7 +546,7 @@ "type": "tidelift" } ], - "time": "2023-10-17T11:32:53+00:00" + "time": "2023-10-28T23:11:45+00:00" }, { "name": "symfony/translation-contracts", @@ -1700,16 +1700,16 @@ }, { "name": "php-stubs/wordpress-stubs", - "version": "v6.3.2", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/php-stubs/wordpress-stubs.git", - "reference": "f22b00cacd3b9addc2b07ff48290084503c48574" + "reference": "286d42eeb44c6808633cc59b8dbb9aa75fe41264" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/f22b00cacd3b9addc2b07ff48290084503c48574", - "reference": "f22b00cacd3b9addc2b07ff48290084503c48574", + "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/286d42eeb44c6808633cc59b8dbb9aa75fe41264", + "reference": "286d42eeb44c6808633cc59b8dbb9aa75fe41264", "shasum": "" }, "require-dev": { @@ -1739,9 +1739,9 @@ ], "support": { "issues": "https://github.com/php-stubs/wordpress-stubs/issues", - "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.3.2" + "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.4.0" }, - "time": "2023-10-14T10:08:05+00:00" + "time": "2023-11-08T07:02:08+00:00" }, { "name": "phpcompatibility/php-compatibility", @@ -2099,16 +2099,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.39", + "version": "1.10.41", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4" + "reference": "c6174523c2a69231df55bdc65b61655e72876d76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d9dedb0413f678b4d03cbc2279a48f91592c97c4", - "reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76", + "reference": "c6174523c2a69231df55bdc65b61655e72876d76", "shasum": "" }, "require": { @@ -2157,7 +2157,7 @@ "type": "tidelift" } ], - "time": "2023-10-17T15:46:26+00:00" + "time": "2023-11-05T12:57:57+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4107,16 +4107,16 @@ }, { "name": "symfony/yaml", - "version": "v5.4.23", + "version": "v5.4.30", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "4cd2e3ea301aadd76a4172756296fe552fb45b0b" + "reference": "c6980e82a6656f6ebfabfd82f7585794cb122554" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/4cd2e3ea301aadd76a4172756296fe552fb45b0b", - "reference": "4cd2e3ea301aadd76a4172756296fe552fb45b0b", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c6980e82a6656f6ebfabfd82f7585794cb122554", + "reference": "c6980e82a6656f6ebfabfd82f7585794cb122554", "shasum": "" }, "require": { @@ -4162,7 +4162,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.23" + "source": "https://github.com/symfony/yaml/tree/v5.4.30" }, "funding": [ { @@ -4178,7 +4178,7 @@ "type": "tidelift" } ], - "time": "2023-04-23T19:33:36+00:00" + "time": "2023-10-27T18:36:14+00:00" }, { "name": "szepeviktor/phpstan-wordpress", diff --git a/easy-digital-downloads.php b/easy-digital-downloads.php index e37a1579c8..01a875648c 100755 --- a/easy-digital-downloads.php +++ b/easy-digital-downloads.php @@ -5,7 +5,7 @@ * Description: The easiest way to sell digital products with WordPress. * Author: Easy Digital Downloads * Author URI: https://easydigitaldownloads.com - * Version: 3.2.4 + * Version: 3.2.5 * Text Domain: easy-digital-downloads * Domain Path: /languages * Requires at least: 5.8 @@ -27,7 +27,7 @@ * @package EDD * @category Core * @author Easy Digital Downloads - * @version 3.2.4 + * @version 3.2.5 */ // Exit if accessed directly. diff --git a/includes/admin/import/class-batch-import.php b/includes/admin/import/class-batch-import.php index 2f61acbc06..f03ed24e33 100644 --- a/includes/admin/import/class-batch-import.php +++ b/includes/admin/import/class-batch-import.php @@ -77,6 +77,14 @@ class EDD_Batch_Import { */ public $field_mapping = array(); + /** + * Is the import done? + * + * @since 2.6 + * @var bool + */ + public $done = false; + /** * Get things started * @@ -86,7 +94,6 @@ class EDD_Batch_Import { public function __construct( $_file = '', $_step = 1 ) { $this->step = $_step; - $this->done = false; if ( ! empty( $_file ) ) { $this->set_up_csv( $_file ); } diff --git a/includes/class-easy-digital-downloads.php b/includes/class-easy-digital-downloads.php index 66ac639ec8..aaf2c7685d 100644 --- a/includes/class-easy-digital-downloads.php +++ b/includes/class-easy-digital-downloads.php @@ -369,7 +369,7 @@ private function setup_constants() { // Plugin version. if ( ! defined( 'EDD_VERSION' ) ) { - define( 'EDD_VERSION', '3.2.4' ); + define( 'EDD_VERSION', '3.2.5' ); } // Make sure CAL_GREGORIAN is defined. diff --git a/includes/orders/functions/orders.php b/includes/orders/functions/orders.php index dd8ec8da21..8d80e19d5d 100644 --- a/includes/orders/functions/orders.php +++ b/includes/orders/functions/orders.php @@ -708,7 +708,6 @@ function edd_build_order( $order_data = array() ) { // Build order information based on data passed from the gateway. $order_args = array( 'parent' => ! empty( $order_data['parent'] ) ? absint( $order_data['parent'] ) : '', - 'order_number' => '', 'status' => ! empty( $order_data['status'] ) ? $order_data['status'] : 'pending', 'user_id' => ! empty( $order_data['user_info']['id'] ) ? $order_data['user_info']['id'] : 0, 'email' => $order_data['user_info']['email'], @@ -799,6 +798,7 @@ function edd_build_order( $order_data = array() ) { if ( empty( $order_id ) ) { return false; } + EDD()->session->set( 'edd_resume_payment', $order_id ); // Attach order to the customer record. $customer->attach_payment( $order_id, false ); diff --git a/includes/process-purchase.php b/includes/process-purchase.php index 700f8c8268..c561e735cf 100755 --- a/includes/process-purchase.php +++ b/includes/process-purchase.php @@ -134,9 +134,9 @@ function edd_process_purchase_form() { $existing_payment = EDD()->session->get( 'edd_resume_payment' ); if ( ! empty( $existing_payment ) ) { - $payment = new EDD_Payment( $existing_payment ); - if ( $payment->is_recoverable() && ! empty( $payment->key ) ) { - $purchase_key = $payment->key; + $order = edd_get_order( $existing_payment ); + if ( $order->is_recoverable() && ! empty( $order->payment_key ) ) { + $purchase_key = $order->payment_key; } } diff --git a/languages/easy-digital-downloads.pot b/languages/easy-digital-downloads.pot index 45d4c16765..f391c3687c 100644 --- a/languages/easy-digital-downloads.pot +++ b/languages/easy-digital-downloads.pot @@ -1,21 +1,24 @@ # Copyright (C) 2023 Easy Digital Downloads -# This file is distributed under the same license as the Easy Digital Downloads (Pro) plugin. +# This file is distributed under the same license as the Easy Digital Downloads plugin. msgid "" msgstr "" -"Project-Id-Version: Easy Digital Downloads (Pro) 3.2.4\n" -"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/easy-digital-downloads-pro\n" +"Project-Id-Version: Easy Digital Downloads 3.2.5\n" +"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/easy-digital-downloads-public\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2023-11-06T18:22:52+00:00\n" +"POT-Creation-Date: 2023-11-10T00:06:11+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.8.1\n" #. Plugin Name of the plugin -#: src/Gateways/Stripe/Admin/LicenseManager.php:249 -msgid "Easy Digital Downloads (Pro)" +#. Author of the plugin +#: includes/blocks/includes/functions.php:27 +#: src/Admin/Onboarding/Steps/Tools.php:128 +#: src/Admin/SiteHealth/Test.php:21 +msgid "Easy Digital Downloads" msgstr "" #. Plugin URI of the plugin @@ -27,13 +30,6 @@ msgstr "" msgid "The easiest way to sell digital products with WordPress." msgstr "" -#. Author of the plugin -#: includes/blocks/includes/functions.php:27 -#: src/Admin/Onboarding/Steps/Tools.php:128 -#: src/Admin/SiteHealth/Test.php:21 -msgid "Easy Digital Downloads" -msgstr "" - #: easy-digital-downloads.php:132 msgid "Heads up!" msgstr "" @@ -5755,7 +5751,7 @@ msgstr "" #: includes/admin/downloads/dashboard-columns.php:190 #: includes/admin/import/class-batch-import-downloads.php:65 #: includes/admin/import/class-batch-import-payments.php:77 -#: includes/admin/import/class-batch-import.php:199 +#: includes/admin/import/class-batch-import.php:206 #: includes/admin/payments/actions.php:72 #: includes/admin/payments/actions.php:77 #: includes/admin/payments/actions.php:210 @@ -5934,14 +5930,12 @@ msgstr "" #: includes/blocks/build/cart/index.js:1 #: includes/blocks/build/confirmation/index.js:1 #: includes/blocks/build/login/index.js:1 -#: includes/blocks/build/pro/currency-selector/index.js:1 #: includes/blocks/build/receipt/index.js:1 #: includes/blocks/build/register/index.js:1 #: includes/blocks/src/buy-button/edit.js:55 #: includes/blocks/src/cart/edit.js:27 #: includes/blocks/src/confirmation/edit.js:26 #: includes/blocks/src/login/edit.js:23 -#: includes/blocks/src/pro/currency-selector/edit.js:23 #: includes/blocks/src/receipt/edit.js:26 #: includes/blocks/src/register/edit.js:22 msgid "Settings" @@ -6467,8 +6461,6 @@ msgstr "" #: includes/admin/customers/class-customer-addresses-table.php:287 #: includes/admin/customers/class-customer-email-addresses-table.php:278 #: includes/admin/views/tmpl-order-form-add-order-adjustment.php:17 -#: includes/blocks/build/pro/currency-selector/index.js:1 -#: includes/blocks/src/pro/currency-selector/edit.js:26 msgid "Type" msgstr "" @@ -8096,7 +8088,7 @@ msgstr "" #: includes/admin/import/class-batch-import-downloads.php:65 #: includes/admin/import/class-batch-import-payments.php:77 -#: includes/admin/import/class-batch-import.php:199 +#: includes/admin/import/class-batch-import.php:206 msgid "You do not have permission to import data." msgstr "" @@ -10285,8 +10277,6 @@ msgid "Summaries" msgstr "" #: includes/admin/settings/register-settings.php:790 -#: includes/blocks/build/pro/currency-selector/index.js:1 -#: includes/blocks/src/pro/currency-selector/edit.js:31 msgid "Buttons" msgstr "" @@ -11862,10 +11852,6 @@ msgstr "" msgid "Image" msgstr "" -#: includes/blocks/pro/search.php:16 -msgid "downloads found" -msgstr "" - #: includes/blocks/views/checkout/cart/cart-item.php:23 #: includes/blocks/views/orders/receipt-item.php:31 msgid "Quantity:" @@ -19994,6 +19980,10 @@ msgstr "" msgid "Your license has expired. Please %1$srenew your license%2$s." msgstr "" +#: src/Gateways/Stripe/Admin/LicenseManager.php:249 +msgid "Easy Digital Downloads (Pro)" +msgstr "" + #: src/Gateways/Stripe/Admin/LicenseManager.php:249 msgid "Easy Digital Downloads - Stripe Pro Payment Gateway" msgstr "" @@ -20974,11 +20964,6 @@ msgstr "" msgid "Do Not Show Renewal Orders" msgstr "" -#: includes/blocks/build/pro/currency-selector/index.js:1 -#: includes/blocks/src/pro/currency-selector/edit.js:35 -msgid "Dropdown" -msgstr "" - #: includes/blocks/build/receipt/index.js:1 #: includes/blocks/src/receipt/edit.js:40 msgid "The editor will display a sample random order from your site." @@ -21116,7 +21101,6 @@ msgstr "" #: includes/blocks/build/downloads/block.json #: includes/blocks/build/login/block.json #: includes/blocks/build/order-history/block.json -#: includes/blocks/build/pro/currency-selector/block.json #: includes/blocks/build/receipt/block.json #: includes/blocks/build/register/block.json #: includes/blocks/build/terms/block.json @@ -21128,7 +21112,6 @@ msgstr "" #: includes/blocks/src/downloads/block.json #: includes/blocks/src/login/block.json #: includes/blocks/src/order-history/block.json -#: includes/blocks/src/pro/currency-selector/block.json #: includes/blocks/src/receipt/block.json #: includes/blocks/src/register/block.json #: includes/blocks/src/terms/block.json @@ -21144,7 +21127,6 @@ msgstr "" #: includes/blocks/build/downloads/block.json #: includes/blocks/build/login/block.json #: includes/blocks/build/order-history/block.json -#: includes/blocks/build/pro/currency-selector/block.json #: includes/blocks/build/receipt/block.json #: includes/blocks/build/register/block.json #: includes/blocks/build/terms/block.json @@ -21156,7 +21138,6 @@ msgstr "" #: includes/blocks/src/downloads/block.json #: includes/blocks/src/login/block.json #: includes/blocks/src/order-history/block.json -#: includes/blocks/src/pro/currency-selector/block.json #: includes/blocks/src/receipt/block.json #: includes/blocks/src/register/block.json #: includes/blocks/src/terms/block.json @@ -21281,24 +21262,6 @@ msgctxt "block description" msgid "Display the Easy Digital Downloads order history of a logged in user." msgstr "" -#: includes/blocks/build/pro/currency-selector/block.json -#: includes/blocks/src/pro/currency-selector/block.json -msgctxt "block title" -msgid "EDD Currency Selector" -msgstr "" - -#: includes/blocks/build/pro/currency-selector/block.json -#: includes/blocks/src/pro/currency-selector/block.json -msgctxt "block description" -msgid "Allows your customers to switch the store's currency." -msgstr "" - -#: includes/blocks/build/pro/currency-selector/block.json -#: includes/blocks/src/pro/currency-selector/block.json -msgctxt "block keyword" -msgid "currency" -msgstr "" - #: includes/blocks/build/receipt/block.json #: includes/blocks/src/receipt/block.json msgctxt "block title" diff --git a/libraries/Carbon/lazy/Carbon/MessageFormatter/MessageFormatterMapperStrongType.php b/libraries/Carbon/lazy/Carbon/MessageFormatter/MessageFormatterMapperStrongType.php index f0b6de0b6e..9c0d6dfce9 100644 --- a/libraries/Carbon/lazy/Carbon/MessageFormatter/MessageFormatterMapperStrongType.php +++ b/libraries/Carbon/lazy/Carbon/MessageFormatter/MessageFormatterMapperStrongType.php @@ -11,7 +11,7 @@ namespace EDD\Vendor\Carbon\MessageFormatter; -use Symfony\Component\Translation\Formatter\MessageFormatterInterface; +use EDD\Vendor\Symfony\Component\Translation\Formatter\MessageFormatterInterface; if (!class_exists(LazyMessageFormatter::class, false)) { abstract class LazyMessageFormatter implements MessageFormatterInterface diff --git a/libraries/Carbon/lazy/Carbon/MessageFormatter/MessageFormatterMapperWeakType.php b/libraries/Carbon/lazy/Carbon/MessageFormatter/MessageFormatterMapperWeakType.php index 8793da2d3c..6eac5a29cf 100644 --- a/libraries/Carbon/lazy/Carbon/MessageFormatter/MessageFormatterMapperWeakType.php +++ b/libraries/Carbon/lazy/Carbon/MessageFormatter/MessageFormatterMapperWeakType.php @@ -11,8 +11,8 @@ namespace EDD\Vendor\Carbon\MessageFormatter; -use Symfony\Component\Translation\Formatter\ChoiceMessageFormatterInterface; -use Symfony\Component\Translation\Formatter\MessageFormatterInterface; +use EDD\Vendor\Symfony\Component\Translation\Formatter\ChoiceMessageFormatterInterface; +use EDD\Vendor\Symfony\Component\Translation\Formatter\MessageFormatterInterface; if (!class_exists(LazyMessageFormatter::class, false)) { abstract class LazyMessageFormatter implements MessageFormatterInterface, ChoiceMessageFormatterInterface diff --git a/libraries/Carbon/lazy/Carbon/TranslatorStrongType.php b/libraries/Carbon/lazy/Carbon/TranslatorStrongType.php index 4bdd5e7636..6a3b2f87b4 100644 --- a/libraries/Carbon/lazy/Carbon/TranslatorStrongType.php +++ b/libraries/Carbon/lazy/Carbon/TranslatorStrongType.php @@ -11,7 +11,7 @@ namespace EDD\Vendor\Carbon; -use Symfony\Component\Translation\MessageCatalogueInterface; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogueInterface; if (!class_exists(LazyTranslator::class, false)) { class LazyTranslator extends AbstractTranslator implements TranslatorStrongTypeInterface diff --git a/libraries/Carbon/src/Carbon/AbstractTranslator.php b/libraries/Carbon/src/Carbon/AbstractTranslator.php index 413447569b..7bc43fc5a0 100644 --- a/libraries/Carbon/src/Carbon/AbstractTranslator.php +++ b/libraries/Carbon/src/Carbon/AbstractTranslator.php @@ -15,9 +15,9 @@ use Closure; use ReflectionException; use ReflectionFunction; -use Symfony\Component\Translation; -use Symfony\Component\Translation\Formatter\MessageFormatterInterface; -use Symfony\Component\Translation\Loader\ArrayLoader; +use EDD\Vendor\Symfony\Component\Translation; +use EDD\Vendor\Symfony\Component\Translation\Formatter\MessageFormatterInterface; +use EDD\Vendor\Symfony\Component\Translation\Loader\ArrayLoader; abstract class AbstractTranslator extends Translation\Translator { diff --git a/libraries/Carbon/src/Carbon/CarbonInterface.php b/libraries/Carbon/src/Carbon/CarbonInterface.php index 421de28c20..b93ab1362d 100644 --- a/libraries/Carbon/src/Carbon/CarbonInterface.php +++ b/libraries/Carbon/src/Carbon/CarbonInterface.php @@ -28,7 +28,7 @@ use JsonSerializable; use ReflectionException; use ReturnTypeWillChange; -use Symfony\Component\Translation\TranslatorInterface; +use EDD\Vendor\Symfony\Component\Translation\TranslatorInterface; use Throwable; /** @@ -1090,7 +1090,7 @@ public static function createFromFormat($format, $time, $tz = null); * @param string $time * @param DateTimeZone|string|false|null $tz optional timezone * @param string|null $locale locale to be used for LTS, LT, LL, LLL, etc. macro-formats (en by fault, unneeded if no such macro-format in use) - * @param \Symfony\Component\Translation\TranslatorInterface $translator optional custom translator to use for macro-formats + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator optional custom translator to use for macro-formats * * @throws InvalidFormatException * @@ -2190,7 +2190,7 @@ public function getLocalMacro($name); /** * Get the translator of the current instance or the default if none set. * - * @return \Symfony\Component\Translation\TranslatorInterface + * @return \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface */ public function getLocalTranslator(); @@ -2347,7 +2347,7 @@ public function getTranslatedShortMonthName($context = null); * @param string $key key to find * @param string|null $locale current locale used if null * @param string|null $default default value if translation returns the key - * @param \Symfony\Component\Translation\TranslatorInterface $translator an optional translator to use + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator an optional translator to use * * @return string */ @@ -2356,7 +2356,7 @@ public function getTranslationMessage(string $key, ?string $locale = null, ?stri /** * Returns raw translation message for a given key. * - * @param \Symfony\Component\Translation\TranslatorInterface $translator the translator to use + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator the translator to use * @param string $key key to find * @param string|null $locale current locale used if null * @param string|null $default default value if translation returns the key @@ -2368,7 +2368,7 @@ public static function getTranslationMessageWith($translator, string $key, ?stri /** * Get the default translator instance in use. * - * @return \Symfony\Component\Translation\TranslatorInterface + * @return \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface */ public static function getTranslator(); @@ -3859,7 +3859,7 @@ public function setISODate($year, $week, $day = 1); /** * Set the translator for the current instance. * - * @param \Symfony\Component\Translation\TranslatorInterface $translator + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator * * @return $this */ @@ -4008,7 +4008,7 @@ public static function setToStringFormat($format); /** * Set the default translator instance to use. * - * @param \Symfony\Component\Translation\TranslatorInterface $translator + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator * * @return void */ @@ -4882,7 +4882,7 @@ public static function tomorrow($tz = null); * @param string $key * @param array $parameters * @param string|int|float|null $number - * @param \Symfony\Component\Translation\TranslatorInterface|null $translator + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface|null $translator * @param bool $altNumbers * * @return string @@ -4929,7 +4929,7 @@ public function translateTimeStringTo($timeString, $to = null); /** * Translate using translation string or callback available. * - * @param \Symfony\Component\Translation\TranslatorInterface $translator + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator * @param string $key * @param array $parameters * @param null $number diff --git a/libraries/Carbon/src/Carbon/CarbonInterval.php b/libraries/Carbon/src/Carbon/CarbonInterval.php index 847ec3d841..be94d89e0c 100644 --- a/libraries/Carbon/src/Carbon/CarbonInterval.php +++ b/libraries/Carbon/src/Carbon/CarbonInterval.php @@ -212,7 +212,7 @@ class CarbonInterval extends DateInterval implements CarbonConverterInterface /** * A translator to ... er ... translate stuff * - * @var \Symfony\Component\Translation\TranslatorInterface + * @var \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface */ protected static $translator; @@ -1779,7 +1779,7 @@ public function forHumans($syntax = null, $short = false, $parts = -1, $options $transId = $relativeToNow ? ($isFuture ? 'from_now' : 'ago') : ($isFuture ? 'after' : 'before'); $declensionMode = null; - /** @var \Symfony\Component\Translation\Translator $translator */ + /** @var \EDD\Vendor\Symfony\Component\Translation\Translator $translator */ $translator = $this->getLocalTranslator(); $handleDeclensions = function ($unit, $count, $index = 0, $parts = 1) use ($interpolations, $transId, $translator, $altNumbers, $absolute, &$declensionMode) { diff --git a/libraries/Carbon/src/Carbon/Exceptions/NotLocaleAwareException.php b/libraries/Carbon/src/Carbon/Exceptions/NotLocaleAwareException.php index d81fd90d93..1f093a4ba4 100644 --- a/libraries/Carbon/src/Carbon/Exceptions/NotLocaleAwareException.php +++ b/libraries/Carbon/src/Carbon/Exceptions/NotLocaleAwareException.php @@ -27,6 +27,6 @@ public function __construct($object, $code = 0, Throwable $previous = null) { $dump = \is_object($object) ? \get_class($object) : \gettype($object); - parent::__construct("$dump does neither implements Symfony\Contracts\Translation\LocaleAwareInterface nor getLocale() method.", $code, $previous); + parent::__construct("$dump does neither implements EDD\Vendor\Symfony\Contracts\Translation\LocaleAwareInterface nor getLocale() method.", $code, $previous); } } diff --git a/libraries/Carbon/src/Carbon/Factory.php b/libraries/Carbon/src/Carbon/Factory.php index e815087466..ec12951806 100644 --- a/libraries/Carbon/src/Carbon/Factory.php +++ b/libraries/Carbon/src/Carbon/Factory.php @@ -80,7 +80,7 @@ * instance is created. * @method string getTimeFormatByPrecision($unitPrecision) Return a format from H:i to H:i:s.u according to given unit precision. * @method string getTranslationMessageWith($translator, string $key, ?string $locale = null, ?string $default = null) Returns raw translation message for a given key. - * @method \Symfony\Component\Translation\TranslatorInterface getTranslator() Get the default translator instance in use. + * @method \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface getTranslator() Get the default translator instance in use. * @method int getWeekEndsAt() Get the last day of week * @method int getWeekStartsAt() Get the first day of week * @method array getWeekendDays() Get weekend days diff --git a/libraries/Carbon/src/Carbon/FactoryImmutable.php b/libraries/Carbon/src/Carbon/FactoryImmutable.php index 6e844d7eb2..bfd9ab4a79 100644 --- a/libraries/Carbon/src/Carbon/FactoryImmutable.php +++ b/libraries/Carbon/src/Carbon/FactoryImmutable.php @@ -81,7 +81,7 @@ * instance is created. * @method string getTimeFormatByPrecision($unitPrecision) Return a format from H:i to H:i:s.u according to given unit precision. * @method string getTranslationMessageWith($translator, string $key, ?string $locale = null, ?string $default = null) Returns raw translation message for a given key. - * @method \Symfony\Component\Translation\TranslatorInterface getTranslator() Get the default translator instance in use. + * @method \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface getTranslator() Get the default translator instance in use. * @method int getWeekEndsAt() Get the last day of week * @method int getWeekStartsAt() Get the first day of week * @method array getWeekendDays() Get weekend days diff --git a/libraries/Carbon/src/Carbon/Lang/be.php b/libraries/Carbon/src/Carbon/Lang/be.php index 55222974f3..1a91b0111d 100644 --- a/libraries/Carbon/src/Carbon/Lang/be.php +++ b/libraries/Carbon/src/Carbon/Lang/be.php @@ -10,7 +10,7 @@ */ use EDD\Vendor\Carbon\CarbonInterface; -use Symfony\Component\Translation\PluralizationRules; +use EDD\Vendor\Symfony\Component\Translation\PluralizationRules; // @codeCoverageIgnoreStart if (class_exists(PluralizationRules::class)) { diff --git a/libraries/Carbon/src/Carbon/Lang/ca_ES_Valencia.php b/libraries/Carbon/src/Carbon/Lang/ca_ES_Valencia.php index 9c3ab09129..5cd1ccdfd6 100644 --- a/libraries/Carbon/src/Carbon/Lang/ca_ES_Valencia.php +++ b/libraries/Carbon/src/Carbon/Lang/ca_ES_Valencia.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use Symfony\Component\Translation\PluralizationRules; +use EDD\Vendor\Symfony\Component\Translation\PluralizationRules; // @codeCoverageIgnoreStart if (class_exists(PluralizationRules::class)) { diff --git a/libraries/Carbon/src/Carbon/Lang/oc.php b/libraries/Carbon/src/Carbon/Lang/oc.php index 8ab7c87071..99bde204bb 100644 --- a/libraries/Carbon/src/Carbon/Lang/oc.php +++ b/libraries/Carbon/src/Carbon/Lang/oc.php @@ -14,7 +14,7 @@ * - Quentí */ // @codeCoverageIgnoreStart -use Symfony\Component\Translation\PluralizationRules; +use EDD\Vendor\Symfony\Component\Translation\PluralizationRules; if (class_exists('Symfony\\Component\\Translation\\PluralizationRules')) { PluralizationRules::set(static function ($number) { diff --git a/libraries/Carbon/src/Carbon/Lang/sh.php b/libraries/Carbon/src/Carbon/Lang/sh.php index babf7059c4..e3672a444a 100644 --- a/libraries/Carbon/src/Carbon/Lang/sh.php +++ b/libraries/Carbon/src/Carbon/Lang/sh.php @@ -10,7 +10,7 @@ */ // @codeCoverageIgnoreStart -use Symfony\Component\Translation\PluralizationRules; +use EDD\Vendor\Symfony\Component\Translation\PluralizationRules; if (class_exists('Symfony\\Component\\Translation\\PluralizationRules')) { PluralizationRules::set(static function ($number) { diff --git a/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_BA.php b/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_BA.php index 326d34bd0f..8f67b8b501 100644 --- a/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_BA.php +++ b/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_BA.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use Symfony\Component\Translation\PluralizationRules; +use EDD\Vendor\Symfony\Component\Translation\PluralizationRules; // @codeCoverageIgnoreStart if (class_exists(PluralizationRules::class)) { diff --git a/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_ME.php b/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_ME.php index 2fa11e195e..f84a4f7b7a 100644 --- a/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_ME.php +++ b/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_ME.php @@ -16,7 +16,7 @@ */ use EDD\Vendor\Carbon\CarbonInterface; -use Symfony\Component\Translation\PluralizationRules; +use EDD\Vendor\Symfony\Component\Translation\PluralizationRules; // @codeCoverageIgnoreStart if (class_exists(PluralizationRules::class)) { diff --git a/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_XK.php b/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_XK.php index 8d44a54e06..2080206882 100644 --- a/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_XK.php +++ b/libraries/Carbon/src/Carbon/Lang/sr_Cyrl_XK.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use Symfony\Component\Translation\PluralizationRules; +use EDD\Vendor\Symfony\Component\Translation\PluralizationRules; // @codeCoverageIgnoreStart if (class_exists(PluralizationRules::class)) { diff --git a/libraries/Carbon/src/Carbon/Lang/sr_Latn_BA.php b/libraries/Carbon/src/Carbon/Lang/sr_Latn_BA.php index aa28f0015d..650a142aca 100644 --- a/libraries/Carbon/src/Carbon/Lang/sr_Latn_BA.php +++ b/libraries/Carbon/src/Carbon/Lang/sr_Latn_BA.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use Symfony\Component\Translation\PluralizationRules; +use EDD\Vendor\Symfony\Component\Translation\PluralizationRules; // @codeCoverageIgnoreStart if (class_exists(PluralizationRules::class)) { diff --git a/libraries/Carbon/src/Carbon/Lang/sr_Latn_ME.php b/libraries/Carbon/src/Carbon/Lang/sr_Latn_ME.php index 80c7d0f757..4b6205afd6 100644 --- a/libraries/Carbon/src/Carbon/Lang/sr_Latn_ME.php +++ b/libraries/Carbon/src/Carbon/Lang/sr_Latn_ME.php @@ -16,7 +16,7 @@ */ use EDD\Vendor\Carbon\CarbonInterface; -use Symfony\Component\Translation\PluralizationRules; +use EDD\Vendor\Symfony\Component\Translation\PluralizationRules; // @codeCoverageIgnoreStart if (class_exists(PluralizationRules::class)) { diff --git a/libraries/Carbon/src/Carbon/Lang/sr_Latn_XK.php b/libraries/Carbon/src/Carbon/Lang/sr_Latn_XK.php index dde08e0b66..683e1b1f4e 100644 --- a/libraries/Carbon/src/Carbon/Lang/sr_Latn_XK.php +++ b/libraries/Carbon/src/Carbon/Lang/sr_Latn_XK.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use Symfony\Component\Translation\PluralizationRules; +use EDD\Vendor\Symfony\Component\Translation\PluralizationRules; // @codeCoverageIgnoreStart if (class_exists(PluralizationRules::class)) { diff --git a/libraries/Carbon/src/Carbon/MessageFormatter/MessageFormatterMapper.php b/libraries/Carbon/src/Carbon/MessageFormatter/MessageFormatterMapper.php index a49339b9e5..b11214b258 100644 --- a/libraries/Carbon/src/Carbon/MessageFormatter/MessageFormatterMapper.php +++ b/libraries/Carbon/src/Carbon/MessageFormatter/MessageFormatterMapper.php @@ -12,8 +12,8 @@ namespace EDD\Vendor\Carbon\MessageFormatter; use ReflectionMethod; -use Symfony\Component\Translation\Formatter\MessageFormatter; -use Symfony\Component\Translation\Formatter\MessageFormatterInterface; +use EDD\Vendor\Symfony\Component\Translation\Formatter\MessageFormatter; +use EDD\Vendor\Symfony\Component\Translation\Formatter\MessageFormatterInterface; // @codeCoverageIgnoreStart $transMethod = new ReflectionMethod(MessageFormatterInterface::class, 'format'); diff --git a/libraries/Carbon/src/Carbon/Traits/Creator.php b/libraries/Carbon/src/Carbon/Traits/Creator.php index 0a009a03f3..cc0237d736 100644 --- a/libraries/Carbon/src/Carbon/Traits/Creator.php +++ b/libraries/Carbon/src/Carbon/Traits/Creator.php @@ -727,7 +727,7 @@ public static function createFromFormat($format, $time, $tz = null) * @param string $time * @param DateTimeZone|string|false|null $tz optional timezone * @param string|null $locale locale to be used for LTS, LT, LL, LLL, etc. macro-formats (en by fault, unneeded if no such macro-format in use) - * @param \Symfony\Component\Translation\TranslatorInterface $translator optional custom translator to use for macro-formats + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator optional custom translator to use for macro-formats * * @throws InvalidFormatException * diff --git a/libraries/Carbon/src/Carbon/Traits/Localization.php b/libraries/Carbon/src/Carbon/Traits/Localization.php index e615d4f083..a44a32975c 100644 --- a/libraries/Carbon/src/Carbon/Traits/Localization.php +++ b/libraries/Carbon/src/Carbon/Traits/Localization.php @@ -18,10 +18,10 @@ use EDD\Vendor\Carbon\Translator; use EDD\Vendor\Carbon\TranslatorStrongTypeInterface; use Closure; -use Symfony\Component\Translation\TranslatorBagInterface; -use Symfony\Component\Translation\TranslatorInterface; -use Symfony\Contracts\Translation\LocaleAwareInterface; -use Symfony\Contracts\Translation\TranslatorInterface as ContractsTranslatorInterface; +use EDD\Vendor\Symfony\Component\Translation\TranslatorBagInterface; +use EDD\Vendor\Symfony\Component\Translation\TranslatorInterface; +use EDD\Vendor\Symfony\Contracts\Translation\LocaleAwareInterface; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorInterface as ContractsTranslatorInterface; // @codeCoverageIgnoreStart if (interface_exists('Symfony\\Contracts\\Translation\\TranslatorInterface') && @@ -44,14 +44,14 @@ trait Localization /** * Default translator. * - * @var \Symfony\Component\Translation\TranslatorInterface + * @var \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface */ protected static $translator; /** * Specific translator of the current instance. * - * @var \Symfony\Component\Translation\TranslatorInterface + * @var \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface */ protected $localTranslator; @@ -111,7 +111,7 @@ public static function getHumanDiffOptions() /** * Get the default translator instance in use. * - * @return \Symfony\Component\Translation\TranslatorInterface + * @return \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface */ public static function getTranslator() { @@ -121,7 +121,7 @@ public static function getTranslator() /** * Set the default translator instance to use. * - * @param \Symfony\Component\Translation\TranslatorInterface $translator + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator * * @return void */ @@ -143,7 +143,7 @@ public function hasLocalTranslator() /** * Get the translator of the current instance or the default if none set. * - * @return \Symfony\Component\Translation\TranslatorInterface + * @return \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface */ public function getLocalTranslator() { @@ -153,7 +153,7 @@ public function getLocalTranslator() /** * Set the translator for the current instance. * - * @param \Symfony\Component\Translation\TranslatorInterface $translator + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator * * @return $this */ @@ -167,7 +167,7 @@ public function setLocalTranslator(TranslatorInterface $translator) /** * Returns raw translation message for a given key. * - * @param \Symfony\Component\Translation\TranslatorInterface $translator the translator to use + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator the translator to use * @param string $key key to find * @param string|null $locale current locale used if null * @param string|null $default default value if translation returns the key @@ -198,7 +198,7 @@ public static function getTranslationMessageWith($translator, string $key, ?stri * @param string $key key to find * @param string|null $locale current locale used if null * @param string|null $default default value if translation returns the key - * @param \Symfony\Component\Translation\TranslatorInterface $translator an optional translator to use + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator an optional translator to use * * @return string */ @@ -210,7 +210,7 @@ public function getTranslationMessage(string $key, ?string $locale = null, ?stri /** * Translate using translation string or callback available. * - * @param \Symfony\Component\Translation\TranslatorInterface $translator + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface $translator * @param string $key * @param array $parameters * @param null $number @@ -246,7 +246,7 @@ public static function translateWith(TranslatorInterface $translator, string $ke * @param string $key * @param array $parameters * @param string|int|float|null $number - * @param \Symfony\Component\Translation\TranslatorInterface|null $translator + * @param \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface|null $translator * @param bool $altNumbers * * @return string @@ -695,7 +695,7 @@ public static function getAvailableLocalesInfo() /** * Initialize the default translator instance if necessary. * - * @return \Symfony\Component\Translation\TranslatorInterface + * @return \EDD\Vendor\Symfony\Component\Translation\TranslatorInterface */ protected static function translator() { @@ -749,7 +749,7 @@ protected static function getLocaleAwareTranslator($translator = null) /** * @param mixed $translator - * @param \Symfony\Component\Translation\MessageCatalogueInterface $catalogue + * @param \EDD\Vendor\Symfony\Component\Translation\MessageCatalogueInterface $catalogue * * @return mixed */ diff --git a/libraries/Carbon/src/Carbon/Translator.php b/libraries/Carbon/src/Carbon/Translator.php index fad7f4a601..98f3e11218 100644 --- a/libraries/Carbon/src/Carbon/Translator.php +++ b/libraries/Carbon/src/Carbon/Translator.php @@ -12,8 +12,8 @@ namespace EDD\Vendor\Carbon; use ReflectionMethod; -use Symfony\Component\Translation; -use Symfony\Contracts\Translation\TranslatorInterface; +use EDD\Vendor\Symfony\Component\Translation; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorInterface; $transMethod = new ReflectionMethod( class_exists(TranslatorInterface::class) diff --git a/libraries/Carbon/src/Carbon/TranslatorImmutable.php b/libraries/Carbon/src/Carbon/TranslatorImmutable.php index ccf81fd448..1c6398aad0 100644 --- a/libraries/Carbon/src/Carbon/TranslatorImmutable.php +++ b/libraries/Carbon/src/Carbon/TranslatorImmutable.php @@ -13,7 +13,7 @@ use EDD\Vendor\Carbon\Exceptions\ImmutableException; use Symfony\Component\Config\ConfigCacheFactoryInterface; -use Symfony\Component\Translation\Formatter\MessageFormatterInterface; +use EDD\Vendor\Symfony\Component\Translation\Formatter\MessageFormatterInterface; class TranslatorImmutable extends Translator { diff --git a/libraries/Carbon/src/Carbon/TranslatorStrongTypeInterface.php b/libraries/Carbon/src/Carbon/TranslatorStrongTypeInterface.php index 00cad464ea..2a3960bd20 100644 --- a/libraries/Carbon/src/Carbon/TranslatorStrongTypeInterface.php +++ b/libraries/Carbon/src/Carbon/TranslatorStrongTypeInterface.php @@ -11,7 +11,7 @@ namespace EDD\Vendor\Carbon; -use Symfony\Component\Translation\MessageCatalogueInterface; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogueInterface; /** * Mark translator using strong type from symfony/translation >= 6. diff --git a/vendor/symfony/translation/CHANGELOG.md b/libraries/Symfony/Component/Translation/CHANGELOG.md similarity index 100% rename from vendor/symfony/translation/CHANGELOG.md rename to libraries/Symfony/Component/Translation/CHANGELOG.md diff --git a/vendor/symfony/translation/Catalogue/AbstractOperation.php b/libraries/Symfony/Component/Translation/Catalogue/AbstractOperation.php similarity index 94% rename from vendor/symfony/translation/Catalogue/AbstractOperation.php rename to libraries/Symfony/Component/Translation/Catalogue/AbstractOperation.php index 65eea0bb9b..1358bf2ce8 100644 --- a/vendor/symfony/translation/Catalogue/AbstractOperation.php +++ b/libraries/Symfony/Component/Translation/Catalogue/AbstractOperation.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Catalogue; +namespace EDD\Vendor\Symfony\Component\Translation\Catalogue; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Component\Translation\Exception\LogicException; -use Symfony\Component\Translation\MessageCatalogue; -use Symfony\Component\Translation\MessageCatalogueInterface; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\Exception\LogicException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogueInterface; /** * Base catalogues binary operation class. diff --git a/vendor/symfony/translation/Catalogue/MergeOperation.php b/libraries/Symfony/Component/Translation/Catalogue/MergeOperation.php similarity index 95% rename from vendor/symfony/translation/Catalogue/MergeOperation.php rename to libraries/Symfony/Component/Translation/Catalogue/MergeOperation.php index 1b777a8435..e987192044 100644 --- a/vendor/symfony/translation/Catalogue/MergeOperation.php +++ b/libraries/Symfony/Component/Translation/Catalogue/MergeOperation.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Catalogue; +namespace EDD\Vendor\Symfony\Component\Translation\Catalogue; -use Symfony\Component\Translation\MessageCatalogueInterface; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogueInterface; /** * Merge operation between two catalogues as follows: diff --git a/vendor/symfony/translation/Catalogue/OperationInterface.php b/libraries/Symfony/Component/Translation/Catalogue/OperationInterface.php similarity index 92% rename from vendor/symfony/translation/Catalogue/OperationInterface.php rename to libraries/Symfony/Component/Translation/Catalogue/OperationInterface.php index 1fe9534e8e..7b7529e96c 100644 --- a/vendor/symfony/translation/Catalogue/OperationInterface.php +++ b/libraries/Symfony/Component/Translation/Catalogue/OperationInterface.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Catalogue; +namespace EDD\Vendor\Symfony\Component\Translation\Catalogue; -use Symfony\Component\Translation\MessageCatalogueInterface; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogueInterface; /** * Represents an operation on catalogue(s). diff --git a/vendor/symfony/translation/Catalogue/TargetOperation.php b/libraries/Symfony/Component/Translation/Catalogue/TargetOperation.php similarity index 96% rename from vendor/symfony/translation/Catalogue/TargetOperation.php rename to libraries/Symfony/Component/Translation/Catalogue/TargetOperation.php index 2c0ec722ee..a5450267b8 100644 --- a/vendor/symfony/translation/Catalogue/TargetOperation.php +++ b/libraries/Symfony/Component/Translation/Catalogue/TargetOperation.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Catalogue; +namespace EDD\Vendor\Symfony\Component\Translation\Catalogue; -use Symfony\Component\Translation\MessageCatalogueInterface; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogueInterface; /** * Target operation between two catalogues: diff --git a/vendor/symfony/translation/CatalogueMetadataAwareInterface.php b/libraries/Symfony/Component/Translation/CatalogueMetadataAwareInterface.php similarity index 96% rename from vendor/symfony/translation/CatalogueMetadataAwareInterface.php rename to libraries/Symfony/Component/Translation/CatalogueMetadataAwareInterface.php index c845959f1a..cf67453cbe 100644 --- a/vendor/symfony/translation/CatalogueMetadataAwareInterface.php +++ b/libraries/Symfony/Component/Translation/CatalogueMetadataAwareInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; /** * This interface is used to get, set, and delete metadata about the Catalogue. diff --git a/vendor/symfony/translation/Command/TranslationPullCommand.php b/libraries/Symfony/Component/Translation/Command/TranslationPullCommand.php similarity index 94% rename from vendor/symfony/translation/Command/TranslationPullCommand.php rename to libraries/Symfony/Component/Translation/Command/TranslationPullCommand.php index 646b92c832..f34abf1b43 100644 --- a/vendor/symfony/translation/Command/TranslationPullCommand.php +++ b/libraries/Symfony/Component/Translation/Command/TranslationPullCommand.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Command; +namespace EDD\Vendor\Symfony\Component\Translation\Command; use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Command\Command; @@ -20,11 +20,11 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; -use Symfony\Component\Translation\Catalogue\TargetOperation; -use Symfony\Component\Translation\MessageCatalogue; -use Symfony\Component\Translation\Provider\TranslationProviderCollection; -use Symfony\Component\Translation\Reader\TranslationReaderInterface; -use Symfony\Component\Translation\Writer\TranslationWriterInterface; +use EDD\Vendor\Symfony\Component\Translation\Catalogue\TargetOperation; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Provider\TranslationProviderCollection; +use EDD\Vendor\Symfony\Component\Translation\Reader\TranslationReaderInterface; +use EDD\Vendor\Symfony\Component\Translation\Writer\TranslationWriterInterface; /** * @author Mathieu Santostefano diff --git a/vendor/symfony/translation/Command/TranslationPushCommand.php b/libraries/Symfony/Component/Translation/Command/TranslationPushCommand.php similarity index 95% rename from vendor/symfony/translation/Command/TranslationPushCommand.php rename to libraries/Symfony/Component/Translation/Command/TranslationPushCommand.php index 1d04adbc9d..37f23a00cc 100644 --- a/vendor/symfony/translation/Command/TranslationPushCommand.php +++ b/libraries/Symfony/Component/Translation/Command/TranslationPushCommand.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Command; +namespace EDD\Vendor\Symfony\Component\Translation\Command; use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Command\Command; @@ -21,10 +21,10 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; -use Symfony\Component\Translation\Provider\FilteringProvider; -use Symfony\Component\Translation\Provider\TranslationProviderCollection; -use Symfony\Component\Translation\Reader\TranslationReaderInterface; -use Symfony\Component\Translation\TranslatorBag; +use EDD\Vendor\Symfony\Component\Translation\Provider\FilteringProvider; +use EDD\Vendor\Symfony\Component\Translation\Provider\TranslationProviderCollection; +use EDD\Vendor\Symfony\Component\Translation\Reader\TranslationReaderInterface; +use EDD\Vendor\Symfony\Component\Translation\TranslatorBag; /** * @author Mathieu Santostefano diff --git a/vendor/symfony/translation/Command/TranslationTrait.php b/libraries/Symfony/Component/Translation/Command/TranslationTrait.php similarity index 89% rename from vendor/symfony/translation/Command/TranslationTrait.php rename to libraries/Symfony/Component/Translation/Command/TranslationTrait.php index eafaffd3f1..5ef2aa2f47 100644 --- a/vendor/symfony/translation/Command/TranslationTrait.php +++ b/libraries/Symfony/Component/Translation/Command/TranslationTrait.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Command; +namespace EDD\Vendor\Symfony\Component\Translation\Command; -use Symfony\Component\Translation\MessageCatalogue; -use Symfony\Component\Translation\MessageCatalogueInterface; -use Symfony\Component\Translation\TranslatorBag; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogueInterface; +use EDD\Vendor\Symfony\Component\Translation\TranslatorBag; /** * @internal diff --git a/vendor/symfony/translation/Command/XliffLintCommand.php b/libraries/Symfony/Component/Translation/Command/XliffLintCommand.php similarity index 98% rename from vendor/symfony/translation/Command/XliffLintCommand.php rename to libraries/Symfony/Component/Translation/Command/XliffLintCommand.php index ba68635db7..4947aab09e 100644 --- a/vendor/symfony/translation/Command/XliffLintCommand.php +++ b/libraries/Symfony/Component/Translation/Command/XliffLintCommand.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Command; +namespace EDD\Vendor\Symfony\Component\Translation\Command; use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\CI\GithubActionReporter; @@ -22,8 +22,8 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Component\Translation\Util\XliffUtils; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\Util\XliffUtils; /** * Validates XLIFF files syntax and outputs encountered errors. diff --git a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php b/libraries/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php similarity index 96% rename from vendor/symfony/translation/DataCollector/TranslationDataCollector.php rename to libraries/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php index cdbba8cf3a..f25e02fafe 100644 --- a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php +++ b/libraries/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php @@ -9,13 +9,13 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\DataCollector; +namespace EDD\Vendor\Symfony\Component\Translation\DataCollector; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\DataCollector\DataCollector; use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface; -use Symfony\Component\Translation\DataCollectorTranslator; +use EDD\Vendor\Symfony\Component\Translation\DataCollectorTranslator; use Symfony\Component\VarDumper\Cloner\Data; /** diff --git a/vendor/symfony/translation/DataCollectorTranslator.php b/libraries/Symfony/Component/Translation/DataCollectorTranslator.php similarity index 94% rename from vendor/symfony/translation/DataCollectorTranslator.php rename to libraries/Symfony/Component/Translation/DataCollectorTranslator.php index 0e584daad1..4146468d3d 100644 --- a/vendor/symfony/translation/DataCollectorTranslator.php +++ b/libraries/Symfony/Component/Translation/DataCollectorTranslator.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Contracts\Translation\LocaleAwareInterface; -use Symfony\Contracts\Translation\TranslatorInterface; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Contracts\Translation\LocaleAwareInterface; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorInterface; /** * @author Abdellatif Ait boudad diff --git a/vendor/symfony/translation/DependencyInjection/TranslationDumperPass.php b/libraries/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php similarity index 93% rename from vendor/symfony/translation/DependencyInjection/TranslationDumperPass.php rename to libraries/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php index 2ece6ac7b3..79eae4d89b 100644 --- a/vendor/symfony/translation/DependencyInjection/TranslationDumperPass.php +++ b/libraries/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\DependencyInjection; +namespace EDD\Vendor\Symfony\Component\Translation\DependencyInjection; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/vendor/symfony/translation/DependencyInjection/TranslationExtractorPass.php b/libraries/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php similarity index 94% rename from vendor/symfony/translation/DependencyInjection/TranslationExtractorPass.php rename to libraries/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php index 1baf9341e4..4c5e1e926b 100644 --- a/vendor/symfony/translation/DependencyInjection/TranslationExtractorPass.php +++ b/libraries/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\DependencyInjection; +namespace EDD\Vendor\Symfony\Component\Translation\DependencyInjection; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/vendor/symfony/translation/DependencyInjection/TranslatorPass.php b/libraries/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php similarity index 98% rename from vendor/symfony/translation/DependencyInjection/TranslatorPass.php rename to libraries/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php index dd6ea3c831..2aece562ec 100644 --- a/vendor/symfony/translation/DependencyInjection/TranslatorPass.php +++ b/libraries/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\DependencyInjection; +namespace EDD\Vendor\Symfony\Component\Translation\DependencyInjection; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass; diff --git a/vendor/symfony/translation/DependencyInjection/TranslatorPathsPass.php b/libraries/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php similarity index 98% rename from vendor/symfony/translation/DependencyInjection/TranslatorPathsPass.php rename to libraries/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php index f7f954eea1..7d3e6c56e0 100644 --- a/vendor/symfony/translation/DependencyInjection/TranslatorPathsPass.php +++ b/libraries/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\DependencyInjection; +namespace EDD\Vendor\Symfony\Component\Translation\DependencyInjection; use Symfony\Component\DependencyInjection\Compiler\AbstractRecursivePass; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/vendor/symfony/translation/Dumper/CsvFileDumper.php b/libraries/Symfony/Component/Translation/Dumper/CsvFileDumper.php similarity index 91% rename from vendor/symfony/translation/Dumper/CsvFileDumper.php rename to libraries/Symfony/Component/Translation/Dumper/CsvFileDumper.php index 8f54752590..615b192a3d 100644 --- a/vendor/symfony/translation/Dumper/CsvFileDumper.php +++ b/libraries/Symfony/Component/Translation/Dumper/CsvFileDumper.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * CsvFileDumper generates a csv formatted string representation of a message catalogue. diff --git a/vendor/symfony/translation/Dumper/DumperInterface.php b/libraries/Symfony/Component/Translation/Dumper/DumperInterface.php similarity index 84% rename from vendor/symfony/translation/Dumper/DumperInterface.php rename to libraries/Symfony/Component/Translation/Dumper/DumperInterface.php index 6bf42931ef..186b2b884d 100644 --- a/vendor/symfony/translation/Dumper/DumperInterface.php +++ b/libraries/Symfony/Component/Translation/Dumper/DumperInterface.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * DumperInterface is the interface implemented by all translation dumpers. diff --git a/vendor/symfony/translation/Dumper/FileDumper.php b/libraries/Symfony/Component/Translation/Dumper/FileDumper.php similarity index 92% rename from vendor/symfony/translation/Dumper/FileDumper.php rename to libraries/Symfony/Component/Translation/Dumper/FileDumper.php index ed2c278aaf..18c3b8a61c 100644 --- a/vendor/symfony/translation/Dumper/FileDumper.php +++ b/libraries/Symfony/Component/Translation/Dumper/FileDumper.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Component\Translation\Exception\RuntimeException; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\Exception\RuntimeException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * FileDumper is an implementation of DumperInterface that dump a message catalogue to file(s). diff --git a/vendor/symfony/translation/Dumper/IcuResFileDumper.php b/libraries/Symfony/Component/Translation/Dumper/IcuResFileDumper.php similarity index 95% rename from vendor/symfony/translation/Dumper/IcuResFileDumper.php rename to libraries/Symfony/Component/Translation/Dumper/IcuResFileDumper.php index 72c1ec0890..f2876dd25c 100644 --- a/vendor/symfony/translation/Dumper/IcuResFileDumper.php +++ b/libraries/Symfony/Component/Translation/Dumper/IcuResFileDumper.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * IcuResDumper generates an ICU ResourceBundle formatted string representation of a message catalogue. diff --git a/vendor/symfony/translation/Dumper/IniFileDumper.php b/libraries/Symfony/Component/Translation/Dumper/IniFileDumper.php similarity index 87% rename from vendor/symfony/translation/Dumper/IniFileDumper.php rename to libraries/Symfony/Component/Translation/Dumper/IniFileDumper.php index 6cbdef6067..e4a4efdc00 100644 --- a/vendor/symfony/translation/Dumper/IniFileDumper.php +++ b/libraries/Symfony/Component/Translation/Dumper/IniFileDumper.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * IniFileDumper generates an ini formatted string representation of a message catalogue. diff --git a/vendor/symfony/translation/Dumper/JsonFileDumper.php b/libraries/Symfony/Component/Translation/Dumper/JsonFileDumper.php similarity index 85% rename from vendor/symfony/translation/Dumper/JsonFileDumper.php rename to libraries/Symfony/Component/Translation/Dumper/JsonFileDumper.php index e5035397f7..e59958d1ea 100644 --- a/vendor/symfony/translation/Dumper/JsonFileDumper.php +++ b/libraries/Symfony/Component/Translation/Dumper/JsonFileDumper.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * JsonFileDumper generates an json formatted string representation of a message catalogue. diff --git a/vendor/symfony/translation/Dumper/MoFileDumper.php b/libraries/Symfony/Component/Translation/Dumper/MoFileDumper.php similarity index 91% rename from vendor/symfony/translation/Dumper/MoFileDumper.php rename to libraries/Symfony/Component/Translation/Dumper/MoFileDumper.php index 9ded5f4ef3..9835a7aca5 100644 --- a/vendor/symfony/translation/Dumper/MoFileDumper.php +++ b/libraries/Symfony/Component/Translation/Dumper/MoFileDumper.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\Loader\MoFileLoader; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Loader\MoFileLoader; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * MoFileDumper generates a gettext formatted string representation of a message catalogue. diff --git a/vendor/symfony/translation/Dumper/PhpFileDumper.php b/libraries/Symfony/Component/Translation/Dumper/PhpFileDumper.php similarity index 85% rename from vendor/symfony/translation/Dumper/PhpFileDumper.php rename to libraries/Symfony/Component/Translation/Dumper/PhpFileDumper.php index 51e90665d7..06208e90c3 100644 --- a/vendor/symfony/translation/Dumper/PhpFileDumper.php +++ b/libraries/Symfony/Component/Translation/Dumper/PhpFileDumper.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * PhpFileDumper generates PHP files from a message catalogue. diff --git a/vendor/symfony/translation/Dumper/PoFileDumper.php b/libraries/Symfony/Component/Translation/Dumper/PoFileDumper.php similarity index 96% rename from vendor/symfony/translation/Dumper/PoFileDumper.php rename to libraries/Symfony/Component/Translation/Dumper/PoFileDumper.php index a2d0deb781..b2d622f96a 100644 --- a/vendor/symfony/translation/Dumper/PoFileDumper.php +++ b/libraries/Symfony/Component/Translation/Dumper/PoFileDumper.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * PoFileDumper generates a gettext formatted string representation of a message catalogue. diff --git a/vendor/symfony/translation/Dumper/QtFileDumper.php b/libraries/Symfony/Component/Translation/Dumper/QtFileDumper.php similarity index 93% rename from vendor/symfony/translation/Dumper/QtFileDumper.php rename to libraries/Symfony/Component/Translation/Dumper/QtFileDumper.php index 0373e9c109..9f273b5ddf 100644 --- a/vendor/symfony/translation/Dumper/QtFileDumper.php +++ b/libraries/Symfony/Component/Translation/Dumper/QtFileDumper.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * QtFileDumper generates ts files from a message catalogue. diff --git a/vendor/symfony/translation/Dumper/XliffFileDumper.php b/libraries/Symfony/Component/Translation/Dumper/XliffFileDumper.php similarity index 97% rename from vendor/symfony/translation/Dumper/XliffFileDumper.php rename to libraries/Symfony/Component/Translation/Dumper/XliffFileDumper.php index 22f0227b9d..24b68910fc 100644 --- a/vendor/symfony/translation/Dumper/XliffFileDumper.php +++ b/libraries/Symfony/Component/Translation/Dumper/XliffFileDumper.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * XliffFileDumper generates xliff files from a message catalogue. diff --git a/vendor/symfony/translation/Dumper/YamlFileDumper.php b/libraries/Symfony/Component/Translation/Dumper/YamlFileDumper.php similarity index 83% rename from vendor/symfony/translation/Dumper/YamlFileDumper.php rename to libraries/Symfony/Component/Translation/Dumper/YamlFileDumper.php index d2670331e6..c2995a95d0 100644 --- a/vendor/symfony/translation/Dumper/YamlFileDumper.php +++ b/libraries/Symfony/Component/Translation/Dumper/YamlFileDumper.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Dumper; +namespace EDD\Vendor\Symfony\Component\Translation\Dumper; -use Symfony\Component\Translation\Exception\LogicException; -use Symfony\Component\Translation\MessageCatalogue; -use Symfony\Component\Translation\Util\ArrayConverter; +use EDD\Vendor\Symfony\Component\Translation\Exception\LogicException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Util\ArrayConverter; use Symfony\Component\Yaml\Yaml; /** diff --git a/vendor/symfony/translation/Exception/ExceptionInterface.php b/libraries/Symfony/Component/Translation/Exception/ExceptionInterface.php similarity index 87% rename from vendor/symfony/translation/Exception/ExceptionInterface.php rename to libraries/Symfony/Component/Translation/Exception/ExceptionInterface.php index 8f9c54ef7a..39d10d9095 100644 --- a/vendor/symfony/translation/Exception/ExceptionInterface.php +++ b/libraries/Symfony/Component/Translation/Exception/ExceptionInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Exception; +namespace EDD\Vendor\Symfony\Component\Translation\Exception; /** * Exception interface for all exceptions thrown by the component. diff --git a/vendor/symfony/translation/Exception/IncompleteDsnException.php b/libraries/Symfony/Component/Translation/Exception/IncompleteDsnException.php similarity index 90% rename from vendor/symfony/translation/Exception/IncompleteDsnException.php rename to libraries/Symfony/Component/Translation/Exception/IncompleteDsnException.php index cb0ce027eb..3281fe476d 100644 --- a/vendor/symfony/translation/Exception/IncompleteDsnException.php +++ b/libraries/Symfony/Component/Translation/Exception/IncompleteDsnException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Exception; +namespace EDD\Vendor\Symfony\Component\Translation\Exception; class IncompleteDsnException extends InvalidArgumentException { diff --git a/vendor/symfony/translation/Exception/InvalidArgumentException.php b/libraries/Symfony/Component/Translation/Exception/InvalidArgumentException.php similarity index 88% rename from vendor/symfony/translation/Exception/InvalidArgumentException.php rename to libraries/Symfony/Component/Translation/Exception/InvalidArgumentException.php index 90d06690f1..ec91e42b65 100644 --- a/vendor/symfony/translation/Exception/InvalidArgumentException.php +++ b/libraries/Symfony/Component/Translation/Exception/InvalidArgumentException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Exception; +namespace EDD\Vendor\Symfony\Component\Translation\Exception; /** * Base InvalidArgumentException for the Translation component. diff --git a/vendor/symfony/translation/Exception/InvalidResourceException.php b/libraries/Symfony/Component/Translation/Exception/InvalidResourceException.php similarity index 87% rename from vendor/symfony/translation/Exception/InvalidResourceException.php rename to libraries/Symfony/Component/Translation/Exception/InvalidResourceException.php index cf079432c9..85b1610ef7 100644 --- a/vendor/symfony/translation/Exception/InvalidResourceException.php +++ b/libraries/Symfony/Component/Translation/Exception/InvalidResourceException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Exception; +namespace EDD\Vendor\Symfony\Component\Translation\Exception; /** * Thrown when a resource cannot be loaded. diff --git a/vendor/symfony/translation/Exception/LogicException.php b/libraries/Symfony/Component/Translation/Exception/LogicException.php similarity index 87% rename from vendor/symfony/translation/Exception/LogicException.php rename to libraries/Symfony/Component/Translation/Exception/LogicException.php index 9019c7e7be..271104fa5a 100644 --- a/vendor/symfony/translation/Exception/LogicException.php +++ b/libraries/Symfony/Component/Translation/Exception/LogicException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Exception; +namespace EDD\Vendor\Symfony\Component\Translation\Exception; /** * Base LogicException for Translation component. diff --git a/vendor/symfony/translation/Exception/MissingRequiredOptionException.php b/libraries/Symfony/Component/Translation/Exception/MissingRequiredOptionException.php similarity index 90% rename from vendor/symfony/translation/Exception/MissingRequiredOptionException.php rename to libraries/Symfony/Component/Translation/Exception/MissingRequiredOptionException.php index 2b5f808065..b84cb90a5c 100644 --- a/vendor/symfony/translation/Exception/MissingRequiredOptionException.php +++ b/libraries/Symfony/Component/Translation/Exception/MissingRequiredOptionException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Exception; +namespace EDD\Vendor\Symfony\Component\Translation\Exception; /** * @author Oskar Stark diff --git a/vendor/symfony/translation/Exception/NotFoundResourceException.php b/libraries/Symfony/Component/Translation/Exception/NotFoundResourceException.php similarity index 87% rename from vendor/symfony/translation/Exception/NotFoundResourceException.php rename to libraries/Symfony/Component/Translation/Exception/NotFoundResourceException.php index cff73ae30b..246af01c13 100644 --- a/vendor/symfony/translation/Exception/NotFoundResourceException.php +++ b/libraries/Symfony/Component/Translation/Exception/NotFoundResourceException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Exception; +namespace EDD\Vendor\Symfony\Component\Translation\Exception; /** * Thrown when a resource does not exist. diff --git a/vendor/symfony/translation/Exception/ProviderException.php b/libraries/Symfony/Component/Translation/Exception/ProviderException.php similarity index 94% rename from vendor/symfony/translation/Exception/ProviderException.php rename to libraries/Symfony/Component/Translation/Exception/ProviderException.php index 65883f8524..0816cd8efb 100644 --- a/vendor/symfony/translation/Exception/ProviderException.php +++ b/libraries/Symfony/Component/Translation/Exception/ProviderException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Exception; +namespace EDD\Vendor\Symfony\Component\Translation\Exception; use Symfony\Contracts\HttpClient\ResponseInterface; diff --git a/vendor/symfony/translation/Exception/ProviderExceptionInterface.php b/libraries/Symfony/Component/Translation/Exception/ProviderExceptionInterface.php similarity index 89% rename from vendor/symfony/translation/Exception/ProviderExceptionInterface.php rename to libraries/Symfony/Component/Translation/Exception/ProviderExceptionInterface.php index 922e82726c..2b81c28a99 100644 --- a/vendor/symfony/translation/Exception/ProviderExceptionInterface.php +++ b/libraries/Symfony/Component/Translation/Exception/ProviderExceptionInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Exception; +namespace EDD\Vendor\Symfony\Component\Translation\Exception; /** * @author Fabien Potencier diff --git a/vendor/symfony/translation/Exception/RuntimeException.php b/libraries/Symfony/Component/Translation/Exception/RuntimeException.php similarity index 87% rename from vendor/symfony/translation/Exception/RuntimeException.php rename to libraries/Symfony/Component/Translation/Exception/RuntimeException.php index dcd7940829..e832eebfc6 100644 --- a/vendor/symfony/translation/Exception/RuntimeException.php +++ b/libraries/Symfony/Component/Translation/Exception/RuntimeException.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Exception; +namespace EDD\Vendor\Symfony\Component\Translation\Exception; /** * Base RuntimeException for the Translation component. diff --git a/vendor/symfony/translation/Exception/UnsupportedSchemeException.php b/libraries/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php similarity index 90% rename from vendor/symfony/translation/Exception/UnsupportedSchemeException.php rename to libraries/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php index f09488e144..8364222e07 100644 --- a/vendor/symfony/translation/Exception/UnsupportedSchemeException.php +++ b/libraries/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Exception; +namespace EDD\Vendor\Symfony\Component\Translation\Exception; -use Symfony\Component\Translation\Bridge; -use Symfony\Component\Translation\Provider\Dsn; +use EDD\Vendor\Symfony\Component\Translation\Bridge; +use EDD\Vendor\Symfony\Component\Translation\Provider\Dsn; class UnsupportedSchemeException extends LogicException { diff --git a/vendor/symfony/translation/Extractor/AbstractFileExtractor.php b/libraries/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php similarity index 91% rename from vendor/symfony/translation/Extractor/AbstractFileExtractor.php rename to libraries/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php index 4c088b94f9..62d8829850 100644 --- a/vendor/symfony/translation/Extractor/AbstractFileExtractor.php +++ b/libraries/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Extractor; +namespace EDD\Vendor\Symfony\Component\Translation\Extractor; -use Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; /** * Base class used by classes that extract translation messages from files. diff --git a/vendor/symfony/translation/Extractor/ChainExtractor.php b/libraries/Symfony/Component/Translation/Extractor/ChainExtractor.php similarity index 90% rename from vendor/symfony/translation/Extractor/ChainExtractor.php rename to libraries/Symfony/Component/Translation/Extractor/ChainExtractor.php index d36f7f385a..db28c2b9ee 100644 --- a/vendor/symfony/translation/Extractor/ChainExtractor.php +++ b/libraries/Symfony/Component/Translation/Extractor/ChainExtractor.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Extractor; +namespace EDD\Vendor\Symfony\Component\Translation\Extractor; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * ChainExtractor extracts translation messages from template files. diff --git a/vendor/symfony/translation/Extractor/ExtractorInterface.php b/libraries/Symfony/Component/Translation/Extractor/ExtractorInterface.php similarity index 88% rename from vendor/symfony/translation/Extractor/ExtractorInterface.php rename to libraries/Symfony/Component/Translation/Extractor/ExtractorInterface.php index 642130af75..a1e083f95d 100644 --- a/vendor/symfony/translation/Extractor/ExtractorInterface.php +++ b/libraries/Symfony/Component/Translation/Extractor/ExtractorInterface.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Extractor; +namespace EDD\Vendor\Symfony\Component\Translation\Extractor; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * Extracts translation messages from a directory or files to the catalogue. diff --git a/vendor/symfony/translation/Extractor/PhpAstExtractor.php b/libraries/Symfony/Component/Translation/Extractor/PhpAstExtractor.php similarity index 92% rename from vendor/symfony/translation/Extractor/PhpAstExtractor.php rename to libraries/Symfony/Component/Translation/Extractor/PhpAstExtractor.php index 4dd7f41b2d..cded8e5369 100644 --- a/vendor/symfony/translation/Extractor/PhpAstExtractor.php +++ b/libraries/Symfony/Component/Translation/Extractor/PhpAstExtractor.php @@ -9,15 +9,15 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Extractor; +namespace EDD\Vendor\Symfony\Component\Translation\Extractor; use PhpParser\NodeTraverser; use PhpParser\NodeVisitor; use PhpParser\Parser; use PhpParser\ParserFactory; use Symfony\Component\Finder\Finder; -use Symfony\Component\Translation\Extractor\Visitor\AbstractVisitor; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Extractor\Visitor\AbstractVisitor; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * PhpAstExtractor extracts translation messages from a PHP AST. diff --git a/vendor/symfony/translation/Extractor/PhpExtractor.php b/libraries/Symfony/Component/Translation/Extractor/PhpExtractor.php similarity index 97% rename from vendor/symfony/translation/Extractor/PhpExtractor.php rename to libraries/Symfony/Component/Translation/Extractor/PhpExtractor.php index 7ff27f7c80..c011afb381 100644 --- a/vendor/symfony/translation/Extractor/PhpExtractor.php +++ b/libraries/Symfony/Component/Translation/Extractor/PhpExtractor.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Extractor; +namespace EDD\Vendor\Symfony\Component\Translation\Extractor; trigger_deprecation('symfony/translation', '6.2', '"%s" is deprecated, use "%s" instead.', PhpExtractor::class, PhpAstExtractor::class); use Symfony\Component\Finder\Finder; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * PhpExtractor extracts translation messages from a PHP template. @@ -89,7 +89,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface ], [ 'new', - '\Symfony\Component\Translation\TranslatableMessage', + '\EDD\Vendor\Symfony\Component\Translation\TranslatableMessage', '(', self::MESSAGE_TOKEN, ',', @@ -112,7 +112,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface ], [ 'new', - '\Symfony\Component\Translation\TranslatableMessage', + '\EDD\Vendor\Symfony\Component\Translation\TranslatableMessage', '(', self::MESSAGE_TOKEN, ], diff --git a/vendor/symfony/translation/Extractor/PhpStringTokenParser.php b/libraries/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php similarity index 98% rename from vendor/symfony/translation/Extractor/PhpStringTokenParser.php rename to libraries/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php index 3b854ce73c..de66b9430a 100644 --- a/vendor/symfony/translation/Extractor/PhpStringTokenParser.php +++ b/libraries/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Extractor; +namespace EDD\Vendor\Symfony\Component\Translation\Extractor; trigger_deprecation('symfony/translation', '6.2', '"%s" is deprecated.', PhpStringTokenParser::class); diff --git a/vendor/symfony/translation/Extractor/Visitor/AbstractVisitor.php b/libraries/Symfony/Component/Translation/Extractor/Visitor/AbstractVisitor.php similarity index 96% rename from vendor/symfony/translation/Extractor/Visitor/AbstractVisitor.php rename to libraries/Symfony/Component/Translation/Extractor/Visitor/AbstractVisitor.php index c341056409..b142863773 100644 --- a/vendor/symfony/translation/Extractor/Visitor/AbstractVisitor.php +++ b/libraries/Symfony/Component/Translation/Extractor/Visitor/AbstractVisitor.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Extractor\Visitor; +namespace EDD\Vendor\Symfony\Component\Translation\Extractor\Visitor; use PhpParser\Node; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * @author Mathieu Santostefano diff --git a/vendor/symfony/translation/Extractor/Visitor/ConstraintVisitor.php b/libraries/Symfony/Component/Translation/Extractor/Visitor/ConstraintVisitor.php similarity index 97% rename from vendor/symfony/translation/Extractor/Visitor/ConstraintVisitor.php rename to libraries/Symfony/Component/Translation/Extractor/Visitor/ConstraintVisitor.php index 33dc8437a7..a1d4250eb0 100644 --- a/vendor/symfony/translation/Extractor/Visitor/ConstraintVisitor.php +++ b/libraries/Symfony/Component/Translation/Extractor/Visitor/ConstraintVisitor.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Extractor\Visitor; +namespace EDD\Vendor\Symfony\Component\Translation\Extractor\Visitor; use PhpParser\Node; use PhpParser\NodeVisitor; diff --git a/vendor/symfony/translation/Extractor/Visitor/TransMethodVisitor.php b/libraries/Symfony/Component/Translation/Extractor/Visitor/TransMethodVisitor.php similarity index 95% rename from vendor/symfony/translation/Extractor/Visitor/TransMethodVisitor.php rename to libraries/Symfony/Component/Translation/Extractor/Visitor/TransMethodVisitor.php index 0b537baa24..b8121a8b21 100644 --- a/vendor/symfony/translation/Extractor/Visitor/TransMethodVisitor.php +++ b/libraries/Symfony/Component/Translation/Extractor/Visitor/TransMethodVisitor.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Extractor\Visitor; +namespace EDD\Vendor\Symfony\Component\Translation\Extractor\Visitor; use PhpParser\Node; use PhpParser\NodeVisitor; diff --git a/vendor/symfony/translation/Extractor/Visitor/TranslatableMessageVisitor.php b/libraries/Symfony/Component/Translation/Extractor/Visitor/TranslatableMessageVisitor.php similarity index 95% rename from vendor/symfony/translation/Extractor/Visitor/TranslatableMessageVisitor.php rename to libraries/Symfony/Component/Translation/Extractor/Visitor/TranslatableMessageVisitor.php index c1505a1354..7e1d7317b0 100644 --- a/vendor/symfony/translation/Extractor/Visitor/TranslatableMessageVisitor.php +++ b/libraries/Symfony/Component/Translation/Extractor/Visitor/TranslatableMessageVisitor.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Extractor\Visitor; +namespace EDD\Vendor\Symfony\Component\Translation\Extractor\Visitor; use PhpParser\Node; use PhpParser\NodeVisitor; diff --git a/vendor/symfony/translation/Formatter/IntlFormatter.php b/libraries/Symfony/Component/Translation/Formatter/IntlFormatter.php similarity index 90% rename from vendor/symfony/translation/Formatter/IntlFormatter.php rename to libraries/Symfony/Component/Translation/Formatter/IntlFormatter.php index 30873cc584..7e9dfe94ae 100644 --- a/vendor/symfony/translation/Formatter/IntlFormatter.php +++ b/libraries/Symfony/Component/Translation/Formatter/IntlFormatter.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Formatter; +namespace EDD\Vendor\Symfony\Component\Translation\Formatter; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Component\Translation\Exception\LogicException; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\Exception\LogicException; /** * @author Guilherme Blanco diff --git a/vendor/symfony/translation/Formatter/IntlFormatterInterface.php b/libraries/Symfony/Component/Translation/Formatter/IntlFormatterInterface.php similarity index 91% rename from vendor/symfony/translation/Formatter/IntlFormatterInterface.php rename to libraries/Symfony/Component/Translation/Formatter/IntlFormatterInterface.php index 02fc6acbdf..ff354ee47c 100644 --- a/vendor/symfony/translation/Formatter/IntlFormatterInterface.php +++ b/libraries/Symfony/Component/Translation/Formatter/IntlFormatterInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Formatter; +namespace EDD\Vendor\Symfony\Component\Translation\Formatter; /** * Formats ICU message patterns. diff --git a/vendor/symfony/translation/Formatter/MessageFormatter.php b/libraries/Symfony/Component/Translation/Formatter/MessageFormatter.php similarity index 88% rename from vendor/symfony/translation/Formatter/MessageFormatter.php rename to libraries/Symfony/Component/Translation/Formatter/MessageFormatter.php index 29ad574ee1..88a1494352 100644 --- a/vendor/symfony/translation/Formatter/MessageFormatter.php +++ b/libraries/Symfony/Component/Translation/Formatter/MessageFormatter.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Formatter; +namespace EDD\Vendor\Symfony\Component\Translation\Formatter; -use Symfony\Component\Translation\IdentityTranslator; -use Symfony\Contracts\Translation\TranslatorInterface; +use EDD\Vendor\Symfony\Component\Translation\IdentityTranslator; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorInterface; // Help opcache.preload discover always-needed symbols class_exists(IntlFormatter::class); diff --git a/vendor/symfony/translation/Formatter/MessageFormatterInterface.php b/libraries/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php similarity index 92% rename from vendor/symfony/translation/Formatter/MessageFormatterInterface.php rename to libraries/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php index d5c41c190f..ea9e0e0097 100644 --- a/vendor/symfony/translation/Formatter/MessageFormatterInterface.php +++ b/libraries/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Formatter; +namespace EDD\Vendor\Symfony\Component\Translation\Formatter; /** * @author Guilherme Blanco diff --git a/vendor/symfony/translation/IdentityTranslator.php b/libraries/Symfony/Component/Translation/IdentityTranslator.php similarity index 64% rename from vendor/symfony/translation/IdentityTranslator.php rename to libraries/Symfony/Component/Translation/IdentityTranslator.php index 46875edf2a..baef1346cd 100644 --- a/vendor/symfony/translation/IdentityTranslator.php +++ b/libraries/Symfony/Component/Translation/IdentityTranslator.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; -use Symfony\Contracts\Translation\LocaleAwareInterface; -use Symfony\Contracts\Translation\TranslatorInterface; -use Symfony\Contracts\Translation\TranslatorTrait; +use EDD\Vendor\Symfony\Contracts\Translation\LocaleAwareInterface; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorInterface; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorTrait; /** * IdentityTranslator does not translate anything. diff --git a/vendor/symfony/translation/LICENSE b/libraries/Symfony/Component/Translation/LICENSE similarity index 100% rename from vendor/symfony/translation/LICENSE rename to libraries/Symfony/Component/Translation/LICENSE diff --git a/vendor/symfony/translation/Loader/ArrayLoader.php b/libraries/Symfony/Component/Translation/Loader/ArrayLoader.php similarity index 91% rename from vendor/symfony/translation/Loader/ArrayLoader.php rename to libraries/Symfony/Component/Translation/Loader/ArrayLoader.php index e63a7d05be..b89308bdb2 100644 --- a/vendor/symfony/translation/Loader/ArrayLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/ArrayLoader.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * ArrayLoader loads translations from a PHP array. diff --git a/vendor/symfony/translation/Loader/CsvFileLoader.php b/libraries/Symfony/Component/Translation/Loader/CsvFileLoader.php similarity index 92% rename from vendor/symfony/translation/Loader/CsvFileLoader.php rename to libraries/Symfony/Component/Translation/Loader/CsvFileLoader.php index 7f2f96be64..1457d3c18f 100644 --- a/vendor/symfony/translation/Loader/CsvFileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/CsvFileLoader.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; -use Symfony\Component\Translation\Exception\NotFoundResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\NotFoundResourceException; /** * CsvFileLoader loads translations from CSV files. diff --git a/vendor/symfony/translation/Loader/FileLoader.php b/libraries/Symfony/Component/Translation/Loader/FileLoader.php similarity index 83% rename from vendor/symfony/translation/Loader/FileLoader.php rename to libraries/Symfony/Component/Translation/Loader/FileLoader.php index 877c3bbc74..6600ee5044 100644 --- a/vendor/symfony/translation/Loader/FileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/FileLoader.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; use Symfony\Component\Config\Resource\FileResource; -use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\NotFoundResourceException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * @author Abdellatif Ait boudad diff --git a/vendor/symfony/translation/Loader/IcuDatFileLoader.php b/libraries/Symfony/Component/Translation/Loader/IcuDatFileLoader.php similarity index 84% rename from vendor/symfony/translation/Loader/IcuDatFileLoader.php rename to libraries/Symfony/Component/Translation/Loader/IcuDatFileLoader.php index 76e4e7f02b..cb31baa832 100644 --- a/vendor/symfony/translation/Loader/IcuDatFileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/IcuDatFileLoader.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; use Symfony\Component\Config\Resource\FileResource; -use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\NotFoundResourceException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * IcuResFileLoader loads translations from a resource bundle. diff --git a/vendor/symfony/translation/Loader/IcuResFileLoader.php b/libraries/Symfony/Component/Translation/Loader/IcuResFileLoader.php similarity index 89% rename from vendor/symfony/translation/Loader/IcuResFileLoader.php rename to libraries/Symfony/Component/Translation/Loader/IcuResFileLoader.php index 94d55b8618..27cc32cf3d 100644 --- a/vendor/symfony/translation/Loader/IcuResFileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/IcuResFileLoader.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; use Symfony\Component\Config\Resource\DirectoryResource; -use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\NotFoundResourceException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * IcuResFileLoader loads translations from a resource bundle. diff --git a/vendor/symfony/translation/Loader/IniFileLoader.php b/libraries/Symfony/Component/Translation/Loader/IniFileLoader.php similarity index 89% rename from vendor/symfony/translation/Loader/IniFileLoader.php rename to libraries/Symfony/Component/Translation/Loader/IniFileLoader.php index 3126896c84..07728aec4c 100644 --- a/vendor/symfony/translation/Loader/IniFileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/IniFileLoader.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; /** * IniFileLoader loads translations from an ini file. diff --git a/vendor/symfony/translation/Loader/JsonFileLoader.php b/libraries/Symfony/Component/Translation/Loader/JsonFileLoader.php similarity index 90% rename from vendor/symfony/translation/Loader/JsonFileLoader.php rename to libraries/Symfony/Component/Translation/Loader/JsonFileLoader.php index 385553ef64..3c5674f996 100644 --- a/vendor/symfony/translation/Loader/JsonFileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/JsonFileLoader.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; -use Symfony\Component\Translation\Exception\InvalidResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidResourceException; /** * JsonFileLoader loads translations from an json file. diff --git a/vendor/symfony/translation/Loader/LoaderInterface.php b/libraries/Symfony/Component/Translation/Loader/LoaderInterface.php similarity index 71% rename from vendor/symfony/translation/Loader/LoaderInterface.php rename to libraries/Symfony/Component/Translation/Loader/LoaderInterface.php index 29d5560d1c..db7fd44029 100644 --- a/vendor/symfony/translation/Loader/LoaderInterface.php +++ b/libraries/Symfony/Component/Translation/Loader/LoaderInterface.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; -use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\NotFoundResourceException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * LoaderInterface is the interface implemented by all translation loaders. diff --git a/vendor/symfony/translation/Loader/MoFileLoader.php b/libraries/Symfony/Component/Translation/Loader/MoFileLoader.php similarity index 96% rename from vendor/symfony/translation/Loader/MoFileLoader.php rename to libraries/Symfony/Component/Translation/Loader/MoFileLoader.php index 8427c393e1..45c8acaba7 100644 --- a/vendor/symfony/translation/Loader/MoFileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/MoFileLoader.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; -use Symfony\Component\Translation\Exception\InvalidResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidResourceException; /** * @copyright Copyright (c) 2010, Union of RAD http://union-of-rad.org (http://lithify.me/) diff --git a/vendor/symfony/translation/Loader/PhpFileLoader.php b/libraries/Symfony/Component/Translation/Loader/PhpFileLoader.php similarity index 94% rename from vendor/symfony/translation/Loader/PhpFileLoader.php rename to libraries/Symfony/Component/Translation/Loader/PhpFileLoader.php index 93f23cd95f..6a3e2061e5 100644 --- a/vendor/symfony/translation/Loader/PhpFileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/PhpFileLoader.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; /** * PhpFileLoader loads translations from PHP files returning an array of translations. diff --git a/vendor/symfony/translation/Loader/PoFileLoader.php b/libraries/Symfony/Component/Translation/Loader/PoFileLoader.php similarity index 98% rename from vendor/symfony/translation/Loader/PoFileLoader.php rename to libraries/Symfony/Component/Translation/Loader/PoFileLoader.php index 620d97339a..b992800f6f 100644 --- a/vendor/symfony/translation/Loader/PoFileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/PoFileLoader.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; /** * @copyright Copyright (c) 2010, Union of RAD https://github.com/UnionOfRAD/lithium diff --git a/vendor/symfony/translation/Loader/QtFileLoader.php b/libraries/Symfony/Component/Translation/Loader/QtFileLoader.php similarity index 87% rename from vendor/symfony/translation/Loader/QtFileLoader.php rename to libraries/Symfony/Component/Translation/Loader/QtFileLoader.php index 235f85ee91..3740ac441f 100644 --- a/vendor/symfony/translation/Loader/QtFileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/QtFileLoader.php @@ -9,14 +9,14 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\Config\Util\XmlUtils; -use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Translation\Exception\RuntimeException; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\NotFoundResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\RuntimeException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * QtFileLoader loads translations from QT Translations XML files. diff --git a/vendor/symfony/translation/Loader/XliffFileLoader.php b/libraries/Symfony/Component/Translation/Loader/XliffFileLoader.php similarity index 95% rename from vendor/symfony/translation/Loader/XliffFileLoader.php rename to libraries/Symfony/Component/Translation/Loader/XliffFileLoader.php index 34cad36c4e..d678a789c0 100644 --- a/vendor/symfony/translation/Loader/XliffFileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/XliffFileLoader.php @@ -9,17 +9,17 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\Config\Util\Exception\InvalidXmlException; use Symfony\Component\Config\Util\Exception\XmlParsingException; use Symfony\Component\Config\Util\XmlUtils; -use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Translation\Exception\RuntimeException; -use Symfony\Component\Translation\MessageCatalogue; -use Symfony\Component\Translation\Util\XliffUtils; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\NotFoundResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\RuntimeException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Util\XliffUtils; /** * XliffFileLoader loads translations from XLIFF files. diff --git a/vendor/symfony/translation/Loader/YamlFileLoader.php b/libraries/Symfony/Component/Translation/Loader/YamlFileLoader.php similarity index 87% rename from vendor/symfony/translation/Loader/YamlFileLoader.php rename to libraries/Symfony/Component/Translation/Loader/YamlFileLoader.php index 598d98c647..2c39f12191 100644 --- a/vendor/symfony/translation/Loader/YamlFileLoader.php +++ b/libraries/Symfony/Component/Translation/Loader/YamlFileLoader.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Loader; +namespace EDD\Vendor\Symfony\Component\Translation\Loader; -use Symfony\Component\Translation\Exception\InvalidResourceException; -use Symfony\Component\Translation\Exception\LogicException; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\LogicException; use Symfony\Component\Yaml\Exception\ParseException; use Symfony\Component\Yaml\Parser as YamlParser; use Symfony\Component\Yaml\Yaml; diff --git a/vendor/symfony/translation/LocaleSwitcher.php b/libraries/Symfony/Component/Translation/LocaleSwitcher.php similarity index 93% rename from vendor/symfony/translation/LocaleSwitcher.php rename to libraries/Symfony/Component/Translation/LocaleSwitcher.php index 48ef4396f2..620f25e872 100644 --- a/vendor/symfony/translation/LocaleSwitcher.php +++ b/libraries/Symfony/Component/Translation/LocaleSwitcher.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; use Symfony\Component\Routing\RequestContext; -use Symfony\Contracts\Translation\LocaleAwareInterface; +use EDD\Vendor\Symfony\Contracts\Translation\LocaleAwareInterface; /** * @author Kevin Bond diff --git a/vendor/symfony/translation/LoggingTranslator.php b/libraries/Symfony/Component/Translation/LoggingTranslator.php similarity index 92% rename from vendor/symfony/translation/LoggingTranslator.php rename to libraries/Symfony/Component/Translation/LoggingTranslator.php index e107bf223c..937e9b598b 100644 --- a/vendor/symfony/translation/LoggingTranslator.php +++ b/libraries/Symfony/Component/Translation/LoggingTranslator.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; use Psr\Log\LoggerInterface; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Contracts\Translation\LocaleAwareInterface; -use Symfony\Contracts\Translation\TranslatorInterface; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Contracts\Translation\LocaleAwareInterface; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorInterface; /** * @author Abdellatif Ait boudad diff --git a/vendor/symfony/translation/MessageCatalogue.php b/libraries/Symfony/Component/Translation/MessageCatalogue.php similarity index 98% rename from vendor/symfony/translation/MessageCatalogue.php rename to libraries/Symfony/Component/Translation/MessageCatalogue.php index 379d947ce7..95f7d5fe85 100644 --- a/vendor/symfony/translation/MessageCatalogue.php +++ b/libraries/Symfony/Component/Translation/MessageCatalogue.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; use Symfony\Component\Config\Resource\ResourceInterface; -use Symfony\Component\Translation\Exception\LogicException; +use EDD\Vendor\Symfony\Component\Translation\Exception\LogicException; /** * @author Fabien Potencier diff --git a/vendor/symfony/translation/MessageCatalogueInterface.php b/libraries/Symfony/Component/Translation/MessageCatalogueInterface.php similarity index 98% rename from vendor/symfony/translation/MessageCatalogueInterface.php rename to libraries/Symfony/Component/Translation/MessageCatalogueInterface.php index ed819f1554..27d66b4f56 100644 --- a/vendor/symfony/translation/MessageCatalogueInterface.php +++ b/libraries/Symfony/Component/Translation/MessageCatalogueInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; use Symfony\Component\Config\Resource\ResourceInterface; diff --git a/vendor/symfony/translation/MetadataAwareInterface.php b/libraries/Symfony/Component/Translation/MetadataAwareInterface.php similarity index 96% rename from vendor/symfony/translation/MetadataAwareInterface.php rename to libraries/Symfony/Component/Translation/MetadataAwareInterface.php index 39e5326c37..9052f1f196 100644 --- a/vendor/symfony/translation/MetadataAwareInterface.php +++ b/libraries/Symfony/Component/Translation/MetadataAwareInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; /** * This interface is used to get, set, and delete metadata about the translation messages. diff --git a/vendor/symfony/translation/Provider/AbstractProviderFactory.php b/libraries/Symfony/Component/Translation/Provider/AbstractProviderFactory.php similarity index 87% rename from vendor/symfony/translation/Provider/AbstractProviderFactory.php rename to libraries/Symfony/Component/Translation/Provider/AbstractProviderFactory.php index f0c11d85de..d3e800078e 100644 --- a/vendor/symfony/translation/Provider/AbstractProviderFactory.php +++ b/libraries/Symfony/Component/Translation/Provider/AbstractProviderFactory.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Provider; +namespace EDD\Vendor\Symfony\Component\Translation\Provider; -use Symfony\Component\Translation\Exception\IncompleteDsnException; +use EDD\Vendor\Symfony\Component\Translation\Exception\IncompleteDsnException; abstract class AbstractProviderFactory implements ProviderFactoryInterface { diff --git a/vendor/symfony/translation/Provider/Dsn.php b/libraries/Symfony/Component/Translation/Provider/Dsn.php similarity index 92% rename from vendor/symfony/translation/Provider/Dsn.php rename to libraries/Symfony/Component/Translation/Provider/Dsn.php index af75cb3ae6..391f58328f 100644 --- a/vendor/symfony/translation/Provider/Dsn.php +++ b/libraries/Symfony/Component/Translation/Provider/Dsn.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Provider; +namespace EDD\Vendor\Symfony\Component\Translation\Provider; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Component\Translation\Exception\MissingRequiredOptionException; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\Exception\MissingRequiredOptionException; /** * @author Fabien Potencier diff --git a/vendor/symfony/translation/Provider/FilteringProvider.php b/libraries/Symfony/Component/Translation/Provider/FilteringProvider.php similarity index 88% rename from vendor/symfony/translation/Provider/FilteringProvider.php rename to libraries/Symfony/Component/Translation/Provider/FilteringProvider.php index d4465b9fd6..3d00c8f4bf 100644 --- a/vendor/symfony/translation/Provider/FilteringProvider.php +++ b/libraries/Symfony/Component/Translation/Provider/FilteringProvider.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Provider; +namespace EDD\Vendor\Symfony\Component\Translation\Provider; -use Symfony\Component\Translation\TranslatorBag; -use Symfony\Component\Translation\TranslatorBagInterface; +use EDD\Vendor\Symfony\Component\Translation\TranslatorBag; +use EDD\Vendor\Symfony\Component\Translation\TranslatorBagInterface; /** * Filters domains and locales between the Translator config values and those specific to each provider. diff --git a/vendor/symfony/translation/Provider/NullProvider.php b/libraries/Symfony/Component/Translation/Provider/NullProvider.php similarity index 79% rename from vendor/symfony/translation/Provider/NullProvider.php rename to libraries/Symfony/Component/Translation/Provider/NullProvider.php index f00392ea0b..4844ae587b 100644 --- a/vendor/symfony/translation/Provider/NullProvider.php +++ b/libraries/Symfony/Component/Translation/Provider/NullProvider.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Provider; +namespace EDD\Vendor\Symfony\Component\Translation\Provider; -use Symfony\Component\Translation\TranslatorBag; -use Symfony\Component\Translation\TranslatorBagInterface; +use EDD\Vendor\Symfony\Component\Translation\TranslatorBag; +use EDD\Vendor\Symfony\Component\Translation\TranslatorBagInterface; /** * @author Mathieu Santostefano diff --git a/vendor/symfony/translation/Provider/NullProviderFactory.php b/libraries/Symfony/Component/Translation/Provider/NullProviderFactory.php similarity index 83% rename from vendor/symfony/translation/Provider/NullProviderFactory.php rename to libraries/Symfony/Component/Translation/Provider/NullProviderFactory.php index f350f1602a..92078af9f3 100644 --- a/vendor/symfony/translation/Provider/NullProviderFactory.php +++ b/libraries/Symfony/Component/Translation/Provider/NullProviderFactory.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Provider; +namespace EDD\Vendor\Symfony\Component\Translation\Provider; -use Symfony\Component\Translation\Exception\UnsupportedSchemeException; +use EDD\Vendor\Symfony\Component\Translation\Exception\UnsupportedSchemeException; /** * @author Mathieu Santostefano diff --git a/vendor/symfony/translation/Provider/ProviderFactoryInterface.php b/libraries/Symfony/Component/Translation/Provider/ProviderFactoryInterface.php similarity index 68% rename from vendor/symfony/translation/Provider/ProviderFactoryInterface.php rename to libraries/Symfony/Component/Translation/Provider/ProviderFactoryInterface.php index 3fd4494b4a..4c6eec1113 100644 --- a/vendor/symfony/translation/Provider/ProviderFactoryInterface.php +++ b/libraries/Symfony/Component/Translation/Provider/ProviderFactoryInterface.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Provider; +namespace EDD\Vendor\Symfony\Component\Translation\Provider; -use Symfony\Component\Translation\Exception\IncompleteDsnException; -use Symfony\Component\Translation\Exception\UnsupportedSchemeException; +use EDD\Vendor\Symfony\Component\Translation\Exception\IncompleteDsnException; +use EDD\Vendor\Symfony\Component\Translation\Exception\UnsupportedSchemeException; interface ProviderFactoryInterface { diff --git a/vendor/symfony/translation/Provider/ProviderInterface.php b/libraries/Symfony/Component/Translation/Provider/ProviderInterface.php similarity index 80% rename from vendor/symfony/translation/Provider/ProviderInterface.php rename to libraries/Symfony/Component/Translation/Provider/ProviderInterface.php index a32193f29c..42bc115700 100644 --- a/vendor/symfony/translation/Provider/ProviderInterface.php +++ b/libraries/Symfony/Component/Translation/Provider/ProviderInterface.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Provider; +namespace EDD\Vendor\Symfony\Component\Translation\Provider; -use Symfony\Component\Translation\TranslatorBag; -use Symfony\Component\Translation\TranslatorBagInterface; +use EDD\Vendor\Symfony\Component\Translation\TranslatorBag; +use EDD\Vendor\Symfony\Component\Translation\TranslatorBagInterface; interface ProviderInterface { diff --git a/vendor/symfony/translation/Provider/TranslationProviderCollection.php b/libraries/Symfony/Component/Translation/Provider/TranslationProviderCollection.php similarity index 89% rename from vendor/symfony/translation/Provider/TranslationProviderCollection.php rename to libraries/Symfony/Component/Translation/Provider/TranslationProviderCollection.php index 61ac641cd6..7e6d784818 100644 --- a/vendor/symfony/translation/Provider/TranslationProviderCollection.php +++ b/libraries/Symfony/Component/Translation/Provider/TranslationProviderCollection.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Provider; +namespace EDD\Vendor\Symfony\Component\Translation\Provider; -use Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; /** * @author Mathieu Santostefano diff --git a/vendor/symfony/translation/Provider/TranslationProviderCollectionFactory.php b/libraries/Symfony/Component/Translation/Provider/TranslationProviderCollectionFactory.php similarity index 91% rename from vendor/symfony/translation/Provider/TranslationProviderCollectionFactory.php rename to libraries/Symfony/Component/Translation/Provider/TranslationProviderCollectionFactory.php index 6300c8750e..f3dea11257 100644 --- a/vendor/symfony/translation/Provider/TranslationProviderCollectionFactory.php +++ b/libraries/Symfony/Component/Translation/Provider/TranslationProviderCollectionFactory.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Provider; +namespace EDD\Vendor\Symfony\Component\Translation\Provider; -use Symfony\Component\Translation\Exception\UnsupportedSchemeException; +use EDD\Vendor\Symfony\Component\Translation\Exception\UnsupportedSchemeException; /** * @author Mathieu Santostefano diff --git a/vendor/symfony/translation/PseudoLocalizationTranslator.php b/libraries/Symfony/Component/Translation/PseudoLocalizationTranslator.php similarity index 98% rename from vendor/symfony/translation/PseudoLocalizationTranslator.php rename to libraries/Symfony/Component/Translation/PseudoLocalizationTranslator.php index 0207e9997a..b0b023ae1c 100644 --- a/vendor/symfony/translation/PseudoLocalizationTranslator.php +++ b/libraries/Symfony/Component/Translation/PseudoLocalizationTranslator.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; -use Symfony\Contracts\Translation\TranslatorInterface; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorInterface; /** * This translator should only be used in a development environment. diff --git a/vendor/symfony/translation/README.md b/libraries/Symfony/Component/Translation/README.md similarity index 100% rename from vendor/symfony/translation/README.md rename to libraries/Symfony/Component/Translation/README.md diff --git a/vendor/symfony/translation/Reader/TranslationReader.php b/libraries/Symfony/Component/Translation/Reader/TranslationReader.php similarity index 89% rename from vendor/symfony/translation/Reader/TranslationReader.php rename to libraries/Symfony/Component/Translation/Reader/TranslationReader.php index 01408d4dcd..3f8e34f911 100644 --- a/vendor/symfony/translation/Reader/TranslationReader.php +++ b/libraries/Symfony/Component/Translation/Reader/TranslationReader.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Reader; +namespace EDD\Vendor\Symfony\Component\Translation\Reader; use Symfony\Component\Finder\Finder; -use Symfony\Component\Translation\Loader\LoaderInterface; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Loader\LoaderInterface; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * TranslationReader reads translation messages from translation files. diff --git a/vendor/symfony/translation/Reader/TranslationReaderInterface.php b/libraries/Symfony/Component/Translation/Reader/TranslationReaderInterface.php similarity index 83% rename from vendor/symfony/translation/Reader/TranslationReaderInterface.php rename to libraries/Symfony/Component/Translation/Reader/TranslationReaderInterface.php index ea74dc23ff..f38895ccce 100644 --- a/vendor/symfony/translation/Reader/TranslationReaderInterface.php +++ b/libraries/Symfony/Component/Translation/Reader/TranslationReaderInterface.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Reader; +namespace EDD\Vendor\Symfony\Component\Translation\Reader; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * TranslationReader reads translation messages from translation files. diff --git a/vendor/symfony/translation/Resources/bin/translation-status.php b/libraries/Symfony/Component/Translation/Resources/bin/translation-status.php similarity index 100% rename from vendor/symfony/translation/Resources/bin/translation-status.php rename to libraries/Symfony/Component/Translation/Resources/bin/translation-status.php diff --git a/vendor/symfony/translation/Resources/data/parents.json b/libraries/Symfony/Component/Translation/Resources/data/parents.json similarity index 99% rename from vendor/symfony/translation/Resources/data/parents.json rename to libraries/Symfony/Component/Translation/Resources/data/parents.json index 32a33cdaf7..24d4d119e9 100644 --- a/vendor/symfony/translation/Resources/data/parents.json +++ b/libraries/Symfony/Component/Translation/Resources/data/parents.json @@ -35,6 +35,7 @@ "en_GM": "en_001", "en_GY": "en_001", "en_HK": "en_001", + "en_ID": "en_001", "en_IE": "en_001", "en_IL": "en_001", "en_IM": "en_001", diff --git a/vendor/symfony/translation/Resources/functions.php b/libraries/Symfony/Component/Translation/Resources/functions.php similarity index 90% rename from vendor/symfony/translation/Resources/functions.php rename to libraries/Symfony/Component/Translation/Resources/functions.php index 901d2f87ef..0ea1a72280 100644 --- a/vendor/symfony/translation/Resources/functions.php +++ b/libraries/Symfony/Component/Translation/Resources/functions.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; if (!\function_exists(t::class)) { /** diff --git a/vendor/symfony/translation/Resources/schemas/xliff-core-1.2-transitional.xsd b/libraries/Symfony/Component/Translation/Resources/schemas/xliff-core-1.2-transitional.xsd similarity index 100% rename from vendor/symfony/translation/Resources/schemas/xliff-core-1.2-transitional.xsd rename to libraries/Symfony/Component/Translation/Resources/schemas/xliff-core-1.2-transitional.xsd diff --git a/vendor/symfony/translation/Resources/schemas/xliff-core-2.0.xsd b/libraries/Symfony/Component/Translation/Resources/schemas/xliff-core-2.0.xsd similarity index 100% rename from vendor/symfony/translation/Resources/schemas/xliff-core-2.0.xsd rename to libraries/Symfony/Component/Translation/Resources/schemas/xliff-core-2.0.xsd diff --git a/vendor/symfony/translation/Resources/schemas/xml.xsd b/libraries/Symfony/Component/Translation/Resources/schemas/xml.xsd similarity index 100% rename from vendor/symfony/translation/Resources/schemas/xml.xsd rename to libraries/Symfony/Component/Translation/Resources/schemas/xml.xsd diff --git a/vendor/symfony/translation/Test/ProviderFactoryTestCase.php b/libraries/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php similarity index 87% rename from vendor/symfony/translation/Test/ProviderFactoryTestCase.php rename to libraries/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php index a9c7c0ebf3..49bf21654d 100644 --- a/vendor/symfony/translation/Test/ProviderFactoryTestCase.php +++ b/libraries/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php @@ -9,19 +9,19 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Test; +namespace EDD\Vendor\Symfony\Component\Translation\Test; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Symfony\Component\HttpClient\MockHttpClient; -use Symfony\Component\Translation\Dumper\XliffFileDumper; -use Symfony\Component\Translation\Exception\IncompleteDsnException; -use Symfony\Component\Translation\Exception\UnsupportedSchemeException; -use Symfony\Component\Translation\Loader\LoaderInterface; -use Symfony\Component\Translation\Provider\Dsn; -use Symfony\Component\Translation\Provider\ProviderFactoryInterface; -use Symfony\Component\Translation\TranslatorBagInterface; +use EDD\Vendor\Symfony\Component\Translation\Dumper\XliffFileDumper; +use EDD\Vendor\Symfony\Component\Translation\Exception\IncompleteDsnException; +use EDD\Vendor\Symfony\Component\Translation\Exception\UnsupportedSchemeException; +use EDD\Vendor\Symfony\Component\Translation\Loader\LoaderInterface; +use EDD\Vendor\Symfony\Component\Translation\Provider\Dsn; +use EDD\Vendor\Symfony\Component\Translation\Provider\ProviderFactoryInterface; +use EDD\Vendor\Symfony\Component\Translation\TranslatorBagInterface; use Symfony\Contracts\HttpClient\HttpClientInterface; /** diff --git a/vendor/symfony/translation/Test/ProviderTestCase.php b/libraries/Symfony/Component/Translation/Test/ProviderTestCase.php similarity index 87% rename from vendor/symfony/translation/Test/ProviderTestCase.php rename to libraries/Symfony/Component/Translation/Test/ProviderTestCase.php index 2d16f2bfc7..b3861be303 100644 --- a/vendor/symfony/translation/Test/ProviderTestCase.php +++ b/libraries/Symfony/Component/Translation/Test/ProviderTestCase.php @@ -9,16 +9,16 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Test; +namespace EDD\Vendor\Symfony\Component\Translation\Test; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Symfony\Component\HttpClient\MockHttpClient; -use Symfony\Component\Translation\Dumper\XliffFileDumper; -use Symfony\Component\Translation\Loader\LoaderInterface; -use Symfony\Component\Translation\Provider\ProviderInterface; -use Symfony\Component\Translation\TranslatorBagInterface; +use EDD\Vendor\Symfony\Component\Translation\Dumper\XliffFileDumper; +use EDD\Vendor\Symfony\Component\Translation\Loader\LoaderInterface; +use EDD\Vendor\Symfony\Component\Translation\Provider\ProviderInterface; +use EDD\Vendor\Symfony\Component\Translation\TranslatorBagInterface; use Symfony\Contracts\HttpClient\HttpClientInterface; /** diff --git a/vendor/symfony/translation/TranslatableMessage.php b/libraries/Symfony/Component/Translation/TranslatableMessage.php similarity index 88% rename from vendor/symfony/translation/TranslatableMessage.php rename to libraries/Symfony/Component/Translation/TranslatableMessage.php index 91d4c19416..2227f12312 100644 --- a/vendor/symfony/translation/TranslatableMessage.php +++ b/libraries/Symfony/Component/Translation/TranslatableMessage.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; -use Symfony\Contracts\Translation\TranslatableInterface; -use Symfony\Contracts\Translation\TranslatorInterface; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatableInterface; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorInterface; /** * @author Nate Wiebe diff --git a/vendor/symfony/translation/Translator.php b/libraries/Symfony/Component/Translation/Translator.php similarity index 94% rename from vendor/symfony/translation/Translator.php rename to libraries/Symfony/Component/Translation/Translator.php index 132138e922..6b91c6a37c 100644 --- a/vendor/symfony/translation/Translator.php +++ b/libraries/Symfony/Component/Translation/Translator.php @@ -9,21 +9,21 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation; +namespace EDD\Vendor\Symfony\Component\Translation; use Symfony\Component\Config\ConfigCacheFactory; use Symfony\Component\Config\ConfigCacheFactoryInterface; use Symfony\Component\Config\ConfigCacheInterface; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Component\Translation\Exception\NotFoundResourceException; -use Symfony\Component\Translation\Exception\RuntimeException; -use Symfony\Component\Translation\Formatter\IntlFormatterInterface; -use Symfony\Component\Translation\Formatter\MessageFormatter; -use Symfony\Component\Translation\Formatter\MessageFormatterInterface; -use Symfony\Component\Translation\Loader\LoaderInterface; -use Symfony\Contracts\Translation\LocaleAwareInterface; -use Symfony\Contracts\Translation\TranslatableInterface; -use Symfony\Contracts\Translation\TranslatorInterface; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\Exception\NotFoundResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\RuntimeException; +use EDD\Vendor\Symfony\Component\Translation\Formatter\IntlFormatterInterface; +use EDD\Vendor\Symfony\Component\Translation\Formatter\MessageFormatter; +use EDD\Vendor\Symfony\Component\Translation\Formatter\MessageFormatterInterface; +use EDD\Vendor\Symfony\Component\Translation\Loader\LoaderInterface; +use EDD\Vendor\Symfony\Contracts\Translation\LocaleAwareInterface; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatableInterface; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorInterface; // Help opcache.preload discover always-needed symbols class_exists(MessageCatalogue::class); @@ -293,7 +293,7 @@ private function dumpCatalogue(string $locale, ConfigCacheInterface $cache): voi $content = sprintf(<< diff --git a/vendor/symfony/translation/Util/ArrayConverter.php b/libraries/Symfony/Component/Translation/Util/ArrayConverter.php similarity index 98% rename from vendor/symfony/translation/Util/ArrayConverter.php rename to libraries/Symfony/Component/Translation/Util/ArrayConverter.php index 64e15b485d..b192967ca4 100644 --- a/vendor/symfony/translation/Util/ArrayConverter.php +++ b/libraries/Symfony/Component/Translation/Util/ArrayConverter.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Util; +namespace EDD\Vendor\Symfony\Component\Translation\Util; /** * ArrayConverter generates tree like structure from a message catalogue. diff --git a/vendor/symfony/translation/Util/XliffUtils.php b/libraries/Symfony/Component/Translation/Util/XliffUtils.php similarity index 96% rename from vendor/symfony/translation/Util/XliffUtils.php rename to libraries/Symfony/Component/Translation/Util/XliffUtils.php index 335c34beb5..d2be07a71f 100644 --- a/vendor/symfony/translation/Util/XliffUtils.php +++ b/libraries/Symfony/Component/Translation/Util/XliffUtils.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Util; +namespace EDD\Vendor\Symfony\Component\Translation\Util; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Component\Translation\Exception\InvalidResourceException; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidResourceException; /** * Provides some utility methods for XLIFF translation files, such as validating diff --git a/vendor/symfony/translation/Writer/TranslationWriter.php b/libraries/Symfony/Component/Translation/Writer/TranslationWriter.php similarity index 84% rename from vendor/symfony/translation/Writer/TranslationWriter.php rename to libraries/Symfony/Component/Translation/Writer/TranslationWriter.php index 61e03cb0ea..60e631e929 100644 --- a/vendor/symfony/translation/Writer/TranslationWriter.php +++ b/libraries/Symfony/Component/Translation/Writer/TranslationWriter.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Writer; +namespace EDD\Vendor\Symfony\Component\Translation\Writer; -use Symfony\Component\Translation\Dumper\DumperInterface; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Component\Translation\Exception\RuntimeException; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Dumper\DumperInterface; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\Exception\RuntimeException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * TranslationWriter writes translation messages. diff --git a/vendor/symfony/translation/Writer/TranslationWriterInterface.php b/libraries/Symfony/Component/Translation/Writer/TranslationWriterInterface.php similarity index 79% rename from vendor/symfony/translation/Writer/TranslationWriterInterface.php rename to libraries/Symfony/Component/Translation/Writer/TranslationWriterInterface.php index 5ebb9794a6..e625479887 100644 --- a/vendor/symfony/translation/Writer/TranslationWriterInterface.php +++ b/libraries/Symfony/Component/Translation/Writer/TranslationWriterInterface.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Writer; +namespace EDD\Vendor\Symfony\Component\Translation\Writer; -use Symfony\Component\Translation\Exception\InvalidArgumentException; -use Symfony\Component\Translation\MessageCatalogue; +use EDD\Vendor\Symfony\Component\Translation\Exception\InvalidArgumentException; +use EDD\Vendor\Symfony\Component\Translation\MessageCatalogue; /** * TranslationWriter writes translation messages. diff --git a/vendor/symfony/translation/composer.json b/libraries/Symfony/Component/Translation/composer.json similarity index 100% rename from vendor/symfony/translation/composer.json rename to libraries/Symfony/Component/Translation/composer.json diff --git a/vendor/symfony/service-contracts/CHANGELOG.md b/libraries/Symfony/Contracts/Translation/CHANGELOG.md similarity index 100% rename from vendor/symfony/service-contracts/CHANGELOG.md rename to libraries/Symfony/Contracts/Translation/CHANGELOG.md diff --git a/vendor/symfony/service-contracts/LICENSE b/libraries/Symfony/Contracts/Translation/LICENSE similarity index 100% rename from vendor/symfony/service-contracts/LICENSE rename to libraries/Symfony/Contracts/Translation/LICENSE diff --git a/vendor/symfony/translation-contracts/LocaleAwareInterface.php b/libraries/Symfony/Contracts/Translation/LocaleAwareInterface.php similarity index 91% rename from vendor/symfony/translation-contracts/LocaleAwareInterface.php rename to libraries/Symfony/Contracts/Translation/LocaleAwareInterface.php index db40ba13e0..ca52e393e6 100644 --- a/vendor/symfony/translation-contracts/LocaleAwareInterface.php +++ b/libraries/Symfony/Contracts/Translation/LocaleAwareInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Contracts\Translation; +namespace EDD\Vendor\Symfony\Contracts\Translation; interface LocaleAwareInterface { diff --git a/vendor/symfony/translation-contracts/README.md b/libraries/Symfony/Contracts/Translation/README.md similarity index 100% rename from vendor/symfony/translation-contracts/README.md rename to libraries/Symfony/Contracts/Translation/README.md diff --git a/vendor/symfony/translation-contracts/Test/TranslatorTest.php b/libraries/Symfony/Contracts/Translation/Test/TranslatorTest.php similarity index 98% rename from vendor/symfony/translation-contracts/Test/TranslatorTest.php rename to libraries/Symfony/Contracts/Translation/Test/TranslatorTest.php index 674b78b3ea..b072dbe6e3 100644 --- a/vendor/symfony/translation-contracts/Test/TranslatorTest.php +++ b/libraries/Symfony/Contracts/Translation/Test/TranslatorTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Contracts\Translation\Test; +namespace EDD\Vendor\Symfony\Contracts\Translation\Test; use PHPUnit\Framework\TestCase; -use Symfony\Contracts\Translation\TranslatorInterface; -use Symfony\Contracts\Translation\TranslatorTrait; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorInterface; +use EDD\Vendor\Symfony\Contracts\Translation\TranslatorTrait; /** * Test should cover all languages mentioned on http://translate.sourceforge.net/wiki/l10n/pluralforms diff --git a/vendor/symfony/translation-contracts/TranslatableInterface.php b/libraries/Symfony/Contracts/Translation/TranslatableInterface.php similarity index 88% rename from vendor/symfony/translation-contracts/TranslatableInterface.php rename to libraries/Symfony/Contracts/Translation/TranslatableInterface.php index 47fd6fa029..f7d1d21110 100644 --- a/vendor/symfony/translation-contracts/TranslatableInterface.php +++ b/libraries/Symfony/Contracts/Translation/TranslatableInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Contracts\Translation; +namespace EDD\Vendor\Symfony\Contracts\Translation; /** * @author Nicolas Grekas diff --git a/vendor/symfony/translation-contracts/TranslatorInterface.php b/libraries/Symfony/Contracts/Translation/TranslatorInterface.php similarity index 97% rename from vendor/symfony/translation-contracts/TranslatorInterface.php rename to libraries/Symfony/Contracts/Translation/TranslatorInterface.php index 018db07ebf..947d1794f6 100644 --- a/vendor/symfony/translation-contracts/TranslatorInterface.php +++ b/libraries/Symfony/Contracts/Translation/TranslatorInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Contracts\Translation; +namespace EDD\Vendor\Symfony\Contracts\Translation; /** * @author Fabien Potencier diff --git a/vendor/symfony/translation-contracts/TranslatorTrait.php b/libraries/Symfony/Contracts/Translation/TranslatorTrait.php similarity index 99% rename from vendor/symfony/translation-contracts/TranslatorTrait.php rename to libraries/Symfony/Contracts/Translation/TranslatorTrait.php index e3b0adff05..c1ad3e39c0 100644 --- a/vendor/symfony/translation-contracts/TranslatorTrait.php +++ b/libraries/Symfony/Contracts/Translation/TranslatorTrait.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Contracts\Translation; +namespace EDD\Vendor\Symfony\Contracts\Translation; use Symfony\Component\Translation\Exception\InvalidArgumentException; diff --git a/vendor/symfony/translation-contracts/composer.json b/libraries/Symfony/Contracts/Translation/composer.json similarity index 100% rename from vendor/symfony/translation-contracts/composer.json rename to libraries/Symfony/Contracts/Translation/composer.json diff --git a/vendor/symfony/polyfill-mbstring/LICENSE b/libraries/Symfony/Polyfill/Mbstring/LICENSE similarity index 100% rename from vendor/symfony/polyfill-mbstring/LICENSE rename to libraries/Symfony/Polyfill/Mbstring/LICENSE diff --git a/vendor/symfony/polyfill-mbstring/Mbstring.php b/libraries/Symfony/Polyfill/Mbstring/Mbstring.php similarity index 99% rename from vendor/symfony/polyfill-mbstring/Mbstring.php rename to libraries/Symfony/Polyfill/Mbstring/Mbstring.php index 2e0b96940a..f3847fc17a 100644 --- a/vendor/symfony/polyfill-mbstring/Mbstring.php +++ b/libraries/Symfony/Polyfill/Mbstring/Mbstring.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Polyfill\Mbstring; +namespace EDD\Vendor\Symfony\Polyfill\Mbstring; /** * Partial mbstring implementation in PHP, iconv based, UTF-8 centric. diff --git a/vendor/symfony/polyfill-mbstring/README.md b/libraries/Symfony/Polyfill/Mbstring/README.md similarity index 100% rename from vendor/symfony/polyfill-mbstring/README.md rename to libraries/Symfony/Polyfill/Mbstring/README.md diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/caseFolding.php b/libraries/Symfony/Polyfill/Mbstring/Resources/unidata/caseFolding.php similarity index 100% rename from vendor/symfony/polyfill-mbstring/Resources/unidata/caseFolding.php rename to libraries/Symfony/Polyfill/Mbstring/Resources/unidata/caseFolding.php diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php b/libraries/Symfony/Polyfill/Mbstring/Resources/unidata/lowerCase.php similarity index 100% rename from vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php rename to libraries/Symfony/Polyfill/Mbstring/Resources/unidata/lowerCase.php diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php b/libraries/Symfony/Polyfill/Mbstring/Resources/unidata/titleCaseRegexp.php similarity index 100% rename from vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php rename to libraries/Symfony/Polyfill/Mbstring/Resources/unidata/titleCaseRegexp.php diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php b/libraries/Symfony/Polyfill/Mbstring/Resources/unidata/upperCase.php similarity index 100% rename from vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php rename to libraries/Symfony/Polyfill/Mbstring/Resources/unidata/upperCase.php diff --git a/vendor/symfony/polyfill-mbstring/bootstrap.php b/libraries/Symfony/Polyfill/Mbstring/bootstrap.php similarity index 99% rename from vendor/symfony/polyfill-mbstring/bootstrap.php rename to libraries/Symfony/Polyfill/Mbstring/bootstrap.php index ecf1a03522..1ba1b75078 100644 --- a/vendor/symfony/polyfill-mbstring/bootstrap.php +++ b/libraries/Symfony/Polyfill/Mbstring/bootstrap.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use Symfony\Polyfill\Mbstring as p; +use EDD\Vendor\Symfony\Polyfill\Mbstring as p; if (\PHP_VERSION_ID >= 80000) { return require __DIR__.'/bootstrap80.php'; diff --git a/vendor/symfony/polyfill-mbstring/bootstrap80.php b/libraries/Symfony/Polyfill/Mbstring/bootstrap80.php similarity index 99% rename from vendor/symfony/polyfill-mbstring/bootstrap80.php rename to libraries/Symfony/Polyfill/Mbstring/bootstrap80.php index 2f9fb5b421..552f2fe5b2 100644 --- a/vendor/symfony/polyfill-mbstring/bootstrap80.php +++ b/libraries/Symfony/Polyfill/Mbstring/bootstrap80.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use Symfony\Polyfill\Mbstring as p; +use EDD\Vendor\Symfony\Polyfill\Mbstring as p; if (!function_exists('mb_convert_encoding')) { function mb_convert_encoding(array|string|null $string, ?string $to_encoding, array|string|null $from_encoding = null): array|string|false { return p\Mbstring::mb_convert_encoding($string ?? '', (string) $to_encoding, $from_encoding); } diff --git a/vendor/symfony/polyfill-mbstring/composer.json b/libraries/Symfony/Polyfill/Mbstring/composer.json similarity index 100% rename from vendor/symfony/polyfill-mbstring/composer.json rename to libraries/Symfony/Polyfill/Mbstring/composer.json diff --git a/package.json b/package.json index 5c9800c830..3d5f5adb96 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "easy-digital-downloads", - "version": "3.2.4", + "version": "3.2.5", "description": "The easiest way to sell digital products with WordPress.", "private": true, "author": "Easy Digital Downloads", diff --git a/readme.txt b/readme.txt index 59777f1773..c62f090be0 100755 --- a/readme.txt +++ b/readme.txt @@ -4,9 +4,9 @@ Plugin URI: https://easydigitaldownloads.com Contributors: easydigitaldownloads, am, cklosows, littlerchicken, achchu93, smub, mordauk, chriscct7, sumobi, SpencerFinnell, drewapicture, johnjamesjacoby, lisacee Tags: ecommerce, payments, sell, digital store, stripe Requires at least: 5.8 -Tested up to: 6.3 +Tested up to: 6.4 Requires PHP: 7.4 -Stable Tag: 3.2.4 +Stable Tag: 3.2.5 License: GNU Version 2 or Any Later Version The #1 eCommerce plugin to sell digital products. Manage eCommerce orders, increase store revenue & accept credit card payments with Stripe + PayPal. @@ -226,6 +226,10 @@ Yes, with an Extended Pass you get access to [Recurring Payments](https://easydi 8. Checkout - Default Theme == Changelog == += 3.2.5 = +* Compatibility: Improved compatibility with servers not configured with `mbstring`. +* PayPal: Improved detection of PayPal order session handling and processing. + = 3.2.4 = * Compatibility: Adds support for PHP 8.2. * PayPal: Improve error handling of PayPal API responses. diff --git a/src/Telemetry/Environment.php b/src/Telemetry/Environment.php index d29b23ecdd..7219f67bd7 100644 --- a/src/Telemetry/Environment.php +++ b/src/Telemetry/Environment.php @@ -7,10 +7,26 @@ * @license GPL2+ * @since 3.1.1 */ + namespace EDD\Telemetry; +defined( 'ABSPATH' ) || exit; + +/** + * Class Environment + * + * @since 3.1.1 + * @package EDD\Telemetry + */ class Environment { + use Traits\Anonymize; + /** + * Gets the array of environment data. + * + * @since 3.1.1 + * @return array + */ public function get() { $data = array( 'php_version' => phpversion(), @@ -71,7 +87,7 @@ private function get_wp_version() { private function get_active_theme() { $active_theme = wp_get_theme(); - return $active_theme->name; + return $this->anonymize_site_name( $active_theme->name ); } /** diff --git a/src/Telemetry/Settings.php b/src/Telemetry/Settings.php index c7e1e56227..a3e5dacbc9 100644 --- a/src/Telemetry/Settings.php +++ b/src/Telemetry/Settings.php @@ -7,9 +7,19 @@ * @license GPL2+ * @since 3.1.1 */ + namespace EDD\Telemetry; +defined( 'ABSPATH' ) || exit; + +/** + * Class Settings + * + * @since 3.1.1 + * @package EDD\Telemetry + */ class Settings { + use Traits\Anonymize; /** * Gets the array of settings data. @@ -77,7 +87,7 @@ private function get_setting_value( $tab_key, $section_key, $setting_key ) { } } if ( in_array( $setting['type'], $this->text_settings(), true ) ) { - return $this->anonymize_setting( $value ); + return $this->anonymize( $value ); } if ( $this->should_populate_array( $setting ) ) { return $this->update_setting_value_array( $value, $setting ); @@ -137,6 +147,7 @@ private function skipped_settings_types() { 'upload', 'color', 'recapture', + 'password', ) ); } @@ -194,26 +205,6 @@ private function should_populate_array( $setting ) { return 'multicheck' === $setting['type'] || in_array( $setting['id'], $settings, true ); } - /** - * Attempts to anonymize a setting value. - * - * @todo check how we want to replace--values or empty strings? - * - * @since 3.1.1 - * @param string $value - * @return string - */ - private function anonymize_setting( $value ) { - $admin_email = get_bloginfo( 'admin_email' ); - $value = str_replace( $admin_email, 'email@website.dev', $value ); - $site_name = get_bloginfo( 'name' ); - $value = str_replace( $site_name, 'Site Name', $value ); - $home_url = get_home_url(); - $value = str_replace( $home_url, 'website.dev', $value ); - - return $value; - } - /** * Updates the an array setting value to include all options. * diff --git a/src/Telemetry/Traits/Anonymize.php b/src/Telemetry/Traits/Anonymize.php new file mode 100644 index 0000000000..9b0f9669de --- /dev/null +++ b/src/Telemetry/Traits/Anonymize.php @@ -0,0 +1,48 @@ +anonymize_site_name( $value ); + } + + /** + * Replace any use of the site name in a string. + * + * @since 3.2.5 + * @param string $value The string to anonymize. + * @return string + */ + private function anonymize_site_name( $value ) { + $site_name = get_bloginfo( 'name' ); + if ( false === strpos( $value, $site_name ) ) { + return $value; + } + + return str_replace( $site_name, edd_mask_string( $site_name ), $value ); + } +} diff --git a/tests/tests-telemetry.php b/tests/tests-telemetry.php new file mode 100644 index 0000000000..53fa566ff3 --- /dev/null +++ b/tests/tests-telemetry.php @@ -0,0 +1,108 @@ +get(); + } + + public function test_data_is_array() { + $this->assertIsArray( self::$data ); + } + + public function test_data_is_not_empty() { + $this->assertNotEmpty( self::$data ); + } + + public function test_data_contains_id() { + $this->assertArrayHasKey( 'id', self::$data ); + } + + public function test_data_contains_environment() { + $this->assertArrayHasKey( 'environment', self::$data ); + } + + public function test_data_contains_integrations() { + $this->assertArrayHasKey( 'integrations', self::$data ); + } + + public function test_data_contains_licenses() { + $this->assertArrayHasKey( 'licenses', self::$data ); + } + + public function test_data_contains_sales() { + $this->assertArrayHasKey( 'sales', self::$data ); + } + + public function test_data_contains_refunds() { + $this->assertArrayHasKey( 'refunds', self::$data ); + } + + public function test_data_contains_settings() { + $this->assertArrayHasKey( 'settings', self::$data ); + } + + public function test_data_contains_stats() { + $this->assertArrayHasKey( 'stats', self::$data ); + } + + public function test_data_contains_products() { + $this->assertArrayHasKey( 'products', self::$data ); + } + + public function test_environment_contains_php_version() { + $this->assertEquals( phpversion(), self::$data['environment']['php_version'] ); + } + + public function test_environment_contains_wp_version() { + $version = get_bloginfo( 'version' ); + $version = explode( '-', $version ); + + $this->assertEquals( reset( $version ), self::$data['environment']['wp_version'] ); + } + + public function test_environment_contains_edd_version() { + $this->assertEquals( EDD_VERSION, self::$data['environment']['edd_version'] ); + } + + public function test_no_data_includes_admin_email() { + $list_handler = new ListHandler( self::$data ); + $emails = $list_handler->search( get_bloginfo( 'admin_email' ) ); + + $this->assertFalse( $emails ); + } + + public function test_settings_currency_matches_store_currency() { + $this->assertEquals( edd_get_currency(), self::$data['settings']['currency'] ); + } + + public function test_environment_theme_name_is_anonymized() { + $this->assertEquals( 'WordPress', get_bloginfo( 'name' ) ); + $this->assertFalse( strpos( self::$data['environment']['active_theme'], 'WordPress' ) ); + } +} diff --git a/vendor/autoload.php b/vendor/autoload.php index 80360c9e08..95db480720 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInita9dc9013925c51d0fbf377fec9608140::getLoader(); +return ComposerAutoloaderInit90b78d2443e310e04b1f14c18b400110::getLoader(); diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index 7824d8f7ea..a72151c77c 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -45,34 +45,35 @@ class ClassLoader /** @var \Closure(string):void */ private static $includeFile; - /** @var string|null */ + /** @var ?string */ private $vendorDir; // PSR-4 /** - * @var array> + * @var array[] + * @psalm-var array> */ private $prefixLengthsPsr4 = array(); /** - * @var array> + * @var array[] + * @psalm-var array> */ private $prefixDirsPsr4 = array(); /** - * @var list + * @var array[] + * @psalm-var array */ private $fallbackDirsPsr4 = array(); // PSR-0 /** - * List of PSR-0 prefixes - * - * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2'))) - * - * @var array>> + * @var array[] + * @psalm-var array> */ private $prefixesPsr0 = array(); /** - * @var list + * @var array[] + * @psalm-var array */ private $fallbackDirsPsr0 = array(); @@ -80,7 +81,8 @@ class ClassLoader private $useIncludePath = false; /** - * @var array + * @var string[] + * @psalm-var array */ private $classMap = array(); @@ -88,20 +90,21 @@ class ClassLoader private $classMapAuthoritative = false; /** - * @var array + * @var bool[] + * @psalm-var array */ private $missingClasses = array(); - /** @var string|null */ + /** @var ?string */ private $apcuPrefix; /** - * @var array + * @var self[] */ private static $registeredLoaders = array(); /** - * @param string|null $vendorDir + * @param ?string $vendorDir */ public function __construct($vendorDir = null) { @@ -110,7 +113,7 @@ public function __construct($vendorDir = null) } /** - * @return array> + * @return string[] */ public function getPrefixes() { @@ -122,7 +125,8 @@ public function getPrefixes() } /** - * @return array> + * @return array[] + * @psalm-return array> */ public function getPrefixesPsr4() { @@ -130,7 +134,8 @@ public function getPrefixesPsr4() } /** - * @return list + * @return array[] + * @psalm-return array */ public function getFallbackDirs() { @@ -138,7 +143,8 @@ public function getFallbackDirs() } /** - * @return list + * @return array[] + * @psalm-return array */ public function getFallbackDirsPsr4() { @@ -146,7 +152,8 @@ public function getFallbackDirsPsr4() } /** - * @return array Array of classname => path + * @return string[] Array of classname => path + * @psalm-return array */ public function getClassMap() { @@ -154,7 +161,8 @@ public function getClassMap() } /** - * @param array $classMap Class to filename map + * @param string[] $classMap Class to filename map + * @psalm-param array $classMap * * @return void */ @@ -171,25 +179,24 @@ public function addClassMap(array $classMap) * Registers a set of PSR-0 directories for a given prefix, either * appending or prepending to the ones previously set for this prefix. * - * @param string $prefix The prefix - * @param list|string $paths The PSR-0 root directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix + * @param string[]|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories * * @return void */ public function add($prefix, $paths, $prepend = false) { - $paths = (array) $paths; if (!$prefix) { if ($prepend) { $this->fallbackDirsPsr0 = array_merge( - $paths, + (array) $paths, $this->fallbackDirsPsr0 ); } else { $this->fallbackDirsPsr0 = array_merge( $this->fallbackDirsPsr0, - $paths + (array) $paths ); } @@ -198,19 +205,19 @@ public function add($prefix, $paths, $prepend = false) $first = $prefix[0]; if (!isset($this->prefixesPsr0[$first][$prefix])) { - $this->prefixesPsr0[$first][$prefix] = $paths; + $this->prefixesPsr0[$first][$prefix] = (array) $paths; return; } if ($prepend) { $this->prefixesPsr0[$first][$prefix] = array_merge( - $paths, + (array) $paths, $this->prefixesPsr0[$first][$prefix] ); } else { $this->prefixesPsr0[$first][$prefix] = array_merge( $this->prefixesPsr0[$first][$prefix], - $paths + (array) $paths ); } } @@ -219,9 +226,9 @@ public function add($prefix, $paths, $prepend = false) * Registers a set of PSR-4 directories for a given namespace, either * appending or prepending to the ones previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param list|string $paths The PSR-4 base directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param string[]|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories * * @throws \InvalidArgumentException * @@ -229,18 +236,17 @@ public function add($prefix, $paths, $prepend = false) */ public function addPsr4($prefix, $paths, $prepend = false) { - $paths = (array) $paths; if (!$prefix) { // Register directories for the root namespace. if ($prepend) { $this->fallbackDirsPsr4 = array_merge( - $paths, + (array) $paths, $this->fallbackDirsPsr4 ); } else { $this->fallbackDirsPsr4 = array_merge( $this->fallbackDirsPsr4, - $paths + (array) $paths ); } } elseif (!isset($this->prefixDirsPsr4[$prefix])) { @@ -250,18 +256,18 @@ public function addPsr4($prefix, $paths, $prepend = false) throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); } $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; - $this->prefixDirsPsr4[$prefix] = $paths; + $this->prefixDirsPsr4[$prefix] = (array) $paths; } elseif ($prepend) { // Prepend directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( - $paths, + (array) $paths, $this->prefixDirsPsr4[$prefix] ); } else { // Append directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( $this->prefixDirsPsr4[$prefix], - $paths + (array) $paths ); } } @@ -270,8 +276,8 @@ public function addPsr4($prefix, $paths, $prepend = false) * Registers a set of PSR-0 directories for a given prefix, * replacing any others previously set for this prefix. * - * @param string $prefix The prefix - * @param list|string $paths The PSR-0 base directories + * @param string $prefix The prefix + * @param string[]|string $paths The PSR-0 base directories * * @return void */ @@ -288,8 +294,8 @@ public function set($prefix, $paths) * Registers a set of PSR-4 directories for a given namespace, * replacing any others previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param list|string $paths The PSR-4 base directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param string[]|string $paths The PSR-4 base directories * * @throws \InvalidArgumentException * @@ -475,9 +481,9 @@ public function findFile($class) } /** - * Returns the currently registered loaders keyed by their corresponding vendor directories. + * Returns the currently registered loaders indexed by their corresponding vendor directories. * - * @return array + * @return self[] */ public static function getRegisteredLoaders() { diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index 51e734a774..c6b54af7ba 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -98,7 +98,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true) { foreach (self::getInstalled() as $installed) { if (isset($installed['versions'][$packageName])) { - return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false; + return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']); } } @@ -119,7 +119,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true) */ public static function satisfies(VersionParser $parser, $packageName, $constraint) { - $constraint = $parser->parseConstraints((string) $constraint); + $constraint = $parser->parseConstraints($constraint); $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); return $provided->matches($constraint); @@ -328,9 +328,7 @@ private static function getInstalled() if (isset(self::$installedByVendor[$vendorDir])) { $installed[] = self::$installedByVendor[$vendorDir]; } elseif (is_file($vendorDir.'/composer/installed.php')) { - /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ - $required = require $vendorDir.'/composer/installed.php'; - $installed[] = self::$installedByVendor[$vendorDir] = $required; + $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { self::$installed = $installed[count($installed) - 1]; } @@ -342,17 +340,12 @@ private static function getInstalled() // only require the installed.php file if this file is loaded from its dumped location, // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 if (substr(__DIR__, -8, 1) !== 'C') { - /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ - $required = require __DIR__ . '/installed.php'; - self::$installed = $required; + self::$installed = require __DIR__ . '/installed.php'; } else { self::$installed = array(); } } - - if (self::$installed !== array()) { - $installed[] = self::$installed; - } + $installed[] = self::$installed; return $installed; } diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index 8a738b15c0..0ea495ba4b 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -7,8 +7,7 @@ return array( '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php', - '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php', 'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php', - 'a1105708a18b76903365ca1c4aa61b02' => $vendorDir . '/symfony/translation/Resources/functions.php', 'df9547068186d5bd9161c63e6cc8097a' => $baseDir . '/src/Globals/Polyfills/PHP.php', + '689537902e03683e53e4251d0635d0b4' => $baseDir . '/libraries/Symfony/Polyfill/Mbstring/bootstrap.php', ); diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index 181b30eaeb..512b6b91df 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -7,9 +7,7 @@ return array( 'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'), - 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'), - 'Symfony\\Contracts\\Translation\\' => array($vendorDir . '/symfony/translation-contracts'), - 'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'), + 'EDD\\Vendor\\Symfony\\Polyfill\\Mbstring\\' => array($baseDir . '/libraries/Symfony/Polyfill/Mbstring'), 'EDD\\Vendor\\Stripe\\' => array($baseDir . '/libraries/Stripe/lib'), 'EDD\\Vendor\\Carbon\\' => array($baseDir . '/libraries/Carbon/src/Carbon'), 'EDD\\' => array($baseDir . '/src'), diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index f67c5ef409..c1962b7829 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInita9dc9013925c51d0fbf377fec9608140 +class ComposerAutoloaderInit90b78d2443e310e04b1f14c18b400110 { private static $loader; @@ -22,16 +22,16 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInita9dc9013925c51d0fbf377fec9608140', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit90b78d2443e310e04b1f14c18b400110', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInita9dc9013925c51d0fbf377fec9608140', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit90b78d2443e310e04b1f14c18b400110', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInita9dc9013925c51d0fbf377fec9608140::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit90b78d2443e310e04b1f14c18b400110::getInitializer($loader)); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInita9dc9013925c51d0fbf377fec9608140::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit90b78d2443e310e04b1f14c18b400110::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 3039d2e2fa..3a6137aa7e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,26 +4,23 @@ namespace Composer\Autoload; -class ComposerStaticInita9dc9013925c51d0fbf377fec9608140 +class ComposerStaticInit90b78d2443e310e04b1f14c18b400110 { public static $files = array ( '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php', - '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', - 'a1105708a18b76903365ca1c4aa61b02' => __DIR__ . '/..' . '/symfony/translation/Resources/functions.php', 'df9547068186d5bd9161c63e6cc8097a' => __DIR__ . '/../..' . '/src/Globals/Polyfills/PHP.php', + '689537902e03683e53e4251d0635d0b4' => __DIR__ . '/../..' . '/libraries/Symfony/Polyfill/Mbstring/bootstrap.php', ); public static $prefixLengthsPsr4 = array ( 'S' => array ( 'Symfony\\Polyfill\\Php80\\' => 23, - 'Symfony\\Polyfill\\Mbstring\\' => 26, - 'Symfony\\Contracts\\Translation\\' => 30, - 'Symfony\\Component\\Translation\\' => 30, ), 'E' => array ( + 'EDD\\Vendor\\Symfony\\Polyfill\\Mbstring\\' => 37, 'EDD\\Vendor\\Stripe\\' => 18, 'EDD\\Vendor\\Carbon\\' => 18, 'EDD\\' => 4, @@ -35,17 +32,9 @@ class ComposerStaticInita9dc9013925c51d0fbf377fec9608140 array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-php80', ), - 'Symfony\\Polyfill\\Mbstring\\' => + 'EDD\\Vendor\\Symfony\\Polyfill\\Mbstring\\' => array ( - 0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring', - ), - 'Symfony\\Contracts\\Translation\\' => - array ( - 0 => __DIR__ . '/..' . '/symfony/translation-contracts', - ), - 'Symfony\\Component\\Translation\\' => - array ( - 0 => __DIR__ . '/..' . '/symfony/translation', + 0 => __DIR__ . '/../..' . '/libraries/Symfony/Polyfill/Mbstring', ), 'EDD\\Vendor\\Stripe\\' => array ( @@ -73,9 +62,9 @@ class ComposerStaticInita9dc9013925c51d0fbf377fec9608140 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInita9dc9013925c51d0fbf377fec9608140::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInita9dc9013925c51d0fbf377fec9608140::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInita9dc9013925c51d0fbf377fec9608140::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit90b78d2443e310e04b1f14c18b400110::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit90b78d2443e310e04b1f14c18b400110::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit90b78d2443e310e04b1f14c18b400110::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 31c45977d9..4c0b0e112f 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1232,17 +1232,17 @@ }, { "name": "php-stubs/wordpress-stubs", - "version": "v6.3.2", - "version_normalized": "6.3.2.0", + "version": "v6.4.0", + "version_normalized": "6.4.0.0", "source": { "type": "git", "url": "https://github.com/php-stubs/wordpress-stubs.git", - "reference": "f22b00cacd3b9addc2b07ff48290084503c48574" + "reference": "286d42eeb44c6808633cc59b8dbb9aa75fe41264" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/f22b00cacd3b9addc2b07ff48290084503c48574", - "reference": "f22b00cacd3b9addc2b07ff48290084503c48574", + "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/286d42eeb44c6808633cc59b8dbb9aa75fe41264", + "reference": "286d42eeb44c6808633cc59b8dbb9aa75fe41264", "shasum": "" }, "require-dev": { @@ -1258,7 +1258,7 @@ "symfony/polyfill-php80": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", "szepeviktor/phpstan-wordpress": "WordPress extensions for PHPStan" }, - "time": "2023-10-14T10:08:05+00:00", + "time": "2023-11-08T07:02:08+00:00", "type": "library", "installation-source": "dist", "notification-url": "https://packagist.org/downloads/", @@ -1274,7 +1274,7 @@ ], "support": { "issues": "https://github.com/php-stubs/wordpress-stubs/issues", - "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.3.2" + "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.4.0" }, "install-path": "../php-stubs/wordpress-stubs" }, @@ -1652,17 +1652,17 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.39", - "version_normalized": "1.10.39.0", + "version": "1.10.41", + "version_normalized": "1.10.41.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4" + "reference": "c6174523c2a69231df55bdc65b61655e72876d76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d9dedb0413f678b4d03cbc2279a48f91592c97c4", - "reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76", + "reference": "c6174523c2a69231df55bdc65b61655e72876d76", "shasum": "" }, "require": { @@ -1671,7 +1671,7 @@ "conflict": { "phpstan/phpstan-shim": "*" }, - "time": "2023-10-17T15:46:26+00:00", + "time": "2023-11-05T12:57:57+00:00", "bin": [ "phpstan", "phpstan.phar" @@ -4106,17 +4106,17 @@ }, { "name": "symfony/translation", - "version": "v6.3.6", - "version_normalized": "6.3.6.0", + "version": "v6.3.7", + "version_normalized": "6.3.7.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "869b26c7a9d4b8a48afdd77ab36031909c87e3a2" + "reference": "30212e7c87dcb79c83f6362b00bde0e0b1213499" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/869b26c7a9d4b8a48afdd77ab36031909c87e3a2", - "reference": "869b26c7a9d4b8a48afdd77ab36031909c87e3a2", + "url": "https://api.github.com/repos/symfony/translation/zipball/30212e7c87dcb79c83f6362b00bde0e0b1213499", + "reference": "30212e7c87dcb79c83f6362b00bde0e0b1213499", "shasum": "" }, "require": { @@ -4153,7 +4153,7 @@ "symfony/service-contracts": "^2.5|^3", "symfony/yaml": "^5.4|^6.0" }, - "time": "2023-10-17T11:32:53+00:00", + "time": "2023-10-28T23:11:45+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -4184,7 +4184,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.3.6" + "source": "https://github.com/symfony/translation/tree/v6.3.7" }, "funding": [ { @@ -4285,17 +4285,17 @@ }, { "name": "symfony/yaml", - "version": "v5.4.23", - "version_normalized": "5.4.23.0", + "version": "v5.4.30", + "version_normalized": "5.4.30.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "4cd2e3ea301aadd76a4172756296fe552fb45b0b" + "reference": "c6980e82a6656f6ebfabfd82f7585794cb122554" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/4cd2e3ea301aadd76a4172756296fe552fb45b0b", - "reference": "4cd2e3ea301aadd76a4172756296fe552fb45b0b", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c6980e82a6656f6ebfabfd82f7585794cb122554", + "reference": "c6980e82a6656f6ebfabfd82f7585794cb122554", "shasum": "" }, "require": { @@ -4312,7 +4312,7 @@ "suggest": { "symfony/console": "For validating YAML files using the lint command" }, - "time": "2023-04-23T19:33:36+00:00", + "time": "2023-10-27T18:36:14+00:00", "bin": [ "Resources/bin/yaml-lint" ], @@ -4343,7 +4343,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.23" + "source": "https://github.com/symfony/yaml/tree/v5.4.30" }, "funding": [ { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 60e9665e30..6fb0586bad 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'easydigitaldownloads/easy-digital-downloads', 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'c1c65e60466c9a64b15d447ef16b8286adcf7317', + 'reference' => 'ae7fc9013ee323d488e4248e3a42687987be4152', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -101,7 +101,7 @@ 'easydigitaldownloads/easy-digital-downloads' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'c1c65e60466c9a64b15d447ef16b8286adcf7317', + 'reference' => 'ae7fc9013ee323d488e4248e3a42687987be4152', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -204,9 +204,9 @@ 'dev_requirement' => true, ), 'php-stubs/wordpress-stubs' => array( - 'pretty_version' => 'v6.3.2', - 'version' => '6.3.2.0', - 'reference' => 'f22b00cacd3b9addc2b07ff48290084503c48574', + 'pretty_version' => 'v6.4.0', + 'version' => '6.4.0.0', + 'reference' => '286d42eeb44c6808633cc59b8dbb9aa75fe41264', 'type' => 'library', 'install_path' => __DIR__ . '/../php-stubs/wordpress-stubs', 'aliases' => array(), @@ -267,9 +267,9 @@ 'dev_requirement' => true, ), 'phpstan/phpstan' => array( - 'pretty_version' => '1.10.39', - 'version' => '1.10.39.0', - 'reference' => 'd9dedb0413f678b4d03cbc2279a48f91592c97c4', + 'pretty_version' => '1.10.41', + 'version' => '1.10.41.0', + 'reference' => 'c6174523c2a69231df55bdc65b61655e72876d76', 'type' => 'library', 'install_path' => __DIR__ . '/../phpstan/phpstan', 'aliases' => array(), @@ -594,9 +594,9 @@ 'dev_requirement' => true, ), 'symfony/translation' => array( - 'pretty_version' => 'v6.3.6', - 'version' => '6.3.6.0', - 'reference' => '869b26c7a9d4b8a48afdd77ab36031909c87e3a2', + 'pretty_version' => 'v6.3.7', + 'version' => '6.3.7.0', + 'reference' => '30212e7c87dcb79c83f6362b00bde0e0b1213499', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/translation', 'aliases' => array(), @@ -618,9 +618,9 @@ ), ), 'symfony/yaml' => array( - 'pretty_version' => 'v5.4.23', - 'version' => '5.4.23.0', - 'reference' => '4cd2e3ea301aadd76a4172756296fe552fb45b0b', + 'pretty_version' => 'v5.4.30', + 'version' => '5.4.30.0', + 'reference' => 'c6980e82a6656f6ebfabfd82f7585794cb122554', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/yaml', 'aliases' => array(), diff --git a/vendor/symfony/service-contracts/Attribute/Required.php b/vendor/symfony/service-contracts/Attribute/Required.php deleted file mode 100644 index 9df851189a..0000000000 --- a/vendor/symfony/service-contracts/Attribute/Required.php +++ /dev/null @@ -1,25 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Contracts\Service\Attribute; - -/** - * A required dependency. - * - * This attribute indicates that a property holds a required dependency. The annotated property or method should be - * considered during the instantiation process of the containing class. - * - * @author Alexander M. Turek - */ -#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)] -final class Required -{ -} diff --git a/vendor/symfony/service-contracts/Attribute/SubscribedService.php b/vendor/symfony/service-contracts/Attribute/SubscribedService.php deleted file mode 100644 index d98e1dfdbb..0000000000 --- a/vendor/symfony/service-contracts/Attribute/SubscribedService.php +++ /dev/null @@ -1,47 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Contracts\Service\Attribute; - -use Symfony\Contracts\Service\ServiceSubscriberInterface; -use Symfony\Contracts\Service\ServiceSubscriberTrait; - -/** - * For use as the return value for {@see ServiceSubscriberInterface}. - * - * @example new SubscribedService('http_client', HttpClientInterface::class, false, new Target('githubApi')) - * - * Use with {@see ServiceSubscriberTrait} to mark a method's return type - * as a subscribed service. - * - * @author Kevin Bond - */ -#[\Attribute(\Attribute::TARGET_METHOD)] -final class SubscribedService -{ - /** @var object[] */ - public array $attributes; - - /** - * @param string|null $key The key to use for the service - * @param class-string|null $type The service class - * @param bool $nullable Whether the service is optional - * @param object|object[] $attributes One or more dependency injection attributes to use - */ - public function __construct( - public ?string $key = null, - public ?string $type = null, - public bool $nullable = false, - array|object $attributes = [], - ) { - $this->attributes = \is_array($attributes) ? $attributes : [$attributes]; - } -} diff --git a/vendor/symfony/service-contracts/README.md b/vendor/symfony/service-contracts/README.md deleted file mode 100644 index 42841a57d0..0000000000 --- a/vendor/symfony/service-contracts/README.md +++ /dev/null @@ -1,9 +0,0 @@ -Symfony Service Contracts -========================= - -A set of abstractions extracted out of the Symfony components. - -Can be used to build on semantics that the Symfony components proved useful and -that already have battle tested implementations. - -See https://github.com/symfony/contracts/blob/main/README.md for more information. diff --git a/vendor/symfony/service-contracts/ResetInterface.php b/vendor/symfony/service-contracts/ResetInterface.php deleted file mode 100644 index a4f389b01f..0000000000 --- a/vendor/symfony/service-contracts/ResetInterface.php +++ /dev/null @@ -1,33 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Contracts\Service; - -/** - * Provides a way to reset an object to its initial state. - * - * When calling the "reset()" method on an object, it should be put back to its - * initial state. This usually means clearing any internal buffers and forwarding - * the call to internal dependencies. All properties of the object should be put - * back to the same state it had when it was first ready to use. - * - * This method could be called, for example, to recycle objects that are used as - * services, so that they can be used to handle several requests in the same - * process loop (note that we advise making your services stateless instead of - * implementing this interface when possible.) - */ -interface ResetInterface -{ - /** - * @return void - */ - public function reset(); -} diff --git a/vendor/symfony/service-contracts/ServiceLocatorTrait.php b/vendor/symfony/service-contracts/ServiceLocatorTrait.php deleted file mode 100644 index 45c8d910df..0000000000 --- a/vendor/symfony/service-contracts/ServiceLocatorTrait.php +++ /dev/null @@ -1,115 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Contracts\Service; - -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; - -// Help opcache.preload discover always-needed symbols -class_exists(ContainerExceptionInterface::class); -class_exists(NotFoundExceptionInterface::class); - -/** - * A trait to help implement ServiceProviderInterface. - * - * @author Robin Chalas - * @author Nicolas Grekas - */ -trait ServiceLocatorTrait -{ - private array $factories; - private array $loading = []; - private array $providedTypes; - - /** - * @param callable[] $factories - */ - public function __construct(array $factories) - { - $this->factories = $factories; - } - - public function has(string $id): bool - { - return isset($this->factories[$id]); - } - - public function get(string $id): mixed - { - if (!isset($this->factories[$id])) { - throw $this->createNotFoundException($id); - } - - if (isset($this->loading[$id])) { - $ids = array_values($this->loading); - $ids = \array_slice($this->loading, array_search($id, $ids)); - $ids[] = $id; - - throw $this->createCircularReferenceException($id, $ids); - } - - $this->loading[$id] = $id; - try { - return $this->factories[$id]($this); - } finally { - unset($this->loading[$id]); - } - } - - public function getProvidedServices(): array - { - if (!isset($this->providedTypes)) { - $this->providedTypes = []; - - foreach ($this->factories as $name => $factory) { - if (!\is_callable($factory)) { - $this->providedTypes[$name] = '?'; - } else { - $type = (new \ReflectionFunction($factory))->getReturnType(); - - $this->providedTypes[$name] = $type ? ($type->allowsNull() ? '?' : '').($type instanceof \ReflectionNamedType ? $type->getName() : $type) : '?'; - } - } - } - - return $this->providedTypes; - } - - private function createNotFoundException(string $id): NotFoundExceptionInterface - { - if (!$alternatives = array_keys($this->factories)) { - $message = 'is empty...'; - } else { - $last = array_pop($alternatives); - if ($alternatives) { - $message = sprintf('only knows about the "%s" and "%s" services.', implode('", "', $alternatives), $last); - } else { - $message = sprintf('only knows about the "%s" service.', $last); - } - } - - if ($this->loading) { - $message = sprintf('The service "%s" has a dependency on a non-existent service "%s". This locator %s', end($this->loading), $id, $message); - } else { - $message = sprintf('Service "%s" not found: the current service locator %s', $id, $message); - } - - return new class($message) extends \InvalidArgumentException implements NotFoundExceptionInterface { - }; - } - - private function createCircularReferenceException(string $id, array $path): ContainerExceptionInterface - { - return new class(sprintf('Circular reference detected for service "%s", path: "%s".', $id, implode(' -> ', $path))) extends \RuntimeException implements ContainerExceptionInterface { - }; - } -} diff --git a/vendor/symfony/service-contracts/ServiceProviderInterface.php b/vendor/symfony/service-contracts/ServiceProviderInterface.php deleted file mode 100644 index c05e4bfe7b..0000000000 --- a/vendor/symfony/service-contracts/ServiceProviderInterface.php +++ /dev/null @@ -1,45 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Contracts\Service; - -use Psr\Container\ContainerInterface; - -/** - * A ServiceProviderInterface exposes the identifiers and the types of services provided by a container. - * - * @author Nicolas Grekas - * @author Mateusz Sip - * - * @template-covariant T of mixed - */ -interface ServiceProviderInterface extends ContainerInterface -{ - /** - * @return T - */ - public function get(string $id): mixed; - - public function has(string $id): bool; - - /** - * Returns an associative array of service types keyed by the identifiers provided by the current container. - * - * Examples: - * - * * ['logger' => 'Psr\Log\LoggerInterface'] means the object provides a service named "logger" that implements Psr\Log\LoggerInterface - * * ['foo' => '?'] means the container provides service name "foo" of unspecified type - * * ['bar' => '?Bar\Baz'] means the container provides a service "bar" of type Bar\Baz|null - * - * @return string[] The provided service types, keyed by service names - */ - public function getProvidedServices(): array; -} diff --git a/vendor/symfony/service-contracts/ServiceSubscriberInterface.php b/vendor/symfony/service-contracts/ServiceSubscriberInterface.php deleted file mode 100644 index 3da19169b0..0000000000 --- a/vendor/symfony/service-contracts/ServiceSubscriberInterface.php +++ /dev/null @@ -1,62 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Contracts\Service; - -use Symfony\Contracts\Service\Attribute\SubscribedService; - -/** - * A ServiceSubscriber exposes its dependencies via the static {@link getSubscribedServices} method. - * - * The getSubscribedServices method returns an array of service types required by such instances, - * optionally keyed by the service names used internally. Service types that start with an interrogation - * mark "?" are optional, while the other ones are mandatory service dependencies. - * - * The injected service locators SHOULD NOT allow access to any other services not specified by the method. - * - * It is expected that ServiceSubscriber instances consume PSR-11-based service locators internally. - * This interface does not dictate any injection method for these service locators, although constructor - * injection is recommended. - * - * @author Nicolas Grekas - */ -interface ServiceSubscriberInterface -{ - /** - * Returns an array of service types (or {@see SubscribedService} objects) required - * by such instances, optionally keyed by the service names used internally. - * - * For mandatory dependencies: - * - * * ['logger' => 'Psr\Log\LoggerInterface'] means the objects use the "logger" name - * internally to fetch a service which must implement Psr\Log\LoggerInterface. - * * ['loggers' => 'Psr\Log\LoggerInterface[]'] means the objects use the "loggers" name - * internally to fetch an iterable of Psr\Log\LoggerInterface instances. - * * ['Psr\Log\LoggerInterface'] is a shortcut for - * * ['Psr\Log\LoggerInterface' => 'Psr\Log\LoggerInterface'] - * - * otherwise: - * - * * ['logger' => '?Psr\Log\LoggerInterface'] denotes an optional dependency - * * ['loggers' => '?Psr\Log\LoggerInterface[]'] denotes an optional iterable dependency - * * ['?Psr\Log\LoggerInterface'] is a shortcut for - * * ['Psr\Log\LoggerInterface' => '?Psr\Log\LoggerInterface'] - * - * additionally, an array of {@see SubscribedService}'s can be returned: - * - * * [new SubscribedService('logger', Psr\Log\LoggerInterface::class)] - * * [new SubscribedService(type: Psr\Log\LoggerInterface::class, nullable: true)] - * * [new SubscribedService('http_client', HttpClientInterface::class, attributes: new Target('githubApi'))] - * - * @return string[]|SubscribedService[] The required service types, optionally keyed by service names - */ - public static function getSubscribedServices(): array; -} diff --git a/vendor/symfony/service-contracts/ServiceSubscriberTrait.php b/vendor/symfony/service-contracts/ServiceSubscriberTrait.php deleted file mode 100644 index f3b450cd6c..0000000000 --- a/vendor/symfony/service-contracts/ServiceSubscriberTrait.php +++ /dev/null @@ -1,78 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Contracts\Service; - -use Psr\Container\ContainerInterface; -use Symfony\Contracts\Service\Attribute\Required; -use Symfony\Contracts\Service\Attribute\SubscribedService; - -/** - * Implementation of ServiceSubscriberInterface that determines subscribed services from - * method return types. Service ids are available as "ClassName::methodName". - * - * @author Kevin Bond - */ -trait ServiceSubscriberTrait -{ - /** @var ContainerInterface */ - protected $container; - - public static function getSubscribedServices(): array - { - $services = method_exists(get_parent_class(self::class) ?: '', __FUNCTION__) ? parent::getSubscribedServices() : []; - - foreach ((new \ReflectionClass(self::class))->getMethods() as $method) { - if (self::class !== $method->getDeclaringClass()->name) { - continue; - } - - if (!$attribute = $method->getAttributes(SubscribedService::class)[0] ?? null) { - continue; - } - - if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) { - throw new \LogicException(sprintf('Cannot use "%s" on method "%s::%s()" (can only be used on non-static, non-abstract methods with no parameters).', SubscribedService::class, self::class, $method->name)); - } - - if (!$returnType = $method->getReturnType()) { - throw new \LogicException(sprintf('Cannot use "%s" on methods without a return type in "%s::%s()".', SubscribedService::class, $method->name, self::class)); - } - - /* @var SubscribedService $attribute */ - $attribute = $attribute->newInstance(); - $attribute->key ??= self::class.'::'.$method->name; - $attribute->type ??= $returnType instanceof \ReflectionNamedType ? $returnType->getName() : (string) $returnType; - $attribute->nullable = $returnType->allowsNull(); - - if ($attribute->attributes) { - $services[] = $attribute; - } else { - $services[$attribute->key] = ($attribute->nullable ? '?' : '').$attribute->type; - } - } - - return $services; - } - - #[Required] - public function setContainer(ContainerInterface $container): ?ContainerInterface - { - $ret = null; - if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) { - $ret = parent::setContainer($container); - } - - $this->container = $container; - - return $ret; - } -} diff --git a/vendor/symfony/service-contracts/Test/ServiceLocatorTest.php b/vendor/symfony/service-contracts/Test/ServiceLocatorTest.php deleted file mode 100644 index 07d12b4a5b..0000000000 --- a/vendor/symfony/service-contracts/Test/ServiceLocatorTest.php +++ /dev/null @@ -1,23 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Contracts\Service\Test; - -class_alias(ServiceLocatorTestCase::class, ServiceLocatorTest::class); - -if (false) { - /** - * @deprecated since PHPUnit 9.6 - */ - class ServiceLocatorTest - { - } -} diff --git a/vendor/symfony/service-contracts/Test/ServiceLocatorTestCase.php b/vendor/symfony/service-contracts/Test/ServiceLocatorTestCase.php deleted file mode 100644 index a0f20a6a7c..0000000000 --- a/vendor/symfony/service-contracts/Test/ServiceLocatorTestCase.php +++ /dev/null @@ -1,92 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Contracts\Service\Test; - -use PHPUnit\Framework\TestCase; -use Psr\Container\ContainerInterface; -use Symfony\Contracts\Service\ServiceLocatorTrait; - -abstract class ServiceLocatorTestCase extends TestCase -{ - protected function getServiceLocator(array $factories): ContainerInterface - { - return new class($factories) implements ContainerInterface { - use ServiceLocatorTrait; - }; - } - - public function testHas() - { - $locator = $this->getServiceLocator([ - 'foo' => function () { return 'bar'; }, - 'bar' => function () { return 'baz'; }, - function () { return 'dummy'; }, - ]); - - $this->assertTrue($locator->has('foo')); - $this->assertTrue($locator->has('bar')); - $this->assertFalse($locator->has('dummy')); - } - - public function testGet() - { - $locator = $this->getServiceLocator([ - 'foo' => function () { return 'bar'; }, - 'bar' => function () { return 'baz'; }, - ]); - - $this->assertSame('bar', $locator->get('foo')); - $this->assertSame('baz', $locator->get('bar')); - } - - public function testGetDoesNotMemoize() - { - $i = 0; - $locator = $this->getServiceLocator([ - 'foo' => function () use (&$i) { - ++$i; - - return 'bar'; - }, - ]); - - $this->assertSame('bar', $locator->get('foo')); - $this->assertSame('bar', $locator->get('foo')); - $this->assertSame(2, $i); - } - - public function testThrowsOnUndefinedInternalService() - { - if (!$this->getExpectedException()) { - $this->expectException(\Psr\Container\NotFoundExceptionInterface::class); - $this->expectExceptionMessage('The service "foo" has a dependency on a non-existent service "bar". This locator only knows about the "foo" service.'); - } - $locator = $this->getServiceLocator([ - 'foo' => function () use (&$locator) { return $locator->get('bar'); }, - ]); - - $locator->get('foo'); - } - - public function testThrowsOnCircularReference() - { - $this->expectException(\Psr\Container\ContainerExceptionInterface::class); - $this->expectExceptionMessage('Circular reference detected for service "bar", path: "bar -> baz -> bar".'); - $locator = $this->getServiceLocator([ - 'foo' => function () use (&$locator) { return $locator->get('bar'); }, - 'bar' => function () use (&$locator) { return $locator->get('baz'); }, - 'baz' => function () use (&$locator) { return $locator->get('bar'); }, - ]); - - $locator->get('foo'); - } -} diff --git a/vendor/symfony/service-contracts/composer.json b/vendor/symfony/service-contracts/composer.json deleted file mode 100644 index a64188b51b..0000000000 --- a/vendor/symfony/service-contracts/composer.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "symfony/service-contracts", - "type": "library", - "description": "Generic abstractions related to writing services", - "keywords": ["abstractions", "contracts", "decoupling", "interfaces", "interoperability", "standards"], - "homepage": "https://symfony.com", - "license": "MIT", - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "require": { - "php": ">=8.1", - "psr/container": "^2.0" - }, - "conflict": { - "ext-psr": "<1.1|>=2" - }, - "autoload": { - "psr-4": { "Symfony\\Contracts\\Service\\": "" }, - "exclude-from-classmap": [ - "/Test/" - ] - }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-main": "3.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - } -} diff --git a/vendor/symfony/translation-contracts/CHANGELOG.md b/vendor/symfony/translation-contracts/CHANGELOG.md deleted file mode 100644 index 7932e26132..0000000000 --- a/vendor/symfony/translation-contracts/CHANGELOG.md +++ /dev/null @@ -1,5 +0,0 @@ -CHANGELOG -========= - -The changelog is maintained for all Symfony contracts at the following URL: -https://github.com/symfony/contracts/blob/main/CHANGELOG.md diff --git a/vendor/symfony/translation-contracts/LICENSE b/vendor/symfony/translation-contracts/LICENSE deleted file mode 100644 index 7536caeae8..0000000000 --- a/vendor/symfony/translation-contracts/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2018-present Fabien Potencier - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.