From 9d67013eee8e8bf4fec78fbe278608f8371a906e Mon Sep 17 00:00:00 2001 From: VasilYakutovich Date: Fri, 13 Nov 2020 15:20:24 +0300 Subject: [PATCH 1/4] VY/required version of symfony config changed --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b5cf6f58..595276c3 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "minimum-stability": "stable", "require": { "php": ">=5.4.0", - "symfony/config": "~2.3|~3.0", + "symfony/config": "5.1.*", "symfony/dependency-injection": "~2.3|~3.0", "symfony/filesystem": "~2.3|~3.0", "symfony/yaml": "~2.3|~3.0", From 731c0c0d8ee6bb34832a6d39d8065393751fea2f Mon Sep 17 00:00:00 2001 From: VasilYakutovich Date: Fri, 13 Nov 2020 15:51:16 +0300 Subject: [PATCH 2/4] VY/required version of symfony/dependency-injection changed --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 595276c3..08cccc0c 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "require": { "php": ">=5.4.0", "symfony/config": "5.1.*", - "symfony/dependency-injection": "~2.3|~3.0", + "symfony/dependency-injection": "5.1.*", "symfony/filesystem": "~2.3|~3.0", "symfony/yaml": "~2.3|~3.0", "twig/twig": "~1.16", From a62030274084591a876981bd178f30932b2f8dff Mon Sep 17 00:00:00 2001 From: VasilYakutovich Date: Fri, 13 Nov 2020 16:20:05 +0300 Subject: [PATCH 3/4] VY/required version changed --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 08cccc0c..0f50dd73 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,8 @@ "php": ">=5.4.0", "symfony/config": "5.1.*", "symfony/dependency-injection": "5.1.*", - "symfony/filesystem": "~2.3|~3.0", - "symfony/yaml": "~2.3|~3.0", + "symfony/filesystem": "5.1.*", + "symfony/yaml": "5.1.*", "twig/twig": "~1.16", "jakoch/phantomjs-installer": "2.1.1-p08" }, From 65999bd7bf2d96b78c78cb3ff71b35b2b4f6a671 Mon Sep 17 00:00:00 2001 From: VasilYakutovich Date: Mon, 16 Nov 2020 09:48:59 +0300 Subject: [PATCH 4/4] VY/fix twig version --- .idea/modules.xml | 8 +++++++ .idea/php-phantomjs.iml | 12 ++++++++++ .idea/php.xml | 4 ++++ .idea/vcs.xml | 6 +++++ .idea/workspace.xml | 53 +++++++++++++++++++++++++++++++++++++++++ composer.json | 2 +- 6 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 .idea/modules.xml create mode 100644 .idea/php-phantomjs.iml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..397b602b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php-phantomjs.iml b/.idea/php-phantomjs.iml new file mode 100644 index 00000000..9f0e5ad8 --- /dev/null +++ b/.idea/php-phantomjs.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 00000000..cd67c36e --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..034e51f8 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,53 @@ + + + + + + + $PROJECT_DIR$/composer.json + + + + + + + + + + + + + + + + + + + + + + + + + + + 1605269736691 + + + + + + \ No newline at end of file diff --git a/composer.json b/composer.json index 0f50dd73..abb324c6 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "symfony/dependency-injection": "5.1.*", "symfony/filesystem": "5.1.*", "symfony/yaml": "5.1.*", - "twig/twig": "~1.16", + "twig/twig": "3.0", "jakoch/phantomjs-installer": "2.1.1-p08" }, "require-dev": {