Update forked repository (#1)

* Fix concretecms#6649

* Call count() only if array in page_list block controller

* Fix concretecms#6647

* Add File\Importer::importUploadedFile

* Call count() only if array in page_list block controller

* update sample content copyright year

* Moving back to release candidate 4

* Fix concretecms#6606

* Fix concretecms#6543

* Fix concretecms#6518

* Starting on a fix for concretecms#6623

* Deleting cookie after logout

* Make System Email Addresses dashboard page labels more descriptive

* Added support for the "media" attribute for CSS resources

* Trying to fix tests

* Rename $media variable in $assetMedia

* Remove unused recordView method

* Remove unused getTotalPageViews method

* Remove unused getPageStatistics method

* Remove unused getTotalPageViews method

* Remove unused Statistics page

* Remove unused getTotalPageViewsForOthers method

* Remove unused getPreviousSessionPageViews method

* Fix concretecms#6659

* Avoid accessing undefined $attributePermission in EditUserPropertiesUserAccess::getAccessListItems

* Redirect to current page instead of previous frontend page when saving draft on composer

* Add missing configuration keus to site config

* php-cs-fixer

* Use modern code in favicons controller/view dashboard page

* Add support for theme-color meta tag

* Add support to filter-by-extension filter to FileFolderManager, let filterByExtension accept multiple extensions

* php-cs-fixer

* Improve PHP doc and simplify code of FileManager service

* php-cs-fixer

* Consider the case when $tracker property is not set

* Fix concretecms#6674

* Add a migration to refresh the image block type

* Simplify add/edit form of ExternalForm block type

* Don't disclose absolute path in add/edit form of ExternalForm block type

* Fixing error when removing cookie by hand

* Rework the add content panel lock/pinned functionality

+ Close the panel when clicking again on the add-content button instead of locking the panel
+ Lock the panel when double clicking the add-content button

* Fix tests

* Fixing reinstallation issue in some cases

* Fix concretecms#6665

* Use altKey to pine the add-content panel instead of double click

* Rename theme_color to browser_toolbar_color configuration key

* Choose exact file type & extension in icons dashboard page

* Fix bug in FileManager::file

* first pass on privacy data notice

* finishing up

* Removes the previous save-search-preset dialog on click on advanced search button

* Fix concretecms#6694

* Fix concretecms#6694

* Add "upscalingEnabled" field to thumbnail types

* making exporting of express csv a little more bulletproof

* making exporting of express csv a little more bulletproof

* Avoid accessing undefined var in page_types/form/base

* Avoid accessing undefined vars in page_types/target_types/all

* Avoid accessing undefined vars in page_types/target_types/page_type

* Avoid accessing undefined var in page_types/target_types/parent_page

* php-cs-fixer

* Fix setTrustedProxies for Symfony 3.3.0+

* Safer setting of setTrustedProxies

* Remove useless "use" statement

* Avoid accessing an undefined var in Job::executeJob

* Fix concretecms#6710

* Patch the superglobals in the runtime stack

* Rename ..._as_ajax to ..._as_xhr

* Add on_thumbnail_delete event

* Add on_thumbnail_generate event

* Fix docblocks; the path is relative, not absolute

* Avoid deprecated methods and add doc to system/basics/editor dashboard page

* Add PHPDoc to Editor\Plugin

* Add PHPDoc to Editor\PluginManager, make select/deselect symmetric, deprecate selectMultiple

* php-cs-fixer, simplify registerCkeditorPlugins, allow using EditorInterface in DI

* Simplify CkeditorEditor::saveOptionsForm

* Add PHPDoc to EditorInterface

* CKEditor: php-cs-fixer, add phpdoc

* Fix concretecms#4801

* Sort the Editor plugins alphabetically.

* Fix loading default plugins

* Avoid accessing an undefined var in user_interface/page backend controller

* Fix migration of address attribute type settings

* Fix migration of address attribute type settings

* Allow upscaling of file_manager_listing thumbnail type

* Add editor plugin descriptions and configuration preview

* Make editor preview sticky

* Keep the previously content of the preview editor

* Simplify the description of the CKEditor plugins

* Throw a UserMessageException in UserInterface backend controller on access denied.

* Mark static Pile methods as static

* Fix typo in editor plugin description

* Make page state that it implements the attribute object interface for csv export purposes

* Make page state that it implements the attribute object interface for csv export purposes

* adding object interface to event version occurrence class

* Avoid using superglobals in Form service

* Fix Form tests

* Remove typo in PostLoginLocation PHPDoc

* Fixing problem with date/time attribute where attributes set to only show a date would also show a time in plain text, including in express email notifications

* Adding the ability to unapprove an approved version

* Adding the ability to unapprove an approved version

* fixing workflow description on unapproval

* updating version

* updating changelog

* updating version number

* Avoid accessing undefined array index in desktop_featured_addon controller

* Avoid accessing undefined var in desktop_featured_addon view

* Avoid accessing undefined array index in desktop_featured_theme controller

* Avoid accessing undefined var in desktop_featured_theme view

* Avoid accessing undefined array index in permission/detail element

* Avoid accessing undefined array indexes in permissions/access_entity tool

* Avoid accessing undefined var in Block/Menu constructor

* concretecms#6724

PageList start/end times

* Add the page selector attribute to the core

* php-cs-fixer

* Add the newly created node to the loaded child node list

* Fix bug in Node::getAllChildNodeIDs

* php-cs-fixer

* Use 1 less query in FileManager::get()

* php-cs-fixer

* Add PHPDoc to Filesystem

* Let Node::getHierarchicalNodesOfType and Node::populateRecursiveNodes accept a maxDepth parameter

* Add the page selector attribute on install

* php-cs-fixer

* Remove unneeded function call

* Added a migration to install the page selector attribute or to unlink it from any package and keep its name consistent

* Fix $app in migration

* Add FileFolder::getChildFolderByName and FileFolder::getChildFolderByPath

* Add PHPDoc to FilesystemTest

* Fix query that calculates the number of child nodes

* Avoid accessing undefined var in FileFolder::getChildFolderByName

* Fix testGetFolderByName test

* php-cs-fixer

* Backport doctrine/dbal#3128

* Added the setNameSpace() method to modify pagination parameters

* Use the setNameSpace() method in the page list block to allow multiple paginations on the same page

* 6755: next_previous block skips pages

Equivalent date page get skipped as well as pages before/after an  inaccessible page.

* Fix resetting concrete5 with MySQL8

* Avoid accessing undefined array index if page_list block controller

* Avoid accessing undefined array index in multilingual/copy dashboard page controller

* Avoid accessing undefined values in ReplaceBlockPageRelationsTask::execute

* Avoid accessing undefined var in page/design dialog controller

* Add PHPDoc to switch_language view

* Fix concretecms#6737

* Fix determination of URL and contents of JavascriptLocalizedAsset

* Fix CKEditor configuration preview

* Use correct locale ID in Multilingual/Service/Detector::getPreferredSection

* Use UI localization context in concrete5 toolbar/account menu

* Avoid accessing undefined array indexes in Validation form service

* Fix setting the "required" attribute of the privacy agreement on install page

* Mark TaskPermission::getByHandle static

* Simplify code and check valid pages

* php-cs-fixer

* Add PHPDoc to Site entity

* Use the ::class syntax for class names

* Avoid using \Core facade

* Add PHPDoc to Site entity

* Let Site::getSiteTreeObject return NULL if no locale is defined

* Use Category::getAttributeKeyByHandle instead of deprecated Category::getByHandle

* Avoid unnecessary function calls

* Don't create an attribute value it its key is not valid

* Force boolean values in Site::setIsDefault

* Pass user to finishAuthentication in AuthenticationTypeController completeAuthentication

Ref concretecms#6673

* php-cs-fixer

* Fix concretecms#5440

* Fix concretecms#6778

* Fix nasty bug introduced in concretecms#6773

.appveyor.yml

@@ -0,0 +1,124 @@
+environment:
+  matrix:
+    - PLATFORM: x86
+      PHP_VERSION: '7.1.15'
+      VC_VERSION: '14'
+      PREFER_LOWEST: 
+
+matrix:
+  fast_finish: true
+
+init:
+  - set PATH=C:\tools;C:\tools\php-%PHP_VERSION%;C:\Program Files\MySQL\MySQL Server 5.7\bin;C:\tools\gettext\bin;%PATH%
+  - set MYSQL_PWD=Password12!
+
+clone_depth: 50
+
+cache:
+  - C:\tools\downloads -> .appveyor.yml
+  - '%LOCALAPPDATA%\Composer\files'
+
+services:
+  - mysql
+
+install:
+  - ps: |
+      $ProgressPreference = "SilentlyContinue"
+      $ErrorActionPreference = "Stop"
+      [Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls"
+      If(-Not(Test-Path -Path "C:\tools")) {
+          Write-Host "Creating tools directory"
+          New-Item -ItemType Directory -Path "C:\tools" | Out-Null
+      }
+      If(-Not(Test-Path -Path "C:\tools\downloads")) {
+          Write-Host "Creating download directory"
+          New-Item -ItemType Directory -Path "C:\tools\downloads" | Out-Null
+      }
+      Set-Location -Path C:\tools\downloads
+      $PHP_ZIP = "php-" + $env:PHP_VERSION + "-Win32-VC" + $env:VC_VERSION + "-" + $env:PLATFORM + ".zip"
+      If(-Not(Test-Path $PHP_ZIP)) {
+          Try {
+              Write-Host "Downloading PHP (release)"
+              Invoke-WebRequest $("http://windows.php.net/downloads/releases/" + $PHP_ZIP) -OutFile $PHP_ZIP
+          } Catch {
+              Try {
+                  Write-Host "Downloading PHP (archived)"
+                  Invoke-WebRequest $("http://windows.php.net/downloads/releases/archives/" + $PHP_ZIP) -OutFile $PHP_ZIP
+              } Catch {
+                  Write-Host "Downloading PHP (QA)"
+                  Invoke-WebRequest $("http://windows.php.net/downloads/releases/qa/" + $PHP_ZIP) -OutFile $PHP_ZIP
+              }
+          }
+      }
+      $GETTEXT_ZIP = "gettext0.19.8.1-iconv1.15-shared-32.zip"
+      If(-Not(Test-Path $GETTEXT_ZIP)) {
+          Write-Host "Downloading gettext"
+          Invoke-WebRequest $("https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.19.8.1-v1.15/" + $GETTEXT_ZIP) -OutFile $GETTEXT_ZIP
+      }
+      If(-Not(Test-Path "composer.phar")) {
+          Write-Host "Downloading composer"
+          Invoke-WebRequest "https://getcomposer.org/download/1.6.3/composer.phar" -OutFile "composer.phar"
+      }
+      Set-Location -Path "C:\tools"
+      If(-Not(Test-Path -Path $("php-" + $env:PHP_VERSION))) {
+          Write-Host "Creating PHP directory"
+          New-Item -ItemType Directory -Path $("php-" + $env:PHP_VERSION) | Out-Null
+      }
+      Set-Location -Path $("php-" + $env:PHP_VERSION)
+      If(-Not(Test-Path -Path "php.exe")) {
+          Write-Host "Extracting PHP"
+          (7z.exe x -bd -y -- $("..\downloads\" + $PHP_ZIP)) | Out-Null
+          If(-Not($?)) {
+              throw "7z failed!"
+          }
+      }
+      If(-Not(Test-Path -Path "php-installed.txt")) {
+          Write-Host "Creating php.ini"
+          Copy-Item -Path "php.ini-development" -Destination "php.ini"
+          Add-Content -Path "php.ini" -Value "date.timezone=""UTC"""
+          Add-Content -Path "php.ini" -Value "extension_dir=ext"
+          Add-Content -Path "php.ini" -Value "extension=php_mbstring.dll"
+          Add-Content -Path "php.ini" -Value "extension=php_bz2.dll"
+          Add-Content -Path "php.ini" -Value "extension=php_mysqli.dll"
+          Add-Content -Path "php.ini" -Value "extension=php_curl.dll"
+          Add-Content -Path "php.ini" -Value "extension=php_gd2.dll"
+          Add-Content -Path "php.ini" -Value "extension=php_intl.dll"
+          Add-Content -Path "php.ini" -Value "extension=php_pdo_mysql.dll"
+          Add-Content -Path "php.ini" -Value "extension=php_xsl.dll"
+          Add-Content -Path "php.ini" -Value "extension=php_fileinfo.dll"
+          Add-Content -Path "php.ini" -Value "extension=php_openssl"
+          Add-Content -Path "php.ini" -Value "zend.assertions=1"
+          Add-Content -Path "php.ini" -Value "assert.exception=On"
+          New-Item -ItemType File "php-installed.txt" | Out-Null
+      }
+      Set-Location -Path "C:\tools"
+      If(-Not(Test-Path -Path "composer.bat")) {
+          Write-Host "Creating composer.bat"
+          Add-Content -Path "composer.bat" -Value "@php C:\tools\downloads\composer.phar %*"
+      }
+      If(-Not(Test-Path -Path "gettext")) {
+          Write-Host "Creating gettext directory"
+          New-Item -ItemType Directory -Path "gettext" | Out-Null
+      }
+      Set-Location -Path "C:\tools\gettext"
+      If(-Not(Test-Path -Path "bin\msgen.exe ")) {
+          Write-Host "Extracting gettext"
+          (7z.exe x -bd -y -- $("..\downloads\" + $GETTEXT_ZIP)) | Out-Null
+          If(-Not($?)) {
+              throw "7z failed!"
+          }
+      }
+      Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
+  - cd /D "%APPVEYOR_BUILD_FOLDER%"
+  - composer install --no-progress --no-suggest --optimize-autoloader --no-ansi --no-interaction %PREFER_LOWEST%
+
+build: off
+
+test_script:
+  - mysql --user=root -e "CREATE USER 'travis'@'localhost' IDENTIFIED BY '';" || exit 0
+  - mysql --user=root -e "GRANT ALL PRIVILEGES ON *.* TO 'travis'@'localhost' WITH GRANT OPTION; FLUSH PRIVILEGES;"
+  - cd /d "%APPVEYOR_BUILD_FOLDER%"
+  - set APPVEYOR_SAVE_CACHE_ON_ERROR=true
+  - composer test
+
+deploy: off

.travis.yml

@@ -6,6 +6,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - nightly
 env:
   global:
@@ -16,28 +17,55 @@ matrix:
   fast_finish: true
   include:
     - php: 7.1
-      env: CODESTYLE="yes"
+      env: ACTION="php_codestyle"
     - php: 7.1
       env: PREFER_LOWEST="--prefer-lowest"
-    - php: 5.5
-      env: PREFER_LOWEST="--prefer-lowest"
+    - language: node_js
+      dist: trusty
+      env: ACTION="js_check"
   allow_failures:
     - php: nightly
 
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION = hhvm ]]; then cat tests/travis.hhvm.ini >> /etc/hhvm/php.ini; else phpenv config-add tests/travis.php.ini; fi
-  - travis_retry composer update --prefer-source $PREFER_LOWEST # Run once to install magento's composer merger
-  - travis_retry composer update --prefer-source $PREFER_LOWEST # Run twice to install merged dependencies
-  - mysql -e "SET GLOBAL sql_mode = 'STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY'"
-  - phpunit --version
+  - |
+    set -o errexit
+    case $ACTION in
+      js_check)
+        travis_retry npm install grunt-cli -g
+        cd build
+        travis_retry npm install
+        ;;
+      *)
+        if [[ $TRAVIS_PHP_VERSION = hhvm ]]; then
+          cat tests/travis.hhvm.ini >> /etc/hhvm/php.ini
+        else
+          phpenv config-add tests/travis.php.ini
+          phpenv config-rm xdebug.ini || true
+        fi
+        travis_retry composer update --no-suggest --no-interaction $PREFER_LOWEST # Run once to install magento's composer merger
+        travis_retry composer update --no-suggest --no-interaction $PREFER_LOWEST # Run twice to install merged dependencies
+        ;;
+    esac
 
 script:
-  # Run PHPUnit if we're not checking code style, otherwise run phpcs
-  - if [[ $CODESTYLE != "yes" ]]; then composer test; else composer phpcs; fi
+  - |
+    set -o errexit
+    case $ACTION in
+      php_codestyle)
+        composer phpcs
+        ;;
+      js_check)
+        grunt js:check
+        ;;
+      *)
+        composer test
+        ;;
+    esac
+
 cache:
   directories:
-    - vendor
     - $HOME/.composer/cache
+    - build/node_modules
 
 notifications:
   email: false