From 3a260f65c31594247adbce1049252f1117a1df8e Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 11:28:52 +0200
Subject: [PATCH 01/14] Update composer.json

Update composer.json adding symfony 4 support
---
 composer.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 09030404..d1c66197 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": "^5.6|^7.0",
-        "symfony/framework-bundle": "^2.7|^3.0",
+        "symfony/framework-bundle": "^2.7|^3.0|^4.0",
         "egeloen/google-map": "^2.0.2"
     },
     "require-dev": {
@@ -22,11 +22,11 @@
         "php-http/guzzle6-adapter": "^1.0",
         "phpunit/phpunit": "^5.4",
         "phpunit/phpunit-selenium": "dev-master",
-        "symfony/cache": "^3.2",
-        "symfony/form": "^2.7|^3.0",
-        "symfony/phpunit-bridge": "^2.7|^3.0",
-        "symfony/templating": "^2.7|^3.0",
-        "symfony/yaml": "^2.7|^3.0",
+        "symfony/cache": "^3.2|^4.0",
+        "symfony/form": "^2.7|^3.0|^4.0",
+        "symfony/phpunit-bridge": "^2.7|^3.0|^4.0",
+        "symfony/templating": "^2.7|^3.0"|^4.0,
+        "symfony/yaml": "^2.7|^3.0|^4.0",
         "twig/twig": "^1.18"
     },
     "autoload": {

From 277a9a9068018a03c49f1d18159b02359eb1fa09 Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 11:31:40 +0200
Subject: [PATCH 02/14] Update composer.json

Fixing a type for composer.json
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d1c66197..e6cab949 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         "symfony/cache": "^3.2|^4.0",
         "symfony/form": "^2.7|^3.0|^4.0",
         "symfony/phpunit-bridge": "^2.7|^3.0|^4.0",
-        "symfony/templating": "^2.7|^3.0"|^4.0,
+        "symfony/templating": "^2.7|^3.0|^4.0",
         "symfony/yaml": "^2.7|^3.0|^4.0",
         "twig/twig": "^1.18"
     },

From 975ba7b5927a1e8d0bde031e15a07b4b55c42dda Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 11:38:58 +0200
Subject: [PATCH 03/14] Update .travis.yml

Update travis to match symfony 4 version
---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a9a3392d..4689b804 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,8 +41,13 @@ matrix:
           env: SYMFONY_VERSION=3.2.*
         - php: 5.6
           env: SYMFONY_VERSION=3.3.*@dev
+        - php: 7.1
+          env: DEPENDENCIES=beta  
     allow_failures:
         - env: SYMFONY_VERSION=3.3.*@dev
 
+before_install:
+   - if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
+
 notifications:
     email: geloen.eric@gmail.com

From bbb1f3c1ec57ef822c4b8664a2955515247efd20 Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 11:57:40 +0200
Subject: [PATCH 04/14] Update composer.json

Updating composer.json to match dependencies for phpunit
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e6cab949..eb044b20 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "friendsofphp/php-cs-fixer": "^2.0",
         "php-http/cache-plugin": "^1.4",
         "php-http/guzzle6-adapter": "^1.0",
-        "phpunit/phpunit": "^5.4",
+        "phpunit/phpunit": "^6.0",
         "phpunit/phpunit-selenium": "dev-master",
         "symfony/cache": "^3.2|^4.0",
         "symfony/form": "^2.7|^3.0|^4.0",

From ee0a806865cff81316609a88c8dab0bc209953ac Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 12:15:19 +0200
Subject: [PATCH 05/14] Update .travis.yml

Update travis.yml and try to install mbstring required by phpUnit > 6.0
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4689b804..9611af41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,6 +46,8 @@ matrix:
     allow_failures:
         - env: SYMFONY_VERSION=3.3.*@dev
 
+before_script: sudo apt-get install php7.0-mbstring
+
 before_install:
    - if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
 

From 90c26fb839b84beeffefda71f1315dc8703d3567 Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 12:28:41 +0200
Subject: [PATCH 06/14] Update .travis.yml

Try to install mbstring when running the tests
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9611af41..948bd002 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ matrix:
     allow_failures:
         - env: SYMFONY_VERSION=3.3.*@dev
 
-before_script: sudo apt-get install php7.0-mbstring
+before_script: sudo apt-get install libapache2-mod-php7.0
 
 before_install:
    - if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;

From 33a49cbc9c33eb7baffe108d278d1e6e853a72ab Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 12:36:38 +0200
Subject: [PATCH 07/14] Update .travis.yml

Try to make travis install mbstring
---
 .travis.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 948bd002..8d0ae16d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,16 @@ matrix:
     allow_failures:
         - env: SYMFONY_VERSION=3.3.*@dev
 
-before_script: sudo apt-get install libapache2-mod-php7.0
+
+
+jobs:
+  include:
+    - stage: Test
+      env: global
+      php: 7.1
+      before_script:
+        - sudo apt-get install php-mbstring php7.0-mbstring
+      sudo: required
 
 before_install:
    - if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;

From 01df1319bf0895f2df6d53133fabaf03c899a13f Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 12:47:14 +0200
Subject: [PATCH 08/14] Update .travis.yml

