From f3813f9939c55386384141426368613bc901aea3 Mon Sep 17 00:00:00 2001 From: Vincent Composieux Date: Fri, 14 Sep 2018 21:07:39 +0200 Subject: [PATCH] Update code and dependencies for Symfony4 --- Resources/config/feed.xml | 8 ++++---- composer.json | 8 ++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Resources/config/feed.xml b/Resources/config/feed.xml index c19052b..8f73f2a 100644 --- a/Resources/config/feed.xml +++ b/Resources/config/feed.xml @@ -12,13 +12,13 @@ - + %eko_feed.config% - + @@ -27,9 +27,9 @@ - + - + diff --git a/composer.json b/composer.json index 4febeca..646dbea 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,8 @@ ], "require": { "php": "^5.4|^7.0", - "symfony/framework-bundle": "^2.5|^3.0", + "symfony/framework-bundle": "^2.5|^3.0|^4.0", + "symfony/translation": "^2.5|^3.0|^4.0", "zendframework/zend-feed": ">=2.0", "zendframework/zend-servicemanager": ">=2.0", "zendframework/zend-http": ">=2.0" @@ -27,10 +28,5 @@ }, "autoload": { "psr-4": { "Eko\\FeedBundle\\": "" } - }, - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } } }