[WIP] Go into SF 4

.env

@@ -0,0 +1,24 @@
+# This file is a "template" of which env vars need to be defined for your application
+# Copy this file to .env file for development, create environment variables when deploying to production
+# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
+
+###> symfony/framework-bundle ###
+APP_ENV=dev
+APP_SECRET=9d27ae2fee5cdce7eb45d7aba490cfcb
+#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
+#TRUSTED_HOSTS=localhost,example.com
+###< symfony/framework-bundle ###
+
+###> symfony/swiftmailer-bundle ###
+# For Gmail as a transport, use: "gmail://username:password@localhost"
+# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode="
+# Delivery is disabled by default via "null://localhost"
+MAILER_URL=null://localhost
+###< symfony/swiftmailer-bundle ###
+
+###> doctrine/doctrine-bundle ###
+# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
+# Configure your db driver and server_version in config/packages/doctrine.yaml
+DATABASE_URL=mysql://db_user:[email protected]:3306/db_name
+###< doctrine/doctrine-bundle ###

.env.dist

@@ -0,0 +1,24 @@
+# This file is a "template" of which env vars need to be defined for your application
+# Copy this file to .env file for development, create environment variables when deploying to production
+# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
+
+###> symfony/framework-bundle ###
+APP_ENV=dev
+APP_SECRET=9d27ae2fee5cdce7eb45d7aba490cfcb
+#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
+#TRUSTED_HOSTS=localhost,example.com
+###< symfony/framework-bundle ###
+
+###> symfony/swiftmailer-bundle ###
+# For Gmail as a transport, use: "gmail://username:password@localhost"
+# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode="
+# Delivery is disabled by default via "null://localhost"
+MAILER_URL=null://localhost
+###< symfony/swiftmailer-bundle ###
+
+###> doctrine/doctrine-bundle ###
+# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
+# Configure your db driver and server_version in config/packages/doctrine.yaml
+DATABASE_URL=mysql://db_user:[email protected]:3306/db_name
+###< doctrine/doctrine-bundle ###

.gitignore

@@ -1,21 +1,18 @@
-/app/config/parameters.yml
-/build/
-/phpunit.xml
-/var/*
-!/var/cache
-/var/cache/*
-!var/cache/.gitkeep
-!/var/logs
-/var/logs/*
-!var/logs/.gitkeep
-!/var/sessions
-/var/sessions/*
-!var/sessions/.gitkeep
-!var/SymfonyRequirements.php
+
+###> symfony/framework-bundle ###
+.env
+/public/bundles/
+/var/
 /vendor/
-/web/bundles/
+###< symfony/framework-bundle ###
+
+###> symfony/phpunit-bridge ###
+.phpunit
+/phpunit.xml
+###< symfony/phpunit-bridge ###
+
+vagrant/.vagrant
+/config/phpcr.yaml
 
-/app/config/phpcr.yml
-/jackrabbit/
-/jackrabbit-standalone-*.jar
-/vagrant/.vagrant
+build/
+.php_cs.cache

.php_cs.dist

@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * DO NOT EDIT THIS FILE!
+ *
+ * It's auto-generated by sonata-project/dev-kit package.
+ */
+
+$header = <<<'HEADER'
+This file is part of the Symfony CMF package.
+
+(c) Symfony CMF
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+HEADER;
+
+$rules = [
+    '@Symfony' => true,
+    '@Symfony:risky' => true,
+    'array_syntax' => [
+        'syntax' => 'short',
+    ],
+    'combine_consecutive_issets' => true,
+    'combine_consecutive_unsets' => true,
+    'header_comment' => [
+        'header' => $header,
+    ],
+    'no_extra_blank_lines' => true,
+    'no_php4_constructor' => true,
+    'no_useless_else' => true,
+    'no_useless_return' => true,
+    'ordered_class_elements' => true,
+    'ordered_imports' => true,
+    'phpdoc_order' => true,
+    '@PHP56Migration' => true,
+    '@PHP56Migration:risky' => true,
+    '@PHPUnit57Migration:risky' => true,
+    '@PHP70Migration' => true,
+    '@PHP70Migration:risky' => true,
+    '@PHPUnit60Migration:risky' => true,
+    '@PHP71Migration' => true,
+    '@PHP71Migration:risky' => true,
+    'compact_nullable_typehint' => true,
+    'void_return' => null,
+    'strict_comparison' => true,
+    'strict_param' => true,
+];
+
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+    ->exclude('Tests/Fixtures')
+    ->exclude('tests/Fixtures')
+    ->exclude('Resources/skeleton')
+    ->exclude('Resources/public/vendor')
+;
+
+return PhpCsFixer\Config::create()
+    ->setFinder($finder)
+    ->setRiskyAllowed(true)
+    ->setRules($rules)
+    ->setUsingCache(true)
+;

