From 01cd035ee62a2b4b872ad49fb36fc7a62780e3f3 Mon Sep 17 00:00:00 2001
From: Fabien Bourigault <bourigaultfabien@gmail.com>
Date: Tue, 21 Feb 2017 10:28:00 +0100
Subject: [PATCH] bump symfony minimum version from 2.7 to 2.8

---
 .travis.yml                           |   3 +-
 CHANGELOG.md                          |   1 +
 Resources/views/Icon/httplug_old.svg  | 143 --------------------------
 Resources/views/webprofiler.html.twig |  12 +--
 composer.json                         |   8 +-
 5 files changed, 8 insertions(+), 159 deletions(-)
 delete mode 100644 Resources/views/Icon/httplug_old.svg

diff --git a/.travis.yml b/.travis.yml
index 06114300..00fecd44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ env:
         - SYMFONY_VERSION=3.2.*
         - SYMFONY_VERSION=3.1.*
         - SYMFONY_VERSION=2.8.*
-        - SYMFONY_VERSION=2.7.*
 
 branches:
     except:
@@ -29,7 +28,7 @@ matrix:
     fast_finish: true
     include:
         - php: 5.5
-          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.*
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.8.*
 
 install:
     - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a8a7923..f65dbbf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Changed
 
 - The profiler collector has been rewritten to use objects instead of arrays.
+- Bumped minimum Symfony version to 2.8.
 
 ### Fixed
 
