Merge branch '3.0'

* 3.0: (1479 commits)
  Update VERSION.txt
  Update AUTHORS.txt
  Fix target dir
  Remove redundant call
  Avoid null reference error
  We don't use custom-select class anymore
  Minor tweak on install layout
  Update compiled css
  bs4.beta4 wants node-sass
  Update readme and remove instruction to install via git
  Let parent class call _setupAclComponent() instead
  Fix: Do not load RowLevelAcl when no controller is found
  Sort role display
  Port rowacl checks and template
  Create root node for contents
  Sync content acos
  Prevent redundant flash
  Move action map defaults and remove unneeded method
  Reenable setupAclComponent()
  doc fix
  ...

.editorconfig

@@ -4,10 +4,24 @@
 root = true
 
 [*]
-indent_style = tab
+indent_style = space
+indent_size = 4
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.scss]
+indent_size = 2
+
+[*.css]
+indent_size = 2
+
+[*.js]
+indent_size = 2
+
 [*.bat]
 end_of_line = crlf
+
+[*.yml]
+indent_style = space
+indent_size = 2

.gitignore

@@ -4,6 +4,7 @@ Config/settings.json
 Vendor/Simpletest/
 View/Themed/
 webroot/uploads/
+*/config/Migrations/*.lock
 *.bak
 *.swp
 
@@ -18,3 +19,6 @@ tmp/
 !./Plugin/Example
 !./Plugin/Install
 !./Plugin/Translate
+Core/webroot/bootstrap/
+Core/webroot/fontAwesome/
+Core/.sass-cache/

.travis.yml

@@ -3,107 +3,79 @@ language: php
 sudo: false
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
-  - 7.1
+
+sudo: false
 
 env:
-  - DB=mysql
-  - DB=pgsql
+  matrix:
+    - DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'
+    - DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
+    - DB=sqlite db_dsn='sqlite:///:memory:'
+  global:
+    - DEFAULT=1
+
+services:
+  - memcached
+  - redis-server
 
 matrix:
+  fast_finish: true
+
   include:
-    - php: 7.1
-      env:
-        - DB=mysql PHPCOV=1
-
-before_install:
-  - git clone --depth 1 git://github.com/croogo/app -b 2.3 app
-  - mkdir -p app/Vendor/cakephp app/Vendor/croogo
-  - git clone --depth 1 git://github.com/cakephp/cakephp -b 2.9.2 app/Vendor/cakephp/cakephp
-  - ln -s `pwd` app/Vendor/croogo/croogo
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ] ; then git clone --depth 1 git://github.com/CakeDC/search -b master app/Plugin/Search ; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ] ; then git clone --depth 1 git://github.com/CakeDC/migrations -b master app/Plugin/Migrations ; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ] ; then git clone --depth 1 git://github.com/croogo/Ckeditor -b master app/Plugin/Ckeditor ; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then composer global require 'phpunit/phpunit=3.7.33'; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then ln -s ~/.composer/vendor/phpunit/phpunit/PHPUnit app/Vendor/PHPUnit; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ] ; then composer -n -vv install ; fi"
-  - for d in Plugin/* ; do if [ ! -f $app/$d ] ; then ln -s `pwd`/$d app/$d; fi ; done
+    - php: 7.0
+      env: PHPCS=1 DEFAULT=0
+
+    - php: hhvm
+      env: HHVM=1 DB=sqlite db_dsn='sqlite:///:memory:'
+
+    - php: hhvm
+      env: HHVM=1 DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'
+
+  allow_failures:
+    - env: COVERALLS=1 DEFAULT=0
+    - env: PHPCS=1 DEFAULT=0
+
+    - php: hhvm
 
 before_script:
-  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE croogo_test;'; fi"
-  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE croogo_test;' -U postgres; fi"
-  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE SCHEMA croogo_test;' -U postgres -d croogo_test; fi"
-  - cp app/Config/settings.json.install app/Config/settings.json
-  - cp app/Config/croogo.php.install app/Config/croogo.php
-  - sed -i "s/E_DEPRECATED,$/E_DEPRECATED \& ~E_USER_DEPRECATED,/" app/Config/croogo.php
+  - composer self-update
+  - composer install --prefer-dist --no-interaction
+
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test2;'; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test3;'; fi"
+
+  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE SCHEMA test2;' -U postgres -d cakephp_test; fi"
+  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE SCHEMA test3;' -U postgres -d cakephp_test; fi"
+
+  - sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
+  - sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"
+
+  - sh -c "if [ '$HHVM' != '1' ]; then echo 'extension = memcached.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
+  - sh -c "if [ '$HHVM' = '1' ]; then composer require lorenzo/multiple-iterator=~1.0; fi"
+
+  - phpenv rehash
   - set +H
-  - echo "<?php
-    class DATABASE_CONFIG {
-    private \$identities = array(
-      'mysql' => array(
-        'datasource' => 'Database/Mysql',
-        'host' => 'localhost',
-        'login' => 'travis',
-        'database' => 'croogo_test',
-      ),
-      'pgsql' => array(
-        'datasource' => 'Database/Postgres',
-        'host' => '127.0.0.1',
-        'login' => 'postgres',
-        'database' => 'croogo_test',
-        'schema' => array(
-          'default' => 'public',
-          'test' => 'croogo_test',
-        )
-      ),
-      'sqlite' => array(
-        'datasource' => 'Database/Sqlite',
-        'database' => array(
-          'default' => ':memory:',
-          'test' => ':memory:',
-        ),
-      )
-    );
-    public \$default = array(
-      'persistent' => false,
-      'host' => '',
-      'login' => '',
-      'password' => '',
-      'database' => 'croogo',
-      'prefix' => ''
-    );
-    public \$test = array(
-      'persistent' => false,
-      'host' => '',
-      'login' => '',
-      'password' => '',
-      'database' => 'croogo_test',
-      'prefix' => ''
-    );
-    public function __construct() {
-      \$db = 'mysql';
-      if (!empty(\$_SERVER['DB'])) {
-        \$db = \$_SERVER['DB'];
-      }
-      foreach (array('default', 'test') as \$source) {
-        \$config = array_merge(\$this->{\$source}, \$this->identities[\$db]);
-        if (is_array(\$config['database'])) {
-          \$config['database'] = \$config['database'][\$source];
-        }
-        if (!empty(\$config['schema']) && is_array(\$config['schema'])) {
-          \$config['schema'] = \$config['schema'][\$source];
-        }
-        \$this->{\$source} = \$config;
-      }
-    }
-    }" > app/Config/database.php
 
 script:
-  - sh -c "if [ '$PHPCOV' = '1' ]; then cd app && ./Console/cake test croogo CroogoTests --stderr --coverage-clover ../coverage.clover && cd .. && wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; else cd app && ./Console/cake test croogo CroogoTests --stderr ; fi"
+  - sh -c "if [ '$DEFAULT' = '1' ]; then phpunit; fi"
+
+  - sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./Core/src ./Core/tests; fi"
+
+  - sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --coverage-clover build/logs/clover.xml; fi"
+  - sh -c "if [ '$COVERALLS' = '1' ]; then vendor/bin/coveralls -c .coveralls.yml -v; fi"
 
 notifications:
-  email: false
+  email: false
+  irc:
+    channels:
+      - "chat.freenode.net#croogo"
+      - "chat.freenode.net#cvo-technologies"
+    on_success: change
+
+cache:
+  directories:
+  - Core/vendor

AUTHORS.txt

@@ -2,21 +2,23 @@ Authors ordered by contribution
 
 Rachman Chavik <rchavik@xintesa.com>
 Fahad Ibnay Heylaal <fahad19@gmail.com>
-Kyle Robinson Young <kyle@dontkry.com>
+Marlin Cremers <m.cremers@cvo-technologies.com>
+Walther Lalk <dakota@users.noreply.github.com>
+Wouter van Os <wouter@wouter0100.nl>
 Damien Biasotto <damien@occi-tech.com>
+Kyle Robinson Young <kyle@dontkry.com>
 Derbois Aymeric <aymeric@occi-tech.com>
 Pierre Martin <pierre@occi-tech.com>
 chadrien <chadrien@chadrien.fr>
-Paul Gardner <phpmagpie@webbedit.co.uk>
-Walther Lalk <dakota@users.noreply.github.com>
 mohammadsaleh <mohammadsaleh.sayari@hotmail.com>
-Marlin Cremers <m.cremers@cvo-technologies.com>
+Paul Gardner <phpmagpie@webbedit.co.uk>
+Christopher M. Depré <mail@chris-depre.de>
+Dimas Abdul Aziiz <dimas@xintesa.com>
+Jose Diaz-Gonzalez <josegonzalez@users.noreply.github.com>
 euromark <euromark@web.de>
 Eko Tristiyono <eko@xintesa.com>
 Yuan Chavik <yuan@xintesa.com>
 Appsbender <regz24@gmail.com>
-Damien Biasotto <damien@occitech.fr>
-Dimas Abdul Aziiz <dimas@xintesa.com>
 AD7six <andydawson76@gmail.com>
 Mike Tallroth <mike.tallroth@gmail.com>
 Elias Coronado <ecor.rck@hotmail.com>
@@ -26,6 +28,7 @@ SCV Geo <scv@scvgeo.com>
 Heiner Gassen <hg@dynweb.net>
 Paulino Calderon <paulino@calder0n.com>
 pinchsoftware <contact@pinchsoft.com>
+ADmad <ADmad@users.noreply.github.com>
 Ceeram <c33ram@gmail.com>
 Grégory Salvan <gregory@occi-tech.com>
 Hadrien Collongues <chadrien@chadrien.fr>
@@ -36,10 +39,11 @@ Lukas Strassel <lukasstrassel@googlemail.com>
 Vitor Pacheco <vitor-p.c@hotmail.com>
 elbakai <m.elbakai@gmail.com>
 primeminister <primeminister@mowd.nl>
-ADmad <admad.coder@gmail.com>
 James Sapara <james.sapara@gmail.com>
+Livia Scapin <livia.scapin@bluewin.ch>
 Matt Curry <matt@pseudocoder.com>
 Mischa ter Smitten <mischa@tersmitten.nl>
+Rakesh Tembhurne <rakesh@tembhurne.com>
 thoth <thomas.rader@tigerclawtech.com>
 Jeremy Harris <jeremy@someguyjeremy.com>
 Josué Silva Santos <josue.silva.santos@gmail.com>
@@ -48,6 +52,8 @@ cdbruin <casper@ectrader.nl>
 daniel <daniel@daniels-MacBook-Air.local>
 roland-w <roland-w@users.noreply.github.com>
 tmaiaroto <tom@shift8creative.com>
+yudapc <yudapc@gmail.com>
+Вадим <vadimushka.d@gmail.com>
 Adam Taylor <ataylor32@gmail.com>
 Adrien Louis-Rossignol <adrien.louis.r@gmail.com>
 Andrea de la Huerta <info@metamorfosys.de>
@@ -68,12 +74,12 @@ Marek Sebera <marek.sebera@gmail.com>
 Mike Pagé <mike@nedwave.com>
 Nicholas Craig <nick@threadgroup.com>
 Paulo Pinto <paulorpinto@gmail.com>
-Rakesh Tembhurne <rakesh@tembhurne.com>
 Robbert Noordzij <robbert@xseeding.nl>
 Sam Bernard <sam@sambernard.net>
 SplicePHP <admin@splicephp.com>
+The Gitter Badger <badger@gitter.im>
 Wiena Lorentz <lorentz@xintesa.com>
-Wouter van Os <wouter@wouter0100.nl>
+Zuhair AlSader <zuhair.alsadder@hotmail.com>
 alevilar <alevilar@gmail.com>
 avra911 <razvan@magnify.ro>
 damarev <damarev@gmail.com>