.platform.app.yaml

@@ -19,9 +19,9 @@ build:
 # The configuration of app when it is exposed to the web.
 web:
     # The public directory of the app, relative to its root.
-    document_root: "/web"
+    document_root: "/public"
     # The front-controller script to send non-static requests to.
-    passthru: "/app.php"
+    passthru: "/index.php"
     whitelist:
       # slides
       - ^/slides/.*\.html$
@@ -58,9 +58,8 @@ mounts:
 # The hooks that will be performed when the package is deployed.
 hooks:
     build: |
-      rm web/app_dev.php
       # place sqlite file into /tmp so that we can write to it during deploy
-      sed -i 's@%kernel.root_dir%/../var/app.sqlite@/tmp/app.sqlite@' app/config/parameters.yml
+      sed -i 's@%kernel.project_dir%/var/app.sqlite@/tmp/app.sqlite@' app/config/parameters.yml
       bin/console --env=prod assets:install -n --no-debug
       bin/console --env=prod assetic:dump -n --no-debug
     deploy: ./bin/reloadFixtures.sh $PWD true

.sensiolabs.yml

@@ -5,21 +5,17 @@
 
 global_exclude_dirs:
     - vendor
-    - web
-    - app/tests
+    - public
+    - tests
     - vagrant
     - bin
 
 pre_composer_script: |
     #!/bin/bash
 
-    cp app/config/parameters.yml.dist app/config/parameters.yml
-    cp app/config/phpcr_doctrine_dbal.yml.dist app/config/phpcr.yml
+    cp config/fixtures/parameters.yml.dist config/packages/parameters.yml
+    cp config/fixtures/phpcr_doctrine_dbal.yml.dist config/packages/phpcr.yml
 
-exclude_patterns:
-    - app/autoload.php
-    - app/check.php
-    - app/SymfonyRequirements.php
 
 rules:
     symfony.web_config_should_not_be_present:

.travis.yml

@@ -16,11 +16,15 @@ matrix:
       env: TRANSPORT=jackrabbit COMPOSER_INSTALL=1
     - php: 7.1
       env: TRANSPORT=doctrine_dbal COMPOSER_INSTALL=1
+    - env: TARGET=lint
 
 env:
   global:
-    - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_VERSION=5.7
-    - SYMFONY_DEPRECATIONS_HELPER=weak
+    - SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"
+    - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
+    - TARGET=test
+    - SYMFONY_PHPUNIT_VERSION=5.7
+    - PHPUNIT_VERSION=5.7.26
   matrix:
     - TRANSPORT=jackrabbit
     - TRANSPORT=doctrine_dbal
@@ -32,19 +36,14 @@ before_install:
   - composer self-update
 
 install:
-  - phpenv config-add travis.php.ini
-  - php -ini | grep memory_limit
-  - if [ "$COMPOSER_INSTALL" != "1" ]; then composer update --no-scripts --prefer-dist; else composer install --no-scripts --prefer-dist; fi
+  - if [ -x .travis/install_${TARGET}.sh ]; then .travis/install_${TARGET}.sh; fi;
 
 before_script:
-  - cp app/config/phpcr_${TRANSPORT}.yml.dist app/config/phpcr.yml
-  - composer run-script post-update-cmd
-  - ./tests/travis_${TRANSPORT}.sh
-  - bin/console doctrine:phpcr:workspace:create sandbox_test -e=test
-  - bin/console doctrine:phpcr:repository:init -e=test
+  - if [ -x .travis/before_${TARGET}.sh ]; then .travis/before_${TARGET}.sh; fi;
 
-script: php vendor/bin/simple-phpunit --debug
+script: make $TARGET
 
+after_success:
+  - if [ -x .travis/after_${TARGET}.sh ]; then .travis/after_${TARGET}.sh; fi;
 notifications:
-  irc: "irc.freenode.org#symfony-cmf"
   email: "[email protected]"

.travis/after_success_test.sh

@@ -0,0 +1,5 @@
+
+#!/usr/bin/env sh
+set -ev
+
+coveralls -v

.travis/before_test.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+phpenv config-add travis.php.ini
+php -ini | grep memory_limit
+cp config/fixtures/phpcr_${TRANSPORT}.yaml.dist config/phpcr.yaml
+composer run-script post-update-cmd
+./tests/travis_${TRANSPORT}.sh
+bin/console doctrine:phpcr:workspace:create sandbox_test -e test
+bin/console doctrine:phpcr:repository:init -e test

.travis/install_lint.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+set -ev
+
+mkdir --parents "${HOME}/bin"
+
+wget "http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar" --output-document="${HOME}/bin/php-cs-fixer"
+chmod u+x "${HOME}/bin/php-cs-fixer"
+
+composer global require sllh/composer-lint:@stable --prefer-dist --no-interaction
+
+gem install yaml-lint

