From 528b22904380370a1fa6cb3cac5dbd9e942c8415 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 17 Aug 2018 09:47:31 +0200
Subject: v4.0.14 from Fedora

---
 composer.json     |  6 +++---
 php-symfony4.spec | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index b389ddf..b9c0b1d 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^7.1.3",
         "ext-xml": "*",
-        "doctrine/common": "~2.4",
+        "doctrine/common": "~2.4@stable",
         "fig/link-util": "^1.0",
         "twig/twig": "^1.35|^2.4.4",
         "psr/cache": "~1.0",
@@ -89,7 +89,7 @@
         "doctrine/cache": "~1.6",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.4",
-        "doctrine/orm": "~2.4,>=2.4.5",
+        "doctrine/orm": "~2.4,>=2.4.5,<=2.7.0",
         "doctrine/doctrine-bundle": "~1.4",
         "monolog/monolog": "~1.11",
         "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
@@ -101,7 +101,7 @@
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
-        "phpdocumentor/type-resolver": "<0.2.1",
+        "phpdocumentor/type-resolver": "<0.3.0",
         "phpunit/phpunit": "<5.4.3"
     },
     "provide": {
diff --git a/php-symfony4.spec b/php-symfony4.spec
index adeca23..6d1213f 100644
--- a/php-symfony4.spec
+++ b/php-symfony4.spec
@@ -13,8 +13,8 @@
 
 %global github_owner     symfony
 %global github_name      symfony
-%global github_version   4.0.11
-%global github_commit    a54fa082103acd599b7d5de9204dc1f4aa8a5615
+%global github_version   4.0.14
+%global github_commit    2a98d99a2f78a7554bc4ee5a2ade89377fe336e0
 
 %global composer_vendor  symfony
 %global composer_project symfony
@@ -43,9 +43,9 @@
 # "doctrine/doctrine-bundle": "~1.4"
 %global doctrine_bundle_min_ver 1.4
 %global doctrine_bundle_max_ver 2.0
-# "doctrine/orm": "~2.4,>=2.4.5"
+# "doctrine/orm": "~2.4,>=2.4.5,<=2.7.0"
 %global doctrine_orm_min_ver 2.4.5
-%global doctrine_orm_max_ver 3.0
+%global doctrine_orm_max_ver 2.7.0
 # "egulias/email-validator": "~1.2,>=1.2.8|~2.0"
 %global email_validator_min_ver 1.2.8
 %global email_validator_max_ver 3.0
@@ -61,7 +61,7 @@
 %global proxy_manager_max_ver 3.0
 # "phpdocumentor/reflection-docblock": "^3.0|^4.0"
 # conflicts: "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2"
-%global phpdocumentor_reflection_docblock_min_ver 3.0
+%global phpdocumentor_reflection_docblock_min_ver 3.2.2
 %global phpdocumentor_reflection_docblock_max_ver 5.0
 # "psr/cache": "~1.0"
 %global psr_cache_min_ver 1.0
@@ -198,6 +198,8 @@ BuildRequires: php-xml
 BuildRequires: php-xmlreader
 ## Autoloader
 BuildRequires: php-composer(fedora/autoloader)
+# Conflicts
+BuildConflicts: php-composer(phpdocumentor/type-resolver) < 0.3.0
 
 # Bridges
 Requires:      php-composer(%{composer_vendor}/doctrine-bridge) = %{version}
@@ -256,6 +258,9 @@ Requires:      php-composer(%{composer_vendor}/yaml) = %{version}
 # Composer
 Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 
+# Conflicts
+Conflicts:     php-composer(phpdocumentor/type-resolver) < 0.3.0
+
 %description
 %{summary}.
 
@@ -2751,6 +2756,10 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Thu Aug 02 2018 Shawn Iwinski <shawn@iwin.ski> - 4.0.14-1
+- Update to 4.0.14 (CVE-2018-14773 / CVE-2018-14774)
+- Add conflict php-composer(phpdocumentor/type-resolver) < 0.3.0
+
 * Mon May 28 2018 Remi Collet <remi@remirepo.net> - 4.0.11-1
 - update to 4.0.11
 
-- 
cgit