Skip to content

bump symfony minimum version from 2.7 to 2.8 #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2017
Merged

bump symfony minimum version from 2.7 to 2.8 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ env:
- SYMFONY_VERSION=3.2.*
- SYMFONY_VERSION=3.1.*
- SYMFONY_VERSION=2.8.*
- SYMFONY_VERSION=2.7.*

branches:
except:
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
143 changes: 0 additions & 143 deletions Resources/views/Icon/httplug_old.svg
View file
Open in desktop

This file was deleted.

12 changes: 2 additions & 10 deletions Resources/views/webprofiler.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
},
Expand Down