.env

@@ -28,12 +28,14 @@ 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
-# Configure your db driver and server_version in config/packages/doctrine.yaml
-DATABASE_URL=mysql://root:@127.0.0.1:3306/su_workshop
+# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# For a PostgreSQL database, use: "postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11&charset=utf8"
+# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
+DATABASE_URL=mysql://root:@127.0.0.1:3306/su_workshop?serverVersion=5.7
 ###< doctrine/doctrine-bundle ###
 
 ###> sulu/sulu ###
+# Email address that will receive system notifications and might be used as universal fallback value by bundles
 SULU_ADMIN_EMAIL=
 ###< sulu/sulu ###
 

.gitignore

@@ -1,4 +1,3 @@
-
 ###> symfony/framework-bundle ###
 /.env.local
 /.env.local.php
@@ -12,11 +11,6 @@
 .phpunit
 /phpunit.xml
 ###< symfony/phpunit-bridge ###
-
-###> symfony/web-server-bundle ###
-/.web-server-pid
-###< symfony/web-server-bundle ###
-
 ###> friendsofphp/php-cs-fixer ###
 /.php_cs
 /.php_cs.cache
@@ -30,6 +24,7 @@ yarn-error.log
 
 # var
 /var/*
+!/var/.gitignore
 !/var/.gitkeep
 
 # web

.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 language: php
 
 services:
-  - mysql
+    - mysql
 
 cache:
   directories:
@@ -36,11 +36,12 @@ matrix:
         - COMPOSER_FLAGS="--no-interaction"
 
     # Without ENVIRONMENT variables
-    - php: 7.3
+    - php: 7.4
       install:
-        - composer create-project sulu/sulu-minimal ../test-create-project-dir --repository="{\"type\":\"path\",\"url\":\"./\"}" --stability=dev -n
+        - composer create-project sulu/skeleton ../test-create-project-dir --repository="{\"type\":\"path\",\"url\":\"./\"}" --stability=dev -n
         - cd ../test-create-project-dir
-        - echo 'DATABASE_URL=mysql://root:@127.0.0.1:3306/sulu_test' >> .env.local
+        - echo 'DATABASE_URL=mysql://root:@127.0.0.1:3306/sulu' >> .env.local
+        - echo 'DATABASE_URL=mysql://root:@127.0.0.1:3306/sulu_test' >> .env.test.local
       env:
         - NPM_BUILD=true
         - COMPOSER_VALIDATE_FLAGS="--strict --no-check-publish"
@@ -59,13 +60,26 @@ script:
   # Test Build
   - bin/adminconsole sulu:build dev --no-interaction
   # Test container build in different environments
+  - bin/adminconsole cache:clear --env dev
+  - bin/websiteconsole cache:clear --env dev
+  - bin/adminconsole cache:clear --env test
+  - bin/websiteconsole cache:clear --env test
   - bin/adminconsole cache:clear --env stage
   - bin/websiteconsole cache:clear --env stage
   - bin/adminconsole cache:clear --env prod
   - bin/websiteconsole cache:clear --env prod
+  # Test container lint in different environments
+  - bin/adminconsole lint:container --env dev
+  - bin/websiteconsole lint:container --env dev
+  - bin/adminconsole lint:container --env test
+  - bin/websiteconsole lint:container --env test
+  - bin/adminconsole lint:container --env stage
+  - bin/websiteconsole lint:container --env stage
+  - bin/adminconsole lint:container --env prod
+  - bin/websiteconsole lint:container --env prod
   # Lint
   - bin/adminconsole doctrine:ensure-production-settings --env prod
   - bin/adminconsole doctrine:schema:validate
-  - vendor/bin/simple-phpunit
+  - bin/phpunit
   - bin/adminconsole lint:twig templates
   - bin/adminconsole lint:yaml config

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Sulu GmbH
+Copyright (c) 2020 Sulu GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,9 +1,15 @@
 # Symfony Live Berlin 2019 Workshop
 
-This repository contains the project structure for the Sulu workshop at the Symfony Live Berlin 2019. The repository builds upon 
-the [sulu/skeleton](https://github.com/sulu/skeleton) repository and adds some project specific libraries such as Bootstrap or Symfony Encore.
+This repository contains the **project template**, **assignments** and **example solution code** for the Sulu workshop 
+at the Symfony Live Berlin 2019. The workshop consists of 12 assignments that guide you through creating a small 
+website that integrates two simple custom entities with using Sulu content management system. 
+The project builds upon the official [sulu/skeleton](https://github.com/sulu/skeleton) template and adds some project 
+specific libraries such as Bootstrap or Symfony Encore.
 
-The assignments of the workshop are located in the [assignments](/assignments) folder.
+The **assignments** of the workshop are located in the [assignments](/assignments) folder of the repository.
+The **example solution code** is available per assignment as separate [repository branch](https://github.com/sulu/sulu-workshop-symfony-live-berlin-2019/branches). 
+You can easily filter the changes for a single assignment by utilizing the 
+[compare feature of GitHub](https://github.com/sulu/sulu-workshop-symfony-live-berlin-2019/compare/assignment/08...assignment/09).
 
 ## Requirements
 
@@ -52,7 +58,7 @@ bin/console sulu:build dev --destroy
 You can startup the built-in PHP web-server with:
 
 ```bash
-bin/console server:run
+php -S localhost:8009 -t public config/router.php
 ```
 
 If you have the SYMFONY CLI Tools installed and want to increase your performace you can also use the following command to startup the SYMFONY webserver:

appveyor.yml

@@ -14,7 +14,7 @@ environment:
     DATABASE_COLLATE: utf8mb4_unicode_ci
     NODEJS_VERSION: "12"
     matrix:
-        - PHP_VERSION: 7.2.4
+        - PHP_VERSION: 7.2.5
 
 services:
     - mysql
@@ -23,20 +23,28 @@ hosts:
     localhost: 127.0.0.1
 
 init:
-    - SET PATH=C:\tools\php;%PATH%
+    - SET PATH=C:\tools\php;C:\tools\composer;%PATH%
 
 cache:
     - '%APPDATA%\Composer'
     - '%LOCALAPPDATA%\Composer'
     - C:\tools\php -> appveyor.yml
-    - C:\tools\composer.phar -> appveyor.yml
+    - C:\tools\composer\composer.phar -> appveyor.yml
 
 install:
     - ps: Set-Service wuauserv -StartupType Manual
     - ps: Install-Product node $env:NODEJS_VERSION
 
-    - IF NOT EXIST C:\tools\composer.phar (
-          cd C:\tools
+    - IF NOT EXIST C:\tools (
+          mkdir C:\tools
+      )
+
+    - IF NOT EXIST C:\tools\composer (
+          mkdir C:\tools\composer
+      )
+
+    - IF NOT EXIST C:\tools\composer\composer.phar (
+          cd C:\tools\composer
           && appveyor DownloadFile https://getcomposer.org/composer.phar
       )
 
@@ -60,12 +68,12 @@ install:
 
 before_test:
     - cd %APPVEYOR_BUILD_FOLDER%
-    - php -dmemory_limit=-1 C:\tools\composer.phar update --no-interaction --no-progress --prefer-dist --no-ansi
+    - php -dmemory_limit=-1 C:\tools\composer\composer.phar update --no-interaction --no-progress --prefer-dist --no-ansi
 
 test_script:
     - cd %APPVEYOR_BUILD_FOLDER%
     - php bin/adminconsole sulu:build dev --no-interaction
-    - php vendor/bin/simple-phpunit
+    - php bin/phpunit
     - php bin/adminconsole lint:twig templates
     - php bin/adminconsole lint:yaml config
     - cd assets/admin