diff --git a/Resources/views/Icon/httplug_old.svg b/Resources/views/Icon/httplug_old.svg
deleted file mode 100644
index 8abdff2f..00000000
--- a/Resources/views/Icon/httplug_old.svg
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 28.1 28" style="enable-background:new 0 0 28.1 28;" xml:space="preserve" height="28" width="28">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{clip-path:url(#SVGID_4_);fill:#3F3F3F;}
-	.st2{clip-path:url(#SVGID_4_);fill:none;}
-	.st3{clip-path:url(#SVGID_4_);}
-	.st4{opacity:0.2;clip-path:url(#SVGID_6_);}
-	.st5{clip-path:url(#SVGID_14_);fill:#FFFFFF;}
-	.st6{clip-path:url(#SVGID_16_);fill:#FFFFFF;}
-</style>
-<g>
-	<defs>
-		<rect id="SVGID_1_" x="-260.5" y="-486" width="1000" height="1000"/>
-	</defs>
-	<clipPath id="SVGID_2_">
-		<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
-	</clipPath>
-</g>
-<rect x="-260.5" y="-486" class="st0" width="1000" height="1000"/>
-<g>
-	<defs>
-		<path id="SVGID_3_" d="M17.4,0.4c0.1,0.1,0.2,0.3,0.2,0.4c0.1,0.1,0.2,0.3,0.2,0.4c0,0.1,0.1,0.1,0.1,0.2c0,0.1,0.1,0.2,0.1,0.2
-			c0.1,0.1,0.1,0.3,0.2,0.5c0,0,0,0.1,0,0.1c0,0.1,0,0.1,0,0.2l0,0.2l0,0.2c0,0.1,0,0.2,0,0.2c0,0.2,0,0.3,0,0.5c0,0.2,0,0.3,0,0.5
-			l0,0.2c0,0.1,0,0.2,0,0.2L18.4,5c0,0.2-0.1,0.3-0.1,0.5c-0.1,0.3-0.2,0.6-0.3,0.9c0,0.1-0.1,0.3-0.2,0.4c-0.1,0.1-0.1,0.3-0.2,0.4
-			c-0.1,0.1-0.1,0.3-0.2,0.4c-0.1,0.1-0.1,0.2-0.2,0.4c-0.1,0.1-0.1,0.2-0.2,0.4c-0.1,0.1-0.2,0.2-0.2,0.3c-0.1,0.1-0.1,0.2-0.2,0.3
-			c-0.1,0.1-0.2,0.2-0.2,0.3c-0.1,0.1-0.2,0.2-0.2,0.3c-0.1,0.1-0.2,0.2-0.2,0.3c-0.2,0.2-0.3,0.3-0.5,0.5c-0.1,0.1-0.1,0.2-0.2,0.2
-			c-0.1,0.1-0.1,0.1-0.2,0.2c-0.1,0.1-0.3,0.3-0.4,0.4c-0.2,0.3-0.5,0.5-0.7,0.6c-0.4,0.3-0.6,0.5-0.6,0.5s0.2-0.2,0.5-0.6
-			c0.2-0.2,0.4-0.4,0.6-0.7c0.1-0.1,0.2-0.3,0.3-0.4c0.1-0.1,0.1-0.2,0.2-0.2c0.1-0.1,0.1-0.2,0.2-0.3c0.1-0.2,0.3-0.4,0.4-0.6
-			c0.1-0.1,0.1-0.2,0.2-0.3c0.1-0.1,0.1-0.2,0.2-0.3c0.1-0.1,0.1-0.2,0.2-0.3c0.1-0.1,0.1-0.2,0.2-0.3c0.1-0.1,0.1-0.2,0.2-0.3
-			c0.1-0.1,0.1-0.2,0.2-0.4c0-0.1,0.1-0.2,0.2-0.4c0-0.1,0.1-0.2,0.1-0.4c0-0.1,0.1-0.3,0.1-0.4C17,6.4,17,6.2,17,6.1
-			c0.1-0.3,0.1-0.5,0.1-0.8c0-0.1,0-0.3,0-0.4l0-0.4c0-0.1,0-0.1,0-0.2l0-0.2c0-0.1,0-0.3,0-0.4c0-0.1-0.1-0.2-0.1-0.4
-			c0-0.1,0-0.1-0.1-0.2L16.9,3c-0.2-0.5-0.4-0.9-0.7-1.3c0,0,0,0,0,0C16,1.4,15.8,1.2,15.6,1c-0.1-0.1-0.2-0.2-0.3-0.2
-			c-0.3-0.3-0.6-0.5-1-0.7c-0.1,0-0.2,0-0.3,0C6.4,0,0.2,6.1,0.1,13.7l0,0L0,20.1l1.3,0.1L0,20.3l0,0.4l1.3,0.1L0,20.9l0,0.4
-			l1.3,0.1L0,21.5L0,22h0.7v2.9c0,0.2,0.2,0.3,0.3,0.3c0.2,0,0.3-0.2,0.3-0.3V22l1.3,0v2.8c0,0.2,0.2,0.3,0.3,0.3
-			c0.2,0,0.3-0.2,0.3-0.3V22h0.7v-0.5l-1.5-0.1l1.5-0.1v-0.4l-1.5-0.1l1.5-0.1v-0.4l-1.5-0.1l1.5-0.1v-3.5c0-1,0.8-1.9,1.8-1.9
-			c1,0,1.9,0.8,1.9,1.8v10c1.7,0.9,3.8,1.4,5.9,1.5v-6.2c0-1.8,1.4-3.4,3.2-3.4c1.9-0.1,3.5,1.4,3.5,3.3v4.8
-			c2.6-1.4,4.9-3.6,6.2-6.3c0-0.1,0-0.1-0.1-0.2c-0.1-0.1-0.1-0.3-0.1-0.4c0-0.1-0.1-0.3-0.1-0.4c0-0.1-0.1-0.3-0.1-0.4l-0.1-0.2
-			l0-0.2c0-0.1-0.1-0.3-0.1-0.4c-0.1-0.3-0.1-0.6-0.1-0.8c0-0.3-0.1-0.5-0.1-0.8c0-0.1,0-0.2,0-0.4c0-0.1,0-0.2,0-0.3
-			c0-0.2,0-0.4,0-0.6c0-0.2,0-0.3,0-0.5c0-0.2,0-0.4,0-0.4s0,0.1,0.1,0.4c0,0.1,0.1,0.3,0.1,0.4c0,0.2,0.1,0.4,0.2,0.6
-			c0,0.1,0.1,0.2,0.1,0.3c0,0.1,0.1,0.2,0.1,0.3c0.1,0.2,0.2,0.5,0.3,0.7c0.1,0.2,0.2,0.5,0.3,0.7c0.1,0.1,0.1,0.2,0.2,0.4l0.1,0.2
-			l0.1,0.2c0,0.1,0.1,0.1,0.1,0.2c0.4-1.4,0.7-2.8,0.7-4.4C28.1,7.4,23.5,1.9,17.4,0.4z M6.9,9.9c-0.5,0-0.9-0.4-0.9-0.9
-			c0-0.5,0.4-0.9,0.9-0.9c0.5,0,0.9,0.4,0.9,0.9C7.8,9.6,7.4,9.9,6.9,9.9z"/>
-	</defs>
-	<clipPath id="SVGID_4_">
-		<use xlink:href="#SVGID_3_"  style="overflow:visible;"/>
-	</clipPath>
-	<rect class="st1" width="28.1" height="28"/>
-	<path class="st2" d="M6.1,9.1c0-0.5,0.4-0.9,0.9-0.9c0.5,0,0.9,0.4,0.9,0.9c0,0.5-0.4,0.9-0.9,0.9C6.4,9.9,6.1,9.6,6.1,9.1
-		 M0.1,13.7L0.1,13.7L0,20.1l1.4,0.1L0,20.3l0,0.4l1.4,0.1L0,20.9l0,0.4l1.4,0.1L0,21.5L0,22h0.6v2.8c0,0.2,0.2,0.4,0.4,0.4
-		c0.3,0,0.3-0.4,0.3-0.4V22l1.3,0l0,2.8c0,0.2,0.1,0.4,0.4,0.4c0.3,0,0.3-0.2,0.3-0.4c0-0.1,0-2.8,0-2.8h0.8v-0.5l-1.5-0.1l1.5-0.1
-		v-0.4l-1.5-0.1l1.5-0.1v-0.4l-1.5-0.1l1.5-0.1v-3.5c0-1,0.8-1.9,1.8-1.9c1,0,1.9,0.8,1.9,1.8v10c1.7,0.9,3.8,1.4,5.9,1.5v-6.2
-		c0-1.8,1.4-3.4,3.2-3.4c1.9-0.1,3.5,1.4,3.5,3.3v4.8c2.6-1.4,4.9-3.6,6.2-6.3c0-0.1,0-0.1-0.1-0.2c-0.1-0.1-0.1-0.3-0.1-0.4
-		c0-0.1-0.1-0.3-0.1-0.4c0-0.1-0.1-0.3-0.1-0.4l-0.1-0.2l0-0.2c0-0.1-0.1-0.3-0.1-0.4c-0.1-0.3-0.1-0.6-0.1-0.8
-		c0-0.3-0.1-0.5-0.1-0.8c0-0.1,0-0.2,0-0.4c0-0.1,0-0.2,0-0.3c0-0.2,0-0.4,0-0.6c0-0.2,0-0.3,0-0.5c0-0.2,0-0.4,0-0.4s0,0.1,0.1,0.4
-		c0,0.1,0.1,0.3,0.1,0.4c0,0.2,0.1,0.4,0.2,0.6c0,0.1,0.1,0.2,0.1,0.3c0,0.1,0.1,0.2,0.1,0.3c0.1,0.2,0.2,0.5,0.3,0.7
-		c0.1,0.2,0.2,0.5,0.3,0.7c0.1,0.1,0.1,0.2,0.2,0.4l0.1,0.2l0.1,0.2c0,0.1,0.1,0.1,0.1,0.2c0.4-1.4,0.7-2.8,0.7-4.4
-		c0-6.6-4.5-12.1-10.6-13.6c0.1,0.1,0.2,0.3,0.2,0.4c0.1,0.1,0.2,0.3,0.2,0.4c0,0.1,0.1,0.1,0.1,0.2c0,0.1,0.1,0.2,0.1,0.2
-		c0.1,0.1,0.1,0.3,0.2,0.5c0,0,0,0.1,0,0.1c0,0.1,0,0.1,0,0.2l0,0.2l0,0.2c0,0.1,0,0.2,0,0.2c0,0.2,0,0.3,0,0.5c0,0.2,0,0.3,0,0.5
-		l0,0.2c0,0.1,0,0.2,0,0.2L18.4,5c0,0.2-0.1,0.3-0.1,0.5c-0.1,0.3-0.2,0.6-0.3,0.9c0,0.1-0.1,0.3-0.2,0.4c-0.1,0.1-0.1,0.3-0.2,0.4
-		c-0.1,0.1-0.1,0.3-0.2,0.4c-0.1,0.1-0.1,0.2-0.2,0.4c-0.1,0.1-0.1,0.2-0.2,0.4c-0.1,0.1-0.2,0.2-0.2,0.3c-0.1,0.1-0.1,0.2-0.2,0.3
-		c-0.1,0.1-0.2,0.2-0.2,0.3c-0.1,0.1-0.2,0.2-0.2,0.3c-0.1,0.1-0.2,0.2-0.2,0.3c-0.2,0.2-0.3,0.3-0.5,0.5c-0.1,0.1-0.1,0.2-0.2,0.2
-		c-0.1,0.1-0.1,0.1-0.2,0.2c-0.1,0.1-0.3,0.3-0.4,0.4c-0.2,0.3-0.5,0.5-0.7,0.6c-0.4,0.3-0.6,0.5-0.6,0.5s0.2-0.2,0.5-0.6
-		c0.2-0.2,0.4-0.4,0.6-0.7c0.1-0.1,0.2-0.3,0.3-0.4c0.1-0.1,0.1-0.2,0.2-0.2c0.1-0.1,0.1-0.2,0.2-0.3c0.1-0.2,0.3-0.4,0.4-0.6
-		c0.1-0.1,0.1-0.2,0.2-0.3c0.1-0.1,0.1-0.2,0.2-0.3c0.1-0.1,0.1-0.2,0.2-0.3c0.1-0.1,0.1-0.2,0.2-0.3c0.1-0.1,0.1-0.2,0.2-0.3
-		c0.1-0.1,0.1-0.2,0.2-0.4c0-0.1,0.1-0.2,0.2-0.4c0-0.1,0.1-0.2,0.1-0.4c0-0.1,0.1-0.3,0.1-0.4C17,6.4,17,6.2,17,6.1
-		c0.1-0.3,0.1-0.5,0.1-0.8c0-0.1,0-0.3,0-0.4l0-0.4c0-0.1,0-0.1,0-0.2l0-0.2c0-0.1,0-0.3,0-0.4c0-0.1-0.1-0.2-0.1-0.4
-		c0-0.1,0-0.1-0.1-0.2L16.9,3c-0.2-0.5-0.4-0.9-0.7-1.3c0,0,0,0,0,0C16,1.4,15.8,1.2,15.6,1c-0.1-0.1-0.2-0.2-0.3-0.2
-		c-0.3-0.3-0.6-0.5-1-0.7c-0.1,0-0.2,0-0.3,0C6.4,0,0.2,6.1,0.1,13.7"/>
-	<g class="st3">
-		<defs>
-			<rect id="SVGID_5_" x="-16.9" y="-42.3" width="112.6" height="112.6"/>
-		</defs>
-		<clipPath id="SVGID_6_">
-			<use xlink:href="#SVGID_5_"  style="overflow:visible;"/>
-		</clipPath>
-		<g class="st4">
-			<g>
-				<defs>
-					<rect id="SVGID_7_" x="1.3" y="0.9" width="15" height="16.8"/>
-				</defs>
-				<clipPath id="SVGID_8_">
-					<use xlink:href="#SVGID_7_"  style="overflow:visible;"/>
-				</clipPath>
-			</g>
-		</g>
-		<g class="st4">
-			<g>
-				<defs>
-					<rect id="SVGID_9_" x="18" y="1.5" width="8.6" height="11.2"/>
-				</defs>
-				<clipPath id="SVGID_10_">
-					<use xlink:href="#SVGID_9_"  style="overflow:visible;"/>
-				</clipPath>
-			</g>
-		</g>
-		<g class="st4">
-			<g>
-				<defs>
-					<rect id="SVGID_11_" x="3.1" y="13.8" width="5.4" height="2.6"/>
-				</defs>
-				<clipPath id="SVGID_12_">
-					<use xlink:href="#SVGID_11_"  style="overflow:visible;"/>
-				</clipPath>
-			</g>
-		</g>
-		<g class="st4">
-			<g>
-				<defs>
-					<rect id="SVGID_13_" x="0.8" y="22" width="0.1" height="2.1"/>
-				</defs>
-				<clipPath id="SVGID_14_">
-					<use xlink:href="#SVGID_13_"  style="overflow:visible;"/>
-				</clipPath>
-				<polygon class="st5" points="0.9,22 0.9,24.1 0.8,22 				"/>
-			</g>
-		</g>
-		<g class="st4">
-			<g>
-				<defs>
-					<rect id="SVGID_15_" x="2.8" y="22" width="0.1" height="2.1"/>
-				</defs>
-				<clipPath id="SVGID_16_">
-					<use xlink:href="#SVGID_15_"  style="overflow:visible;"/>
-				</clipPath>
-				<polygon class="st6" points="3,22 2.9,24.1 2.8,22 				"/>
-			</g>
-		</g>
-		<g class="st4">
-			<g>
-				<defs>
-					<rect id="SVGID_17_" x="13.1" y="17.1" width="8" height="4.3"/>
-				</defs>
-				<clipPath id="SVGID_18_">
-					<use xlink:href="#SVGID_17_"  style="overflow:visible;"/>
-				</clipPath>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/Resources/views/webprofiler.html.twig b/Resources/views/webprofiler.html.twig
index e7af78af..fa00ade2 100644
--- a/Resources/views/webprofiler.html.twig
+++ b/Resources/views/webprofiler.html.twig
@@ -5,11 +5,7 @@
 {% block toolbar %}
     {% if collector.stacks|length > 0 %}
         {% set icon %}
-            {% if constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION_ID') >= 20800 %}
-                {{ include('@Httplug/Icon/httplug.svg') }}
-            {% else %}
-                {{ include('@Httplug/Icon/httplug_old.svg') }}
-            {% endif %}
+            {{ include('@Httplug/Icon/httplug.svg') }}
             <span class="sf-toolbar-value">{{ collector.stacks|length }}</span>
             <span class="sf-toolbar-label">req.</span>
         {% endset %}
@@ -39,11 +35,7 @@
     {# This left-hand menu appears when using the full-screen profiler. #}
     <span class="label {{ collector.stacks|length == 0 ? 'disabled' }}">
         <span class="icon">
-            {% if constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION_ID') >= 20800 %}
-                {{ include('@Httplug/Icon/httplug.svg') }}
-            {% else %}
-                {{ include('@Httplug/Icon/httplug_old.svg') }}
-            {% endif %}
+            {{ include('@Httplug/Icon/httplug.svg') }}
         </span>
         <strong>Httplug</strong>
     </span>
diff --git a/composer.json b/composer.json
index 98687cb7..26346fd2 100644
--- a/composer.json
+++ b/composer.json
@@ -23,9 +23,9 @@
         "php-http/cache-plugin": "^1.0",
         "php-http/logger-plugin": "^1.0",
         "php-http/stopwatch-plugin": "^1.0",
-        "symfony/options-resolver": "^2.7 || ^3.0",
-        "symfony/event-dispatcher": "^2.7 || ^3.0",
-        "symfony/framework-bundle": "^2.7 || ^3.0",
+        "symfony/options-resolver": "^2.8 || ^3.0",
+        "symfony/event-dispatcher": "^2.8 || ^3.0",
+        "symfony/framework-bundle": "^2.8 || ^3.0",
         "php-http/message": "^1.3",
         "php-http/discovery": "^1.0",
         "twig/twig": "^1.18 || ^2.0"
@@ -37,7 +37,7 @@
         "php-http/guzzle6-adapter": "^1.1.1",
         "php-http/react-adapter": "^0.2.1",
         "php-http/buzz-adapter": "^0.3",
-        "symfony/symfony": "^2.7 || ^3.0",
+        "symfony/symfony": "^2.8 || ^3.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "matthiasnoback/symfony-dependency-injection-test": "^1.0"
     },