From 3fa84f44515bb1e4fce025bdeb1c85a974d3d32b Mon Sep 17 00:00:00 2001
From: Vladimir Khramtsov <vkhramtsov@gmail.com>
Date: Fri, 30 Nov 2018 19:18:01 +0300
Subject: [PATCH] Fix creating/editing articles

---
 .travis.yml                                        |  2 +-
 composer.lock                                      | 14 ++++++++------
 .../Resources/config/easy_admin_config.yaml        |  4 ++--
 .../WebsiteBundle/Controller/DefaultController.php |  3 ---
 .../WebsiteBundle/Resources/config/services.yaml   |  4 +---
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bcc2436..41fad5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ env:
 before_install:
   - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then openssl aes-256-cbc -K $encrypted_38f96163e3a4_key -iv $encrypted_38f96163e3a4_iv -in .travis/deploy.key.enc -out .travis/deploy.key -d; fi
   - curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
-  - curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+  - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
   - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq python-docutils nodejs yarn
diff --git a/composer.lock b/composer.lock
index 760ed08..3705820 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1385,25 +1385,26 @@
         },
         {
             "name": "easycorp/easyadmin-bundle",
-            "version": "v1.17.14",
+            "version": "v1.17.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/EasyCorp/EasyAdminBundle.git",
-                "reference": "f0ba63304b07d72443aab9973e00ca6faee43adf"
+                "reference": "8151a185e5783b464847d539c715d29182ef0569"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/EasyCorp/EasyAdminBundle/zipball/f0ba63304b07d72443aab9973e00ca6faee43adf",
-                "reference": "f0ba63304b07d72443aab9973e00ca6faee43adf",
+                "url": "https://api.github.com/repos/EasyCorp/EasyAdminBundle/zipball/8151a185e5783b464847d539c715d29182ef0569",
+                "reference": "8151a185e5783b464847d539c715d29182ef0569",
                 "shasum": ""
             },
             "require": {
                 "doctrine/cache": "~1.5",
+                "doctrine/dbal": "~2.3",
                 "doctrine/doctrine-bundle": "~1.2",
                 "doctrine/orm": "~2.3",
-                "doctrine/persistence": "^1.0",
                 "pagerfanta/pagerfanta": "~1.0,>=1.0.1|~2.0",
                 "php": ">=5.3.0",
+                "psr/log": "^1.0",
                 "symfony/asset": "~2.3|~3.0|^4.0",
                 "symfony/config": "~2.3|~3.0|^4.0",
                 "symfony/dependency-injection": "~2.3|~3.0|^4.0",
@@ -1416,6 +1417,7 @@
                 "symfony/http-kernel": "~2.3|~3.0|^4.0",
                 "symfony/polyfill-mbstring": "^1.0",
                 "symfony/property-access": "~2.3|~3.0|^4.0",
+                "symfony/routing": "~2.3|~3.0|^4.0",
                 "symfony/security-bundle": "~2.3|~3.0|^4.0",
                 "symfony/translation": "~2.3|~3.0|^4.0",
                 "symfony/twig-bridge": "^2.3.4|~3.0|^4.0",
@@ -1464,7 +1466,7 @@
                 "backend",
                 "generator"
             ],
-            "time": "2018-08-10T13:50:37+00:00"
+            "time": "2018-11-29T19:23:25+00:00"
         },
         {
             "name": "egulias/email-validator",
diff --git a/src/PhpOfBy/AdminBundle/Resources/config/easy_admin_config.yaml b/src/PhpOfBy/AdminBundle/Resources/config/easy_admin_config.yaml
index 5052055..4418869 100644
--- a/src/PhpOfBy/AdminBundle/Resources/config/easy_admin_config.yaml
+++ b/src/PhpOfBy/AdminBundle/Resources/config/easy_admin_config.yaml
@@ -28,5 +28,5 @@ easy_admin:
                     - 'published'
                     - 'title'
                     - 'publicationDate'
-                    - { property: 'teaser', type: 'ckeditor' }
-                    - { property: 'body', type: 'ckeditor' }
+                    - { property: 'teaser', type: 'FOS\CKEditorBundle\Form\Type\CKEditorType' }
+                    - { property: 'body', type: 'FOS\CKEditorBundle\Form\Type\CKEditorType' }
diff --git a/src/PhpOfBy/WebsiteBundle/Controller/DefaultController.php b/src/PhpOfBy/WebsiteBundle/Controller/DefaultController.php
index 43dfbd0..87c9d83 100644
--- a/src/PhpOfBy/WebsiteBundle/Controller/DefaultController.php
+++ b/src/PhpOfBy/WebsiteBundle/Controller/DefaultController.php
@@ -6,9 +6,6 @@
 use Sensio\Bundle\FrameworkExtraBundle\Configuration as Mvc;
 use Symfony\Component\Routing\Annotation\Route;
 
-/**
- * @Mvc\Route(service="phpofby_website.controller.default")
- */
 class DefaultController extends AbstractServiceController
 {
     /**
diff --git a/src/PhpOfBy/WebsiteBundle/Resources/config/services.yaml b/src/PhpOfBy/WebsiteBundle/Resources/config/services.yaml
index d5300e1..f8bc34e 100644
--- a/src/PhpOfBy/WebsiteBundle/Resources/config/services.yaml
+++ b/src/PhpOfBy/WebsiteBundle/Resources/config/services.yaml
@@ -1,9 +1,7 @@
 parameters:
-  phpofby_website.controller.default.class: PhpOfBy\WebsiteBundle\Controller\DefaultController
 
 services:
-  phpofby_website.controller.default:
-    class: '%phpofby_website.controller.default.class%'
+  PhpOfBy\WebsiteBundle\Controller\DefaultController:
     parent: common.contoller.abstract
     public: true
     arguments: []