Merge branch 'hotfix/v1.2.14'

roadiz · Dec 5, 2019 · 2db099d · 2db099d
2 parents 43c99c9 + 8133fb6
commit 2db099d
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 51 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ node_js:
 php:
   - 7.2
   - 7.3
+  - 7.4
 
 jobs:
     include:
@@ -46,6 +47,7 @@ jobs:
           php:
             - 7.2
             - 7.3
+            - 7.4
           install:
             - curl -s http://getcomposer.org/installer | php
             - php composer.phar install --dev --no-interaction
@@ -58,6 +60,7 @@ jobs:
           php:
             - 7.2
             - 7.3
+            - 7.4
           env:
             - DB=mysql
             - DB=pgsql

diff --git a/composer.json b/composer.json
@@ -33,58 +33,58 @@
         "bin-dir": "bin"
     },
     "require": {
-        "php":                         ">=7.2",
-        "ext-curl":                    "*",
-        "ext-json":                    "*",
-        "ext-zip":                     "*",
-        "ext-pdo":                     "*",
-        "roadiz/models":               "~1.2.0",
-        "roadiz/documents":            "~1.2.0",
-        "doctrine/orm":                "~2.6.3",
-        "symfony/yaml":                "~3.4.29",
-        "symfony/console":             "~3.4.29",
-        "symfony/http-foundation":     "~3.4.29",
-        "symfony/routing":             "~3.4.29",
-        "symfony/config":              "~3.4.29",
-        "symfony/http-kernel":         "~3.4.29",
-        "symfony/stopwatch":           "~3.4.29",
-        "symfony/form":                "~3.4.29",
-        "symfony/validator":           "~3.4.29",
-        "symfony/security-csrf":       "~3.4.29",
-        "symfony/twig-bridge":         "~3.4.29",
-        "symfony/finder":              "~3.4.29",
-        "symfony/serializer":          "~3.4.29",
-        "symfony/filesystem":          "~3.4.29",
-        "symfony/security":            "~3.4.29",
-        "symfony/asset":               "~3.4.29",
-        "symfony/translation":         "~3.4.29",
-        "symfony-cmf/routing":         "~2.1.0",
-        "twig/twig":                   "2.*",
-        "twig/extensions":             "~1.5.4",
-        "guzzlehttp/guzzle":           "^6.3",
-        "swiftmailer/swiftmailer":     "~6.0.0",
-        "erusev/parsedown":            "<=1.6.4 | 1.8.0-beta-5 | ~1.8.0",
-        "erusev/parsedown-extra":      "<=0.7.1 | 0.8.0-beta-1 | ~0.8.0",
-        "solarium/solarium":           "~3.8.1",
-        "pimple/pimple":               "~3.2.3",
-        "inlinestyle/inlinestyle":     "~1.2.0",
-        "asm89/twig-cache-extension":  "~1.3.2",
-        "monolog/monolog":"~1.24.0",
-        "ambroisemaupate/intervention-request":"^2.3",
-        "intervention/image": "~2.4",
-        "graylog2/gelf-php": "~1.0",
-        "enshrined/svg-sanitize": "^0.10.0",
-        "maximebf/debugbar": "~1.15.0",
-        "jbzoo/pimpledumper": "^1.2",
-        "phpoffice/phpspreadsheet": "^1.1",
-        "composer/composer": "^1.8.6",
-        "symfony/workflow": "~4.2.10",
-        "jms/serializer": "~2.3.0 || ~3.1.1",
+        "php":                                     ">=7.2",
+        "ext-curl":                                "*",
+        "ext-json":                                "*",
+        "ext-zip":                                 "*",
+        "ext-pdo":                                 "*",
+        "roadiz/models":                           "~1.2.0",
+        "roadiz/documents":                        "~1.2.0",
+        "doctrine/orm":                            "^2.6.3",
+        "symfony/yaml":                            "~3.4.29",
+        "symfony/console":                         "~3.4.29",
+        "symfony/http-foundation":                 "~3.4.29",
+        "symfony/routing":                         "~3.4.29",
+        "symfony/config":                          "~3.4.29",
+        "symfony/http-kernel":                     "~3.4.29",
+        "symfony/stopwatch":                       "~3.4.29",
+        "symfony/form":                            "~3.4.29",
+        "symfony/validator":                       "~3.4.29",
+        "symfony/security-csrf":                   "~3.4.29",
+        "symfony/twig-bridge":                     "~3.4.29",
+        "symfony/finder":                          "~3.4.29",
+        "symfony/serializer":                      "~3.4.29",
+        "symfony/filesystem":                      "~3.4.29",
+        "symfony/security":                        "~3.4.29",
+        "symfony/asset":                           "~3.4.29",
+        "symfony/translation":                     "~3.4.29",
+        "symfony-cmf/routing":                     "~2.1.0",
+        "twig/twig":                               "2.*",
+        "twig/extensions":                         "~1.5.4",
+        "guzzlehttp/guzzle":                       "^6.3",
+        "swiftmailer/swiftmailer":                 "^6.0.0",
+        "erusev/parsedown":                        "<=1.6.4 | 1.8.0-beta-5 | ~1.8.0",
+        "erusev/parsedown-extra":                  "<=0.7.1 | 0.8.0-beta-1 | ~0.8.0",
+        "solarium/solarium":                       "^5.0.0",
+        "pimple/pimple":                           "^3.2.3",
+        "inlinestyle/inlinestyle":                 "~1.2.0",
+        "asm89/twig-cache-extension":              "~1.3.2",
+        "monolog/monolog":                         "^1.24.0",
+        "ambroisemaupate/intervention-request":    "^2.3",
+        "intervention/image":                      "^2.4",
+        "graylog2/gelf-php":                       "^1.0",
+        "enshrined/svg-sanitize": "                ^0.10.0",
+        "maximebf/debugbar":                       "~1.15.0",
+        "jbzoo/pimpledumper":                      "^1.2",
+        "phpoffice/phpspreadsheet":                "^1.1",
+        "composer/composer":                       "^1.8.6",
+        "symfony/workflow":                        "~4.2.10",
+        "jms/serializer":                          "^2.3.0 || ^3.1.1",
         "rollerworks/password-strength-validator": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.7.27",
-        "php-coveralls/php-coveralls": "~2.1",
+        "phpunit/phpunit": "^5.7.27",
+        "php-coveralls/php-coveralls": "^2.1",
         "squizlabs/php_codesniffer": "@stable",
         "sentry/sentry": "^1.9",
         "friendsofphp/php-cs-fixer": "^2.13"

diff --git a/conf/config.default.yml b/conf/config.default.yml
@@ -56,7 +56,7 @@ assetsProcessing:
 #        localhost:
 #            host: "localhost"
 #            port: "8983"
-#            path: "/solr"
+#            path: "/"
 #            core: "mycore"
 #            timeout: 3
 #            username: ""

diff --git a/src/Roadiz/Core/Kernel.php b/src/Roadiz/Core/Kernel.php
@@ -120,7 +120,7 @@ class Kernel implements ServiceProviderInterface, KernelInterface, RebootableInt
     const SECURITY_DOMAIN = 'roadiz_domain';
     const INSTALL_CLASSNAME = InstallApp::class;
     public static $cmsBuild = null;
-    public static $cmsVersion = "1.2.13";
+    public static $cmsVersion = "1.2.14";
 
     protected $environment;
     protected $debug;