.travis/install_test.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+set -ev
+
+mkdir --parents "${HOME}/bin"
+
+wget "https://phar.phpunit.de/phpunit-${PHPUNIT_VERSION}.phar" --output-document="${HOME}/bin/phpunit"
+chmod u+x "${HOME}/bin/phpunit"
+
+# Coveralls client install
+wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
+chmod u+x "${HOME}/bin/coveralls"
+
+# To be removed when these issues are resolved:
+# https://github.com/composer/composer/issues/5355
+if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
+    composer update --prefer-dist --no-interaction --prefer-stable --quiet
+fi
+
+if [ "$COMPOSER_INSTALL" != "1" ]; then
+    composer update --no-scripts --prefer-dist;
+else
+    composer install --no-scripts --prefer-dist;
+fi
+

Makefile

@@ -0,0 +1,56 @@
+#######################################################
+# DO NOT EDIT THIS FILE!                              #
+#                                                     #
+# It's auto-generated by symfony-cmf/dev-kit package. #
+#######################################################
+
+############################################################################
+# This file is part of the Symfony CMF package.                            #
+#                                                                          #
+# (c) Symfony CMF                                                #
+#                                                                          #
+# For the full copyright and license information, please view the LICENSE  #
+# file that was distributed with this source code.                         #
+############################################################################
+
+TESTING_SCRIPTS_DIR=vendor/symfony-cmf/testing/bin
+CONSOLE=${TESTING_SCRIPTS_DIR}/console
+VERSION=dev-master
+ifdef BRANCH
+	VERSION=dev-${BRANCH}
+endif
+PACKAGE=symfony-cmf/seo-bundle
+HAS_XDEBUG=$(shell php --modules|grep --quiet xdebug;echo $$?)
+
+list:
+	@echo 'test:                    will run all tests'
+	@echo 'lint: 					will run linting for composer and php'
+
+.PHONY: test
+test: build/xdebug-filter.php$
+	@php vendor/bin/simple-phpunit --debug
+lint-php:
+	php-cs-fixer fix --ansi --verbose --diff --dry-run
+.PHONY: lint-php
+
+lint: lint-composer lint-php
+.PHONY: lint
+
+lint-composer:
+	composer validate
+.PHONY: lint-composer
+
+cs-fix: cs-fix-php
+.PHONY: cs-fix
+
+cs-fix-php:
+	php-cs-fixer fix --verbose
+.PHONY: cs-fix-php
+
+build:
+	mkdir $@
+
+build/xdebug-filter.php: phpunit.xml.dist build
+ifeq ($(HAS_XDEBUG), 0)
+	phpunit --dump-xdebug-filter $@
+endif

README.md

@@ -18,7 +18,7 @@ You can run the sandbox on your system, or in a virtualbox VM using Vagrant. For
 
 ### You will need:
 
-  * PHP 5.3.9+ (with intl extension)
+  * PHP 7.1+ (with intl extension)
   * PHPUnit 3.6+ (optional)
   * Composer
 
@@ -43,11 +43,11 @@ implementation.
 Once you have that, copy the default jackalope-jackrabbit configuration file,
 adjust it as needed and install the dependencies with composer:
 
-    cp app/config/phpcr_jackrabbit.yml.dist app/config/phpcr.yml
+    cp config/fixtures/phpcr_jackrabbit.yml.dist config/packages/phpcr.yml
 
 The last command will fetch the main project and all its dependencies (CMF
 Bundles, Symfony, Doctrine\PHPCR, Jackalope ... ). You might want to have a look
-at the ``app/config/parameters.yml`` and adjust as needed.
+at the ``config/packages/phpcr.yml`` and adjust as needed.
 
 ### Install the Doctrine DBAL provider (optional)
 
@@ -56,7 +56,7 @@ files and create the database accordingly. If you have the PHP sqlite extension
 available, this is the simplest to quickly try out the CMF. Copy the file
 and then install the dependencies:
 
-    cp app/config/phpcr_doctrine_dbal.yml.dist app/config/phpcr.yml
+    cp config/fixtures/phpcr_doctrine_dbal.yml.dist config/packages/phpcr.yml
 
 The Doctrine DBAL implementation is installed by default already along side the Jackrabbit implementation.
 
@@ -110,7 +110,7 @@ Create an apache virtual host entry along the lines of:
 
     <Virtualhost *:80>
         Servername cmf.lo
-        DocumentRoot /path/to/symfony-cmf/cmf-sandbox/web
+        DocumentRoot /path/to/symfony-cmf/cmf-sandbox/public
         <Directory /path/to/symfony-cmf/cmf-sandbox>
             AllowOverride All
         </Directory>