Try to make travis to install mbstring
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8d0ae16d..5115d3cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,7 @@ matrix:
 jobs:
   include:
     - stage: Test
-      env: global
+      env: DEPENDENCIES=beta
       php: 7.1
       before_script:
         - sudo apt-get install php-mbstring php7.0-mbstring

From bc85d4b4986378bd46776cf84e4e155e59984ded Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 12:52:41 +0200
Subject: [PATCH 09/14] Update composer.json

Make phpunit available for older php versions too
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index eb044b20..c9c94c51 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "friendsofphp/php-cs-fixer": "^2.0",
         "php-http/cache-plugin": "^1.4",
         "php-http/guzzle6-adapter": "^1.0",
-        "phpunit/phpunit": "^6.0",
+        "phpunit/phpunit": "^5.4|^6.0",
         "phpunit/phpunit-selenium": "dev-master",
         "symfony/cache": "^3.2|^4.0",
         "symfony/form": "^2.7|^3.0|^4.0",

From c32c8e9e52993199714b6397888b136e7867a449 Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 13:04:22 +0200
Subject: [PATCH 10/14] Update .travis.yml

try to update travis to install mbstring for php7.1
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5115d3cd..c75fcc15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ jobs:
     - stage: Test
       env: DEPENDENCIES=beta
       php: 7.1
-      before_script:
+      before_install:
         - sudo apt-get install php-mbstring php7.0-mbstring
       sudo: required
 

From c3c9fbfa1254e8ca7cb7d8b7abd7ac6eeb2180cd Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 13:10:49 +0200
Subject: [PATCH 11/14] Update .travis.yml

Try to make travis install php-mbstring
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c75fcc15..7025a219 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,7 @@ jobs:
       env: DEPENDENCIES=beta
       php: 7.1
       before_install:
-        - sudo apt-get install php-mbstring php7.0-mbstring
+        - sudo apt-get update && sudo apt-get install php-mbstring php7.0-mbstring
       sudo: required
 
 before_install:

From a67ce85645d654742ce4707481ded2d56d3422a7 Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 13:16:30 +0200
Subject: [PATCH 12/14] Update composer.json

Modify phpunit-selenium version
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c9c94c51..6a40f269 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "php-http/cache-plugin": "^1.4",
         "php-http/guzzle6-adapter": "^1.0",
         "phpunit/phpunit": "^5.4|^6.0",
-        "phpunit/phpunit-selenium": "dev-master",
+        "phpunit/phpunit-selenium": "^3.0|^4.1",
         "symfony/cache": "^3.2|^4.0",
         "symfony/form": "^2.7|^3.0|^4.0",
         "symfony/phpunit-bridge": "^2.7|^3.0|^4.0",

From 60efd135241d4f76b78d9d02e62528c984bb2acd Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 13:37:01 +0200
Subject: [PATCH 13/14] Update .travis.yml

Update travis
---
 .travis.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7025a219..e3c413ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,16 +47,6 @@ matrix:
         - env: SYMFONY_VERSION=3.3.*@dev
 
 
-
-jobs:
-  include:
-    - stage: Test
-      env: DEPENDENCIES=beta
-      php: 7.1
-      before_install:
-        - sudo apt-get update && sudo apt-get install php-mbstring php7.0-mbstring
-      sudo: required
-
 before_install:
    - if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
 

From 77ac7f34dfa6645be51bec89b05fe32edef81fa2 Mon Sep 17 00:00:00 2001
From: alexbaciu <mail@alexbaciu.ro>
Date: Sat, 18 Nov 2017 15:24:08 +0200
Subject: [PATCH 14/14] Update composer.json

changing pipe with ||
---
 composer.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 6a40f269..a16b377a 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": "^5.6|^7.0",
-        "symfony/framework-bundle": "^2.7|^3.0|^4.0",
+        "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0",
         "egeloen/google-map": "^2.0.2"
     },
     "require-dev": {
@@ -20,13 +20,13 @@
         "friendsofphp/php-cs-fixer": "^2.0",
         "php-http/cache-plugin": "^1.4",
         "php-http/guzzle6-adapter": "^1.0",
-        "phpunit/phpunit": "^5.4|^6.0",
-        "phpunit/phpunit-selenium": "^3.0|^4.1",
-        "symfony/cache": "^3.2|^4.0",
-        "symfony/form": "^2.7|^3.0|^4.0",
-        "symfony/phpunit-bridge": "^2.7|^3.0|^4.0",
-        "symfony/templating": "^2.7|^3.0|^4.0",
-        "symfony/yaml": "^2.7|^3.0|^4.0",
+        "phpunit/phpunit": "^5.4 || ^6.0",
+        "phpunit/phpunit-selenium": "^3.0 || ^4.1",
+        "symfony/cache": "^3.2 || ^4.0",
+        "symfony/form": "^2.7 || ^3.0 || ^4.0",
+        "symfony/phpunit-bridge": "^2.7 || ^3.0 || ^4.0",
+        "symfony/templating": "^2.7 || ^3.0 || ^4.0",
+        "symfony/yaml": "^2.7 || ^3.0 || ^4.0",
         "twig/twig": "^1.18"
     },
     "autoload": {