diff --git a/.gitignore b/.gitignore index 66757bd..390ddd6 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ /var/classes/DataObject !/var/config -/var/config/system.php +/var/config/system.yml /var/config/debug-mode.php /var/config/maintenance.php diff --git a/app/config/local/.gitkeep b/app/config/local/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/composer.json b/composer.json index 40d1d9e..9dda702 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,13 @@ "require": { "php": ">=7.2", "ext-json": "*", - "coreshop/pimcore-bundle": "^2.0", - "coreshop/seo-bundle": "^2.0", + "coreshop/pimcore": "2.1.x-dev", + "coreshop/pimcore-bundle": "2.1.x-dev", + "coreshop/seo": "2.1.x-dev", + "coreshop/seo-bundle": "2.1.x-dev", "danielstjules/stringy": "^3.1", - "pimcore/pimcore": "~5.8.0", + "pimcore/pimcore": "~6.0.0", + "symfony/symfony": "^4.3", "symfony/webpack-encore-bundle": "^1.3", "w-vision/pimcore-deployer": "^1.2", "w-vision/wvision": "^2.2.0" @@ -43,21 +46,17 @@ "post-create-project-cmd": "Pimcore\\Composer::postCreateProject", "post-install-cmd": [ "Pimcore\\Composer::postInstall", - "@symfony-scripts" + "@pimcore-scripts" ], "post-update-cmd": [ "Pimcore\\Composer::postUpdate", - "@symfony-scripts", - "Pimcore\\Composer::executeMigrationsUp" + "@pimcore-scripts", + "Pimcore\\Composer::executeMigrationsUp", + "@pimcore-scripts" ], - "pre-package-update": [ - "Pimcore\\Composer::prePackageUpdate" - ], - "symfony-scripts": [ - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" + "pimcore-scripts": [ + "Pimcore\\Composer::clearCache", + "Pimcore\\Composer::installAssets" ] }, "extra": { diff --git a/composer.lock b/composer.lock index 5ef3d6e..594861e 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": "bc9de820ee2384faf18b9c8d5dc2aad6", + "content-hash": "a7cbfda1cc217916edd6b81f214f1426", "packages": [ { "name": "amnuts/opcache-gui", @@ -289,25 +289,26 @@ }, { "name": "coreshop/pimcore", - "version": "2.0.8", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/coreshop/Pimcore.git", - "reference": "a40d0fb8e27397392e63b51fdee278e51b24ea16" + "reference": "0546c2f8633abbdffe023acc1ce1e150bd7a39be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/coreshop/Pimcore/zipball/a40d0fb8e27397392e63b51fdee278e51b24ea16", - "reference": "a40d0fb8e27397392e63b51fdee278e51b24ea16", + "url": "https://api.github.com/repos/coreshop/Pimcore/zipball/0546c2f8633abbdffe023acc1ce1e150bd7a39be", + "reference": "0546c2f8633abbdffe023acc1ce1e150bd7a39be", "shasum": "" }, "require": { - "pimcore/pimcore": "^5.4.0" + "php": "^7.2", + "pimcore/pimcore": "^5.8.0 | ^6.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -334,31 +335,31 @@ "ecommerce", "pimcore" ], - "time": "2019-04-03T10:28:24+00:00" + "time": "2019-06-07T06:36:50+00:00" }, { "name": "coreshop/pimcore-bundle", - "version": "2.0.8", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/coreshop/PimcoreBundle.git", - "reference": "5d5e70ed1828ba98f59fc9623ac50204033e66cc" + "reference": "e15bf54c7cb8d1c2184f49b4a23927c2b32f7d70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/coreshop/PimcoreBundle/zipball/5d5e70ed1828ba98f59fc9623ac50204033e66cc", - "reference": "5d5e70ed1828ba98f59fc9623ac50204033e66cc", + "url": "https://api.github.com/repos/coreshop/PimcoreBundle/zipball/e15bf54c7cb8d1c2184f49b4a23927c2b32f7d70", + "reference": "e15bf54c7cb8d1c2184f49b4a23927c2b32f7d70", "shasum": "" }, "require": { - "coreshop/pimcore": "^2.0", + "coreshop/pimcore": "^2.1", "coreshop/registry": "^2.0", - "php": "^7.0" + "php": "^7.2" }, "type": "pimcore-bundle", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -385,7 +386,7 @@ "ecommerce", "pimcore" ], - "time": "2019-04-15T10:57:05+00:00" + "time": "2019-06-25T14:44:53+00:00" }, { "name": "coreshop/registry", @@ -438,26 +439,27 @@ }, { "name": "coreshop/seo", - "version": "2.0.8", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/coreshop/SEO.git", - "reference": "87435c3d1c0a93726b0402958713a4a9630409dd" + "reference": "e37ec7713453d1cc57736642cc03f8c289d8ebb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/coreshop/SEO/zipball/87435c3d1c0a93726b0402958713a4a9630409dd", - "reference": "87435c3d1c0a93726b0402958713a4a9630409dd", + "url": "https://api.github.com/repos/coreshop/SEO/zipball/e37ec7713453d1cc57736642cc03f8c289d8ebb8", + "reference": "e37ec7713453d1cc57736642cc03f8c289d8ebb8", "shasum": "" }, "require": { "coreshop/registry": "^2.0", + "php": "^7.2", "webmozart/assert": "^1.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -484,30 +486,30 @@ "ecommerce", "pimcore" ], - "time": "2019-01-20T11:07:29+00:00" + "time": "2019-05-08T11:21:18+00:00" }, { "name": "coreshop/seo-bundle", - "version": "2.0.8", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/coreshop/SEOBundle.git", - "reference": "cff82a19897ecf7e31cc582b7ea3c8e324ed2482" + "reference": "8ec9f03ebef9c2212265c077e808b042d309db89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/coreshop/SEOBundle/zipball/cff82a19897ecf7e31cc582b7ea3c8e324ed2482", - "reference": "cff82a19897ecf7e31cc582b7ea3c8e324ed2482", + "url": "https://api.github.com/repos/coreshop/SEOBundle/zipball/8ec9f03ebef9c2212265c077e808b042d309db89", + "reference": "8ec9f03ebef9c2212265c077e808b042d309db89", "shasum": "" }, "require": { "coreshop/seo": "^2.0", - "php": "^7.0" + "php": "^7.2" }, "type": "pimcore-bundle", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -534,7 +536,7 @@ "ecommerce", "pimcore" ], - "time": "2019-01-20T10:56:27+00:00" + "time": "2019-06-05T13:33:45+00:00" }, { "name": "dachcom-digital/emailizr", @@ -4022,36 +4024,18 @@ ], "time": "2019-06-23T16:33:11+00:00" }, - { - "name": "pimcore/core-version", - "version": "v5.8.4", - "source": { - "type": "git", - "url": "https://github.com/pimcore/core-version.git", - "reference": "582bf49c5f35229c946e2ad9d783153b25c04c30" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pimcore/core-version/zipball/582bf49c5f35229c946e2ad9d783153b25c04c30", - "reference": "582bf49c5f35229c946e2ad9d783153b25c04c30", - "shasum": "" - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "time": "2018-08-03T06:05:04+00:00" - }, { "name": "pimcore/pimcore", - "version": "v5.8.4", + "version": "v6.0.0", "source": { "type": "git", "url": "https://github.com/pimcore/pimcore.git", - "reference": "8c444f3348aa69092c6ca39fed0989031484c603" + "reference": "8e2c939c08df3c35d46a812afbe72af25ad16bbb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pimcore/pimcore/zipball/8c444f3348aa69092c6ca39fed0989031484c603", - "reference": "8c444f3348aa69092c6ca39fed0989031484c603", + "url": "https://api.github.com/repos/pimcore/pimcore/zipball/8e2c939c08df3c35d46a812afbe72af25ad16bbb", + "reference": "8e2c939c08df3c35d46a812afbe72af25ad16bbb", "shasum": "" }, "require": { @@ -4097,24 +4081,21 @@ "ocramius/package-versions": "^1.2", "pear/net_url2": "^2.2", "phive/twig-extensions-deferred": "^2.0", - "php": ">=7.1", - "pimcore/core-version": "5.8.4", + "php": ">=7.2", "piwik/device-detector": "^3.9", "presta/sitemap-bundle": "^1.5", "ramsey/uuid": "^3.8", "sabre/dav": "^3.2", "scheb/two-factor-bundle": "^3.8", - "sensio/distribution-bundle": "^5.0.19", - "sensio/framework-extra-bundle": "^3.0.2", - "sensio/generator-bundle": "^3.0", + "sensio/framework-extra-bundle": "^5.2", "sensiolabs/ansi-to-html": "^1.1", "symfony-cmf/routing-bundle": "^2.0", "symfony/monolog-bundle": "^3.1.0", "symfony/swiftmailer-bundle": "^3.2.2", - "symfony/symfony": "^3.4.17", + "symfony/symfony": "^3.4.17 || ^4.0", "tijsverkoyen/css-to-inline-styles": "^2.2.1", "twig/extensions": "^1.5", - "twig/twig": "^2.0", + "twig/twig": "^2.4", "umpirsky/country-list": "^2.0.4", "vrana/adminer": "^4.6.3", "vrana/jush": "~2.0.2", @@ -4136,7 +4117,16 @@ "bin/pimcore-install" ], "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.0-dev" + } + }, "autoload": { + "files": [ + "lib/helper-functions.php", + "lib/simple_html_dom.php" + ], "psr-4": { "Pimcore\\Model\\": "models", "Pimcore\\": "lib", @@ -4172,7 +4162,7 @@ "e-commerce", "rad" ], - "time": "2019-05-29T14:34:28+00:00" + "time": "2019-06-13T09:39:28+00:00" }, { "name": "pimple/pimple", @@ -4583,54 +4573,6 @@ ], "time": "2018-11-20T15:27:04+00:00" }, - { - "name": "psr/simple-cache", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\SimpleCache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interfaces for simple caching", - "keywords": [ - "cache", - "caching", - "psr", - "psr-16", - "simple-cache" - ], - "time": "2017-10-23T01:57:42+00:00" - }, { "name": "ralouphie/getallheaders", "version": "2.0.5", @@ -5221,94 +5163,45 @@ ], "time": "2019-05-03T12:46:19+00:00" }, - { - "name": "sensio/distribution-bundle", - "version": "v5.0.25", - "source": { - "type": "git", - "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "80a38234bde8321fb92aa0b8c27978a272bb4baf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/80a38234bde8321fb92aa0b8c27978a272bb4baf", - "reference": "80a38234bde8321fb92aa0b8c27978a272bb4baf", - "shasum": "" - }, - "require": { - "php": ">=5.3.9", - "sensiolabs/security-checker": "~5.0|~6.0", - "symfony/class-loader": "~2.3|~3.0", - "symfony/config": "~2.3|~3.0", - "symfony/dependency-injection": "~2.3|~3.0", - "symfony/filesystem": "~2.3|~3.0", - "symfony/http-kernel": "~2.3|~3.0", - "symfony/process": "~2.3|~3.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Sensio\\Bundle\\DistributionBundle\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Base bundle for Symfony Distributions", - "keywords": [ - "configuration", - "distribution" - ], - "time": "2019-06-18T15:43:58+00:00" - }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.29", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "bb907234df776b68922eb4b25bfa061683597b6a" + "reference": "5f75c4658b03301cba17baa15a840b57b72b4262" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/bb907234df776b68922eb4b25bfa061683597b6a", - "reference": "bb907234df776b68922eb4b25bfa061683597b6a", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/5f75c4658b03301cba17baa15a840b57b72b4262", + "reference": "5f75c4658b03301cba17baa15a840b57b72b4262", "shasum": "" }, "require": { - "doctrine/common": "~2.2", - "symfony/dependency-injection": "~2.3|~3.0", - "symfony/framework-bundle": "~2.3|~3.0|~4.0" + "doctrine/annotations": "^1.0", + "doctrine/persistence": "^1.0", + "php": ">=7.1.3", + "symfony/config": "^3.4|^4.2", + "symfony/dependency-injection": "^3.4|^4.2", + "symfony/framework-bundle": "^3.4|^4.2", + "symfony/http-kernel": "^3.4|^4.2" }, "require-dev": { - "doctrine/doctrine-bundle": "~1.5", - "doctrine/orm": "~2.4,>=2.4.5", - "symfony/asset": "~2.7|~3.0|~4.0", - "symfony/browser-kit": "~2.3|~3.0|~4.0", - "symfony/dom-crawler": "~2.3|~3.0|~4.0", - "symfony/expression-language": "~2.4|~3.0|~4.0", - "symfony/finder": "~2.3|~3.0|~4.0", - "symfony/phpunit-bridge": "~3.2|~4.0", - "symfony/psr-http-message-bridge": "^0.3|^1.0", - "symfony/security-bundle": "~2.4|~3.0|~4.0", - "symfony/templating": "~2.3|~3.0|~4.0", - "symfony/translation": "~2.3|~3.0|~4.0", - "symfony/twig-bundle": "~2.3|~3.0|~4.0", - "symfony/yaml": "~2.3|~3.0|~4.0", - "twig/twig": "~1.12|~2.0", - "zendframework/zend-diactoros": "^1.3" + "doctrine/doctrine-bundle": "^1.6", + "doctrine/orm": "^2.5", + "nyholm/psr7": "^1.1", + "symfony/browser-kit": "^3.4|^4.2", + "symfony/dom-crawler": "^3.4|^4.2", + "symfony/expression-language": "^3.4|^4.2", + "symfony/finder": "^3.4|^4.2", + "symfony/monolog-bridge": "^3.0|^4.0", + "symfony/monolog-bundle": "^3.2", + "symfony/phpunit-bridge": "^3.4.19|^4.1.8", + "symfony/psr-http-message-bridge": "^1.1", + "symfony/security-bundle": "^3.4|^4.2", + "symfony/twig-bundle": "^3.4|^4.2", + "symfony/yaml": "^3.4|^4.2", + "twig/twig": "~1.12|~2.0" }, "suggest": { "symfony/expression-language": "", @@ -5318,7 +5211,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "5.3.x-dev" } }, "autoload": { @@ -5341,61 +5234,7 @@ "annotations", "controllers" ], - "time": "2017-12-14T19:03:23+00:00" - }, - { - "name": "sensio/generator-bundle", - "version": "v3.1.7", - "source": { - "type": "git", - "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "28cbaa244bd0816fd8908b93f90380bcd7b67a65" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/28cbaa244bd0816fd8908b93f90380bcd7b67a65", - "reference": "28cbaa244bd0816fd8908b93f90380bcd7b67a65", - "shasum": "" - }, - "require": { - "symfony/console": "~2.7|~3.0", - "symfony/framework-bundle": "~2.7|~3.0", - "symfony/process": "~2.7|~3.0", - "symfony/yaml": "~2.7|~3.0", - "twig/twig": "^1.28.2|^2.0" - }, - "require-dev": { - "doctrine/orm": "~2.4", - "symfony/doctrine-bridge": "~2.7|~3.0", - "symfony/filesystem": "~2.7|~3.0", - "symfony/phpunit-bridge": "^3.3" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "3.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Sensio\\Bundle\\GeneratorBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "This bundle generates code for you", - "time": "2017-12-07T15:36:41+00:00" + "time": "2019-04-10T06:00:20+00:00" }, { "name": "sensiolabs/ansi-to-html", @@ -5441,54 +5280,6 @@ "description": "A library to convert a text with ANSI codes to HTML", "time": "2017-05-02T00:53:29+00:00" }, - { - "name": "sensiolabs/security-checker", - "version": "v6.0.1", - "source": { - "type": "git", - "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "ce8d0552dcb8d3677ab9adb6d19a5837949bfec4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/ce8d0552dcb8d3677ab9adb6d19a5837949bfec4", - "reference": "ce8d0552dcb8d3677ab9adb6d19a5837949bfec4", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "symfony/console": "^2.8|^3.4|^4.2", - "symfony/http-client": "^4.3", - "symfony/mime": "^4.3", - "symfony/polyfill-ctype": "^1.11" - }, - "bin": [ - "security-checker" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "6.0-dev" - } - }, - "autoload": { - "psr-4": { - "SensioLabs\\Security\\": "SensioLabs/Security" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien.potencier@gmail.com" - } - ], - "description": "A security checker for your composer.lock", - "time": "2019-06-08T06:46:26+00:00" - }, { "name": "sonata-project/google-authenticator", "version": "2.2.0", @@ -5737,34 +5528,40 @@ }, { "name": "symfony/contracts", - "version": "v1.1.0", + "version": "v1.1.5", "source": { "type": "git", "url": "https://github.com/symfony/contracts.git", - "reference": "d3636025e8253c6144358ec0a62773cae588395b" + "reference": "3f3f796d5f24a098a9da62828b8daa1b11494c1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/contracts/zipball/d3636025e8253c6144358ec0a62773cae588395b", - "reference": "d3636025e8253c6144358ec0a62773cae588395b", + "url": "https://api.github.com/repos/symfony/contracts/zipball/3f3f796d5f24a098a9da62828b8daa1b11494c1b", + "reference": "3f3f796d5f24a098a9da62828b8daa1b11494c1b", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3", + "psr/cache": "^1.0", + "psr/container": "^1.0" + }, + "replace": { + "symfony/cache-contracts": "self.version", + "symfony/event-dispatcher-contracts": "self.version", + "symfony/http-client-contracts": "self.version", + "symfony/service-contracts": "self.version", + "symfony/translation-contracts": "self.version" }, "require-dev": { - "psr/cache": "^1.0", - "psr/container": "^1.0", "symfony/polyfill-intl-idn": "^1.10" }, "suggest": { - "psr/cache": "When using the Cache contracts", - "psr/container": "When using the Service contracts", - "symfony/cache-contracts-implementation": "", + "psr/event-dispatcher": "When using the EventDispatcher contracts", + "symfony/cache-implementation": "", "symfony/event-dispatcher-implementation": "", - "symfony/http-client-contracts-implementation": "", - "symfony/service-contracts-implementation": "", - "symfony/translation-contracts-implementation": "" + "symfony/http-client-implementation": "", + "symfony/service-implementation": "", + "symfony/translation-implementation": "" }, "type": "library", "extra": { @@ -5804,47 +5601,44 @@ "interoperability", "standards" ], - "time": "2019-04-27T14:29:50+00:00" + "time": "2019-06-20T06:46:26+00:00" }, { - "name": "symfony/http-client", - "version": "v4.3.2", + "name": "symfony/monolog-bundle", + "version": "v3.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/http-client.git", - "reference": "e903ab079c99eab322fc5c71eb63fc467cd19a2a" + "url": "https://github.com/symfony/monolog-bundle.git", + "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/e903ab079c99eab322fc5c71eb63fc467cd19a2a", - "reference": "e903ab079c99eab322fc5c71eb63fc467cd19a2a", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7fbecb371c1c614642c93c6b2cbcdf723ae8809d", + "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d", "shasum": "" }, "require": { - "php": "^7.1.3", - "psr/log": "^1.0", - "symfony/http-client-contracts": "^1.1.4", - "symfony/polyfill-php73": "^1.11" - }, - "provide": { - "psr/http-client-implementation": "1.0", - "symfony/http-client-implementation": "1.1" + "monolog/monolog": "~1.22", + "php": ">=5.6", + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4.10|^4.0.10", + "symfony/http-kernel": "~3.4|~4.0", + "symfony/monolog-bridge": "~3.4|~4.0" }, "require-dev": { - "nyholm/psr7": "^1.0", - "psr/http-client": "^1.0", - "symfony/http-kernel": "^4.3", - "symfony/process": "^4.2" + "symfony/console": "~3.4|~4.0", + "symfony/phpunit-bridge": "^3.4.19|^4.0", + "symfony/yaml": "~3.4|~4.0" }, - "type": "library", + "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\HttpClient\\": "" + "Symfony\\Bundle\\MonologBundle\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -5856,286 +5650,55 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], - "description": "Symfony HttpClient component", - "homepage": "https://symfony.com", - "time": "2019-06-26T07:29:23+00:00" + "description": "Symfony MonologBundle", + "homepage": "http://symfony.com", + "keywords": [ + "log", + "logging" + ], + "time": "2019-06-20T12:18:19+00:00" }, { - "name": "symfony/http-client-contracts", - "version": "v1.1.5", + "name": "symfony/polyfill-ctype", + "version": "v1.11.0", "source": { "type": "git", - "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "e1924aea9c70ae3e69fff05afa3cb8ce541bf3bb" + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "82ebae02209c21113908c229e9883c419720738a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/e1924aea9c70ae3e69fff05afa3cb8ce541bf3bb", - "reference": "e1924aea9c70ae3e69fff05afa3cb8ce541bf3bb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", + "reference": "82ebae02209c21113908c229e9883c419720738a", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": ">=5.3.3" }, "suggest": { - "symfony/http-client-implementation": "" + "ext-ctype": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.11-dev" } }, "autoload": { "psr-4": { - "Symfony\\Contracts\\HttpClient\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to HTTP clients", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "time": "2019-06-17T17:43:54+00:00" - }, - { - "name": "symfony/mime", - "version": "v4.3.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/mime.git", - "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/ec2c5565de60e03f33d4296a655e3273f0ad1f8b", - "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b", - "shasum": "" - }, - "require": { - "php": "^7.1.3", - "symfony/polyfill-intl-idn": "^1.10", - "symfony/polyfill-mbstring": "^1.0" - }, - "require-dev": { - "egulias/email-validator": "^2.0", - "symfony/dependency-injection": "~3.4|^4.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Mime\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A library to manipulate MIME messages", - "homepage": "https://symfony.com", - "keywords": [ - "mime", - "mime-type" - ], - "time": "2019-06-04T09:22:54+00:00" - }, - { - "name": "symfony/monolog-bundle", - "version": "v3.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7fbecb371c1c614642c93c6b2cbcdf723ae8809d", - "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d", - "shasum": "" - }, - "require": { - "monolog/monolog": "~1.22", - "php": ">=5.6", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4.10|^4.0.10", - "symfony/http-kernel": "~3.4|~4.0", - "symfony/monolog-bridge": "~3.4|~4.0" - }, - "require-dev": { - "symfony/console": "~3.4|~4.0", - "symfony/phpunit-bridge": "^3.4.19|^4.0", - "symfony/yaml": "~3.4|~4.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Bundle\\MonologBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony MonologBundle", - "homepage": "http://symfony.com", - "keywords": [ - "log", - "logging" - ], - "time": "2019-06-20T12:18:19+00:00" - }, - { - "name": "symfony/polyfill-apcu", - "version": "v1.11.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "a502face1da6a53289480166f24de2c3c68e5c3c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a502face1da6a53289480166f24de2c3c68e5c3c", - "reference": "a502face1da6a53289480166f24de2c3c68e5c3c", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.11-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Apcu\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "apcu", - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2019-02-06T07:57:58+00:00" - }, - { - "name": "symfony/polyfill-ctype", - "version": "v1.11.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "82ebae02209c21113908c229e9883c419720738a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", - "reference": "82ebae02209c21113908c229e9883c419720738a", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "suggest": { - "ext-ctype": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.11-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, - "files": [ - "bootstrap.php" - ] + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -6399,121 +5962,6 @@ ], "time": "2019-02-06T07:57:58+00:00" }, - { - "name": "symfony/polyfill-php56", - "version": "v1.11.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/f4dddbc5c3471e1b700a147a20ae17cdb72dbe42", - "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/polyfill-util": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.11-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php56\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2019-02-06T07:57:58+00:00" - }, - { - "name": "symfony/polyfill-php70", - "version": "v1.11.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "bc4858fb611bda58719124ca079baff854149c89" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89", - "reference": "bc4858fb611bda58719124ca079baff854149c89", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "~1.0|~2.0|~9.99", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.11-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php70\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2019-02-06T07:57:58+00:00" - }, { "name": "symfony/polyfill-php72", "version": "v1.11.0", @@ -6627,58 +6075,6 @@ ], "time": "2019-02-06T07:57:58+00:00" }, - { - "name": "symfony/polyfill-util", - "version": "v1.11.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-util.git", - "reference": "b46c6cae28a3106735323f00a0c38eccf2328897" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/b46c6cae28a3106735323f00a0c38eccf2328897", - "reference": "b46c6cae28a3106735323f00a0c38eccf2328897", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.11-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Util\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony utilities for portability of PHP codes", - "homepage": "https://symfony.com", - "keywords": [ - "compat", - "compatibility", - "polyfill", - "shim" - ], - "time": "2019-02-08T14:16:39+00:00" - }, { "name": "symfony/swiftmailer-bundle", "version": "v3.2.8", @@ -6746,52 +6142,49 @@ }, { "name": "symfony/symfony", - "version": "v3.4.29", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "4c9b6d7d898457ae2189efdfaca58712269fc994" + "reference": "288bc24d0362fe87c4eb5c67f89d08f9b93e5807" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/4c9b6d7d898457ae2189efdfaca58712269fc994", - "reference": "4c9b6d7d898457ae2189efdfaca58712269fc994", + "url": "https://api.github.com/repos/symfony/symfony/zipball/288bc24d0362fe87c4eb5c67f89d08f9b93e5807", + "reference": "288bc24d0362fe87c4eb5c67f89d08f9b93e5807", "shasum": "" }, "require": { - "doctrine/common": "~2.4", + "doctrine/event-manager": "~1.0", + "doctrine/persistence": "~1.0", "ext-xml": "*", "fig/link-util": "^1.0", - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", "psr/cache": "~1.0", "psr/container": "^1.0", "psr/link": "^1.0", "psr/log": "~1.0", - "psr/simple-cache": "^1.0", - "symfony/polyfill-apcu": "~1.1", + "symfony/contracts": "^1.1.3", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-icu": "~1.0", + "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php56": "~1.0", - "symfony/polyfill-php70": "~1.6", - "twig/twig": "^1.40|^2.9" + "symfony/polyfill-php72": "~1.5", + "symfony/polyfill-php73": "^1.11", + "twig/twig": "^1.41|^2.10" }, "conflict": { + "masterminds/html5": "<2.6", + "ocramius/proxy-manager": "<2.1", "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2", "phpdocumentor/type-resolver": "<0.3.0", - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" - }, - "provide": { - "psr/cache-implementation": "1.0", - "psr/container-implementation": "1.0", - "psr/log-implementation": "1.0", - "psr/simple-cache-implementation": "1.0" + "phpunit/phpunit": "<5.4.3" }, "replace": { + "symfony/amazon-mailer": "self.version", "symfony/asset": "self.version", "symfony/browser-kit": "self.version", "symfony/cache": "self.version", - "symfony/class-loader": "self.version", "symfony/config": "self.version", "symfony/console": "self.version", "symfony/css-selector": "self.version", @@ -6807,14 +6200,22 @@ "symfony/finder": "self.version", "symfony/form": "self.version", "symfony/framework-bundle": "self.version", + "symfony/google-mailer": "self.version", + "symfony/http-client": "self.version", "symfony/http-foundation": "self.version", "symfony/http-kernel": "self.version", "symfony/inflector": "self.version", "symfony/intl": "self.version", "symfony/ldap": "self.version", "symfony/lock": "self.version", + "symfony/mailchimp-mailer": "self.version", + "symfony/mailer": "self.version", + "symfony/mailgun-mailer": "self.version", + "symfony/messenger": "self.version", + "symfony/mime": "self.version", "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", + "symfony/postmark-mailer": "self.version", "symfony/process": "self.version", "symfony/property-access": "self.version", "symfony/property-info": "self.version", @@ -6826,6 +6227,7 @@ "symfony/security-csrf": "self.version", "symfony/security-guard": "self.version", "symfony/security-http": "self.version", + "symfony/sendgrid-mailer": "self.version", "symfony/serializer": "self.version", "symfony/stopwatch": "self.version", "symfony/templating": "self.version", @@ -6834,6 +6236,7 @@ "symfony/twig-bundle": "self.version", "symfony/validator": "self.version", "symfony/var-dumper": "self.version", + "symfony/var-exporter": "self.version", "symfony/web-link": "self.version", "symfony/web-profiler-bundle": "self.version", "symfony/web-server-bundle": "self.version", @@ -6844,22 +6247,28 @@ "cache/integration-tests": "dev-master", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.6", + "doctrine/collections": "~1.0", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", "doctrine/doctrine-bundle": "~1.4", "doctrine/orm": "~2.4,>=2.4.5", + "doctrine/reflection": "~1.0", "egulias/email-validator": "~1.2,>=1.2.8|~2.0", + "masterminds/html5": "^2.6", "monolog/monolog": "~1.11", - "ocramius/proxy-manager": "~0.4|~1.0|~2.0", + "nyholm/psr7": "^1.0", + "ocramius/proxy-manager": "^2.1", "phpdocumentor/reflection-docblock": "^3.0|^4.0", - "predis/predis": "~1.0", - "symfony/phpunit-bridge": "~3.4|~4.0|~5.0", + "predis/predis": "~1.1", + "psr/http-client": "^1.0", + "psr/simple-cache": "^1.0", + "symfony/phpunit-bridge": "~3.4|~4.0", "symfony/security-acl": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -6897,7 +6306,7 @@ "keywords": [ "framework" ], - "time": "2019-06-26T13:56:55+00:00" + "time": "2019-06-26T14:26:34+00:00" }, { "name": "symfony/webpack-encore-bundle", @@ -7878,6 +7287,10 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "coreshop/pimcore": 20, + "coreshop/pimcore-bundle": 20, + "coreshop/seo": 20, + "coreshop/seo-bundle": 20, "roave/security-advisories": 20 }, "prefer-stable": true, diff --git a/deploy.php b/deploy.php index 5c30961..66e21fa 100644 --- a/deploy.php +++ b/deploy.php @@ -34,6 +34,7 @@ // Shared files and directories set('shared_files', [ '.env', + 'app/config/local/database.yml', 'app/config/parameters.yml', 'var/bundles/LuceneSearchBundle/state.cnf', 'var/config/custom-reports.php', @@ -43,7 +44,7 @@ 'var/config/maintenance.php', 'var/config/reports.php', 'var/config/robots.php', - 'var/config/system.php', + 'var/config/system.yml', 'var/config/web2print.php', 'var/config/website-settings.php', ]); diff --git a/web/app.php b/web/app.php index 2f46ef2..a646996 100644 --- a/web/app.php +++ b/web/app.php @@ -12,14 +12,15 @@ * @license http://www.pimcore.org/license GPLv3 and PEL */ +use Pimcore\Bootstrap; +use Pimcore\Kernel; use Pimcore\Tool; -use Symfony\Component\Debug\Debug; use Symfony\Component\HttpFoundation\Request; -include __DIR__ . "/../vendor/autoload.php"; +include __DIR__ . '/../vendor/autoload.php'; -\Pimcore\Bootstrap::setProjectRoot(); -\Pimcore\Bootstrap::boostrap(); +Bootstrap::setProjectRoot(); +Bootstrap::boostrap(); $request = Request::createFromGlobals(); @@ -27,17 +28,11 @@ // request stack available yet Tool::setCurrentRequest($request); -// redirect to installer if pimcore is not installed -if (!is_file(\Pimcore\Config::locateConfigFile('system.php'))) { - Debug::enable(E_ALL, true); - throw new RuntimeException('Pimcore is not installed! Please install via command line.'); -} - -/** @var \Pimcore\Kernel $kernel */ -$kernel = \Pimcore\Bootstrap::kernel(); +/** @var Kernel $kernel */ +$kernel = Bootstrap::kernel(); // reset current request - will be read from request stack from now on -Tool::setCurrentRequest(null); +Tool::setCurrentRequest(); $response = $kernel->handle($request); $response->send();