Merge remote-tracking branch 'forkcms/master'

.github/workflows/run-tests.yml

@@ -13,7 +13,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [7.1, 7.2, 7.3, 7.4]
+                php: [7.4, 8.0]
                 testsuite: ["functional", "unit", "installer"]
         name: PHPUnit - ${{ matrix.testsuite }} (PHP ${{ matrix.php }})
         services:
@@ -100,7 +100,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.1
+                  php-version: 7.4
                   extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, bcmath, intl, gd, exif, iconv, imagick
                   coverage: none
 
@@ -134,7 +134,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.1
+                  php-version: 7.4
                   extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, bcmath, intl, gd, exif, iconv, imagick
                   coverage: none
 
@@ -173,7 +173,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.1
+                  php-version: 7.4
                   extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, bcmath, intl, gd, exif, iconv, imagick
                   coverage: none
 

.scrutinizer.yml

@@ -3,7 +3,7 @@ build:
         analysis:
             environment:
                 php:
-                    version: 7.1
+                    version: 7.4
             cache:
                 disabled: false
                 directories:

CHANGELOG.md

@@ -1,3 +1,26 @@
+5.12.0  (2023-07-31)
+------------------
+
+Fixed:
+* Core: Fix redirecting in parseWidget [#3513](https://github.com/forkcms/forkcms/pull/3513)
+* Core: Make privacy consent dialog scrollable on mobile [#3507](https://github.com/forkcms/forkcms/pull/3507)
+* Core: Make the old session clean-up method timezone aware [#3511](https://github.com/forkcms/forkcms/pull/3511)
+* Core: Move the apple touch icon to the theme [#3512](https://github.com/forkcms/forkcms/pull/3512)
+* Pages: Allow the use of install in a page title [#3533](https://github.com/forkcms/forkcms/pull/3533)
+* Pages: Skip empty images while copying a page [#3545](https://github.com/forkcms/forkcms/pull/3545)
+
+Security:
+* Core: Fix Open Redirect issue [#3547](https://github.com/forkcms/forkcms/pull/3547)
+
+Added:
+* CLI: Reset password CLI command [#3491](https://github.com/forkcms/forkcms/pull/3491)
+* Profiles: Autocomplete attributes [#3508](https://github.com/forkcms/forkcms/pull/3508)[#3548](https://github.com/forkcms/forkcms/pull/3548)
+
+Changed:
+* Core: Added PHP8 support and bumped minimum to 7.4 [#3538](https://github.com/forkcms/forkcms/pull/3538)
+* Core: Switched to symfony 4.4 [#3538](https://github.com/forkcms/forkcms/pull/3538)
+
+
 5.11.1  (2022-03-24)
 ------------------
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1-apache
+FROM php:7.4-apache
 LABEL maintainer="Fork CMS <[email protected]>"
 
 # Enable Apache mod_rewrite
@@ -8,10 +8,11 @@ RUN a2enmod rewrite
 RUN apt-get update && apt-get install -y --no-install-recommends --allow-downgrades \
     libfreetype6-dev \
     libjpeg62-turbo-dev \
+    libonig-dev \
     libz-dev \
     zlib1g-dev \
     libpng-dev && \
-    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
+    docker-php-ext-configure gd --with-freetype --with-jpeg && \
     docker-php-ext-install -j$(nproc) gd && \
     rm -rf /var/lib/apt/lists/*
 
@@ -22,7 +23,9 @@ RUN docker-php-ext-install pdo_mysql
 RUN docker-php-ext-install mbstring
 
 # Install zip & unzip
-RUN apt-get update && apt-get install -y unzip && \
+RUN apt-get update && apt-get install -y \
+    libzip-dev \
+    unzip && \
     docker-php-ext-install zip && \
     rm -rf /var/lib/apt/lists/*
 

README.md

@@ -4,7 +4,6 @@
 [![Latest Stable Version](https://poser.pugx.org/forkcms/forkcms/v/stable)](https://packagist.org/packages/forkcms/forkcms)
 [![License](https://poser.pugx.org/forkcms/forkcms/license)](https://packagist.org/packages/forkcms/forkcms)
 [![Code Coverage](https://codecov.io/gh/forkcms/forkcms/branch/master/graph/badge.svg?token=ahj70hVO29)](http://codecov.io/github/forkcms/forkcms?branch=master)
-[![Slack Status](https://fork-cms.herokuapp.com/badge.svg)](https://fork-cms.herokuapp.com/)
 [![Documentation Status](https://img.shields.io/badge/docs-latest-brightgreen.svg)](http://docs.fork-cms.com/)
 [![huntr.dev | the place to protect open source](https://cdn.huntr.dev/huntr_security_badge.svg)](https://huntr.dev)
 

VERSION.md

@@ -1 +1 @@
-5.11.1
+5.12.0

app/AppKernel.php

@@ -20,7 +20,6 @@ public function registerBundles(): array
             new \Symfony\Bundle\TwigBundle\TwigBundle(),
             new \Symfony\Bundle\MonologBundle\MonologBundle(),
             new \Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
-            new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new \ForkCMS\Bundle\InstallerBundle\ForkCMSInstallerBundle(),
             new \ForkCMS\Bundle\CoreBundle\ForkCMSCoreBundle(),
             new \Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),

app/ForkController.php

@@ -6,17 +6,17 @@
 use Backend\Core\Engine\Backend;
 use Frontend\Core\Engine\Ajax as FrontendAjax;
 use Frontend\Core\Engine\Frontend;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Backend\Init as BackendInit;
 use Frontend\Init as FrontendInit;
 use Common\Exception\RedirectException;
 use Symfony\Component\HttpFoundation\Response;
-use Twig_Error;
+use Twig\Error\Error;
 
 /**
  * Application routing
  */
-class ForkController extends Controller
+class ForkController extends AbstractController
 {
     const DEFAULT_APPLICATION = 'Frontend';
 
@@ -106,7 +106,7 @@ protected function handleApplication(ApplicationInterface $application): Respons
             return $application->display();
         } catch (RedirectException $ex) {
             return $ex->getResponse();
-        } catch (Twig_Error $twigError) {
+        } catch (Error $twigError) {
             if ($twigError->getPrevious() instanceof RedirectException) {
                 return $twigError->getPrevious()->getResponse();
             }

app/config/config.yml

@@ -30,12 +30,12 @@ framework:
                 default_lifetime: 3600
 
 # Assetic Configuration
-assetic:
-    debug:          "%kernel.debug%"
-    use_controller: false
-    bundles:        [ 'ForkCMSInstallerBundle' ]
-    filters:
-        cssrewrite: ~
+#assetic:
+#    debug:          "%kernel.debug%"
+#    use_controller: false
+#    bundles:        [ 'ForkCMSInstallerBundle' ]
+#    filters:
+#        cssrewrite: ~
 
 twig:
     debug:            "%kernel.debug%"
@@ -77,8 +77,6 @@ liip_imagine:
                 locator: filesystem_insecure
     cache: default
     data_loader: default
-    controller:
-        filter_action:  ForkCMS\ImagineController:filterAction
 
     # your filter sets are defined here
     filter_sets:
@@ -222,6 +220,10 @@ services:
         tags:
             - { name: kernel.event_listener, event: kernel.response, method: onKernelResponse }
 
+    ForkCMS\Imagine\Service\FilterService:
+        alias: 'liip_imagine.service.filter'
+        public: true
+
     ForkCMS\Utility\Geolocation:
         public: true
         arguments:
@@ -274,7 +276,3 @@ services:
         arguments:
             - "@fork.settings"
             - "@fork.cookie"
-
-    ForkCMS\ImagineController:
-        public: true
-        autowire: true

app/config/config_install.yml

@@ -26,12 +26,12 @@ framework:
                 default_lifetime: 3600
 
 # Assetic Configuration
-assetic:
-    debug: "%kernel.debug%"
-    use_controller: false
-    bundles: [ 'ForkCMSInstallerBundle' ]
-    filters:
-        cssrewrite: ~
+#assetic:
+#    debug: "%kernel.debug%"
+#    use_controller: false
+#    bundles: [ 'ForkCMSInstallerBundle' ]
+#    filters:
+#        cssrewrite: ~
 
 monolog:
     handlers:

app/config/doctrine.yml

@@ -24,6 +24,7 @@ doctrine:
             datetime: Common\Doctrine\Type\UTCDateTimeType
             datetimetz: Common\Doctrine\Type\UTCDateTimeType
             time: Common\Doctrine\Type\UTCTimeType
+            uuid: Ramsey\Uuid\Doctrine\UuidType
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"

app/config/parameters.yml.dist

@@ -10,7 +10,7 @@ parameters:
 
     fork.debug_email:       <debug-email>
     fork.debug_message:     'Internal error.'
-    fork.version:           '5.11.1'
+    fork.version:           '5.12.0'
 
     session.cookie_secure:  false
     site.protocol:          <site-protocol>

app/config/parameters.yml.test

@@ -10,7 +10,7 @@ parameters:
 
     fork.debug_email:       ''
     fork.debug_message:     'Internal error.'
-    fork.version:           '5.11.1'
+    fork.version:           '5.12.0'
 
     session.cookie_secure:  false
     site.protocol:          http

app/config/parameters_install.yml

@@ -10,7 +10,7 @@ parameters:
 
     fork.debug_email:       [email protected]
     fork.debug_message:     'Internal error.'
-    fork.version:           '5.11.1'
+    fork.version:           '5.12.0'
 
     session.cookie_secure:  false
     site.protocol:          <site-protocol>

app/config/routing.yml

@@ -1,7 +1,7 @@
 # Add your custom routes for Symfony bundles above this line
 
 _liip_imagine:
-    resource: "@LiipImagineBundle/Resources/config/routing.xml"
+    resource: "@LiipImagineBundle/Resources/config/routing.yaml"
 backend:
     path: /private/{_locale}/{module}/{action}
     defaults:

autoload.php

@@ -2,12 +2,10 @@
 
 // @TODO rename this file to bootstrap.php to better reflect its function
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Symfony\Component\Dotenv\Dotenv;
 
 // use vendor generated autoloader
 $loader = require __DIR__ . '/vendor/autoload.php';
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
 
 // Spoon is not autoloaded via Composer but uses its own old skool autoloader
 set_include_path(__DIR__ . '/vendor/spoon/library' . PATH_SEPARATOR . get_include_path());

composer.json

@@ -10,53 +10,53 @@
         "blog",
         "php"
     ],
-    "homepage": "http://www.fork-cms.com/",
+    "homepage": "https://www.fork-cms.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.1",
+        "php": "^7.4||^8.0",
         "ext-json": "*",
         "ext-zip": "*",
         "ext-gd": "*",
         "ext-intl": "*",
         "ext-simplexml": "*",
         "behat/transliterator": "~1.0",
-        "doctrine/doctrine-bundle": "^1.6",
-        "doctrine/orm": "^2.5",
+        "doctrine/doctrine-bundle": "^2.0",
+        "doctrine/orm": "^2.7",
         "google/apiclient": "~1.1.2",
-        "google/recaptcha": "~1.1",
+        "google/recaptcha": "^1.2",
         "jeroendesloovere/geolocation-php-api": "^2.1",
         "league/flysystem": "~1.0",
         "league/flysystem-aws-s3-v3": "^1.0.13",
         "league/flysystem-cached-adapter": "^1.0.6",
-        "liip/imagine-bundle": "^1.7",
-        "mailmotor/campaignmonitor-bundle": "^2.0",
-        "mailmotor/mailchimp-bundle": "^3.0",
-        "mailmotor/mailmotor-bundle": "^3.0",
+        "liip/imagine-bundle": "*",
+        "mailmotor/campaignmonitor-bundle": "^3.0",
+        "mailmotor/mailchimp-bundle": "^4.0",
+        "mailmotor/mailmotor-bundle": "^4.0",
         "matthiasmullie/minify": "~1.3",
         "matthiasmullie/scrapbook": "^1.3",
         "pimple/pimple": "^3.2",
-        "ramsey/uuid": "^3.5",
-        "ramsey/uuid-doctrine": "^1.2",
-        "simple-bus/doctrine-orm-bridge": "^4.0",
-        "simple-bus/symfony-bridge": "^4.1",
+        "ramsey/uuid": "^4.0",
+        "ramsey/uuid-doctrine": "^2.0",
+        "simple-bus/doctrine-orm-bridge": "6.2.*",
+        "simple-bus/symfony-bridge": "~6.2",
         "spoon/library": "^3.0",
         "swiftmailer/swiftmailer": "^6.0",
-        "symfony/assetic-bundle": "^2.8",
         "symfony/monolog-bundle": "^3.1",
         "symfony/swiftmailer-bundle": "^3.0",
-        "symfony/symfony": "^3.3",
-        "tijsverkoyen/akismet": "1.1.*",
-        "tijsverkoyen/css-to-inline-styles": "1.5.*",
+        "symfony/symfony": "^4.0",
+        "tijsverkoyen/css-to-inline-styles": "^2.0",
         "phpoffice/phpspreadsheet": "^1.12",
         "composer/package-versions-deprecated": "^1.11",
+        "guzzlehttp/guzzle": "^6.5",
+        "doctrine/annotations": "^1.14",
         "sentry/sentry-symfony": "^4.1",
         "tijsverkoyen/convert-to-junit-xml": "^1.9.0"
     },
     "require-dev": {
         "jdorn/sql-formatter": "1.2.17",
-        "symfony/var-dumper": "^3.3",
+        "symfony/var-dumper": "^4.0",
         "squizlabs/php_codesniffer": "^3.5",
-        "symfony/phpunit-bridge": "*",
+        "symfony/phpunit-bridge": "^4.3",
         "phpstan/phpstan": "^0.12.52",
         "phpstan/phpstan-symfony": "^0.12.7",
         "deployer/deployer": "^7.0@beta",
@@ -71,18 +71,19 @@
         "issues": "https://github.com/forkcms/forkcms/issues"
     },
     "scripts": {
-        "test": "./bin/simple-phpunit",
+        "test": [
+            "Composer\\Config::disableProcessTimeout",
+            "./bin/simple-phpunit"
+        ],
         "post-install-cmd": [
-            "@php bin/console assetic:dump .",
-            "@php bin/console forkcms:cache:clear",
-            "@php bin/console cache:clear --no-warmup",
-            "@php bin/console cache:warmup"
+            "php bin/console forkcms:cache:clear",
+            "php bin/console cache:clear --no-warmup",
+            "php bin/console cache:warmup"
         ],
         "post-update-cmd": [
-            "@php bin/console assetic:dump .",
-            "@php bin/console forkcms:cache:clear",
-            "@php bin/console cache:clear --no-warmup",
-            "@php bin/console cache:warmup"
+            "php bin/console forkcms:cache:clear",
+            "php bin/console cache:clear --no-warmup",
+            "php bin/console cache:warmup"
         ]
     },
     "autoload": {

docs/07. media library/03. integrating in your module.md

@@ -20,7 +20,7 @@ use Backend\Modules\MediaLibrary\Domain\MediaGroup\MediaGroup;
  *
  * @ORM\OneToOne(
  *      targetEntity="Backend\Modules\MediaLibrary\Domain\MediaGroup\MediaGroup",
- *      cascade="persist",
+ *      cascade={"persist"},
  *      orphanRemoval=true
  * )
  * @ORM\JoinColumn(

index.php

@@ -53,7 +53,7 @@
 }
 
 if ($debug) {
-    Debug::enable();
+    \Symfony\Component\ErrorHandler\Debug::enable();
 }
 
 $kernel = new AppKernel($env, $debug);

phpstan.neon

@@ -57,4 +57,4 @@ parameters:
     - '#Constant BACKEND_CACHE_PATH not found.#'
     - '#Constant SITE_DEFAULT_TITLE not found.#'
   symfony:
-    container_xml_path: var/cache/dev/appDevDebugProjectContainer.xml
+    container_xml_path: var/cache/dev/appForkCMS_App_AppKernelDevDebugContainer.xml