Skip to content

Commit f429995

Browse files
authored
Merge pull request #130 from fbourigault/drop-symfony-2.7
bump symfony minimum version from 2.7 to 2.8
2 parents a0f42af + 01cd035 commit f429995

File tree

5 files changed

+8
-159
lines changed

5 files changed

+8
-159
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ env:
1919
- SYMFONY_VERSION=3.2.*
2020
- SYMFONY_VERSION=3.1.*
2121
- SYMFONY_VERSION=2.8.*
22-
- SYMFONY_VERSION=2.7.*
2322

2423
branches:
2524
except:
@@ -29,7 +28,7 @@ matrix:
2928
fast_finish: true
3029
include:
3130
- php: 5.5
32-
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.*
31+
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.8.*
3332

3433
install:
3534
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
### Changed
66

77
- The profiler collector has been rewritten to use objects instead of arrays.
8+
- Bumped minimum Symfony version to 2.8.
89

910
### Fixed
1011

Resources/views/Icon/httplug_old.svg

Lines changed: 0 additions & 143 deletions
This file was deleted.

Resources/views/webprofiler.html.twig

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
{% block toolbar %}
66
{% if collector.stacks|length > 0 %}
77
{% set icon %}
8-
{% if constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION_ID') >= 20800 %}
9-
{{ include('@Httplug/Icon/httplug.svg') }}
10-
{% else %}
11-
{{ include('@Httplug/Icon/httplug_old.svg') }}
12-
{% endif %}
8+
{{ include('@Httplug/Icon/httplug.svg') }}
139
<span class="sf-toolbar-value">{{ collector.stacks|length }}</span>
1410
<span class="sf-toolbar-label">req.</span>
1511
{% endset %}
@@ -39,11 +35,7 @@
3935
{# This left-hand menu appears when using the full-screen profiler. #}
4036
<span class="label {{ collector.stacks|length == 0 ? 'disabled' }}">
4137
<span class="icon">
42-
{% if constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION_ID') >= 20800 %}
43-
{{ include('@Httplug/Icon/httplug.svg') }}
44-
{% else %}
45-
{{ include('@Httplug/Icon/httplug_old.svg') }}
46-
{% endif %}
38+
{{ include('@Httplug/Icon/httplug.svg') }}
4739
</span>
4840
<strong>Httplug</strong>
4941
</span>

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"php-http/cache-plugin": "^1.0",
2424
"php-http/logger-plugin": "^1.0",
2525
"php-http/stopwatch-plugin": "^1.0",
26-
"symfony/options-resolver": "^2.7 || ^3.0",
27-
"symfony/event-dispatcher": "^2.7 || ^3.0",
28-
"symfony/framework-bundle": "^2.7 || ^3.0",
26+
"symfony/options-resolver": "^2.8 || ^3.0",
27+
"symfony/event-dispatcher": "^2.8 || ^3.0",
28+
"symfony/framework-bundle": "^2.8 || ^3.0",
2929
"php-http/message": "^1.3",
3030
"php-http/discovery": "^1.0",
3131
"twig/twig": "^1.18 || ^2.0"
@@ -37,7 +37,7 @@
3737
"php-http/guzzle6-adapter": "^1.1.1",
3838
"php-http/react-adapter": "^0.2.1",
3939
"php-http/buzz-adapter": "^0.3",
40-
"symfony/symfony": "^2.7 || ^3.0",
40+
"symfony/symfony": "^2.8 || ^3.0",
4141
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
4242
"matthiasnoback/symfony-dependency-injection-test": "^1.0"
4343
},

0 commit comments

Comments
 (0)