Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 9808641

Browse files
ElectricMaxxxdbu
authored andcommitted
DevKit updates - Prepare Release (#350)
* DevKit updates * prepare release
1 parent 2befe17 commit 9808641

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ env:
3737
matrix:
3838
include:
3939
- php: 7.2
40-
env: STABILITY=dev SYMFONY_VERSION=4.0.*
40+
env: SYMFONY_VERSION=4.0.*
4141
- php: 7.1
42-
env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
42+
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
4343
- php: 7.2
44-
env: STABILITY=dev SYMFONY_VERSION=3.3.*
44+
env: SYMFONY_VERSION=3.3.*
4545
- php: 7.2
46-
env: STABILITY=dev SYMFONY_VERSION=3.4.*
46+
env: SYMFONY_VERSION=3.4.*
4747
- env: TEST_INSTALLATION=true
4848
fast_finish: true
4949
allow_failures:
@@ -52,12 +52,12 @@ matrix:
5252
before_install:
5353
- phpenv config-rm xdebug.ini || true
5454
- composer self-update
55+
- composer validate --no-check-all --ansi
5556
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
5657
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
5758
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
5859

5960
install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
60-
6161
script:
6262
- if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi
6363

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
Changelog
22
=========
33

4+
2.1.0
5+
-----
6+
7+
* Symfony 4 support
48
* **2016-12-15**: [BC BREAK] Removed SuggestionProviderController::addSuggestionProvider() method, use contructor
59
injection instead
6-
* **2017-11-15**: Removed php 5.6 and 7.0 support, removed Symfony 3.0.* and 3.1.* support
10+
* **2017-11-15**: Removed PHP 5.6 and 7.0 support, removed support for Symfony 3.0 - 3.2
711

812
2.0.0
913
-----

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
"require-dev": {
2424
"doctrine/phpcr-odm": "^1.4.2 || ^2.0",
2525
"doctrine/orm": "^2.4",
26-
"symfony-cmf/core-bundle": "^2.0",
27-
"symfony-cmf/routing-bundle": "^1.4.0|^2.0",
26+
"symfony-cmf/core-bundle": "^2.1",
27+
"symfony-cmf/routing-bundle": "^1.4.0 || ^2.1",
2828
"matthiasnoback/symfony-dependency-injection-test": "^1.1",
2929
"matthiasnoback/symfony-config-test": "^2.1",
3030
"symfony/phpunit-bridge": "^3.3 || ^4.0",
3131
"burgov/key-value-form-bundle": "^1.0",
32-
"symfony-cmf/testing": "^2.1@dev",
32+
"symfony-cmf/testing": "^2.1.9",
3333
"symfony/security-bundle": "^2.8 || ^3.3 || ^4.0",
3434
"symfony/translation": "^2.8 || ^3.3 || ^4.0",
3535
"symfony/validator": "^2.8 || ^3.3 || ^4.0",

tests/WebTest/SeoFrontendTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ public function testAlternateLanguages()
161161

162162
public function testErrorHandling()
163163
{
164-
$crawler = $this->client->request('GET', '/content/content-1/content-depp');
165-
$res = $this->client->getResponse();
164+
$crawler = $this->getClient()->request('GET', '/content/content-1/content-depp');
165+
$res = $this->getClient()->getResponse();
166166

167167
$this->assertEquals(404, $res->getStatusCode());
168168

@@ -173,14 +173,14 @@ public function testErrorHandling()
173173

174174
public function testErrorHandlingInvalidPhpcrPath()
175175
{
176-
$this->client->request('GET', '/content/content-1/content[a]b/sub?bla=blup');
177-
$this->assertEquals(404, $this->client->getResponse()->getStatusCode());
176+
$this->getClient()->request('GET', '/content/content-1/content[a]b/sub?bla=blup');
177+
$this->assertEquals(404, $this->getClient()->getResponse()->getStatusCode());
178178
}
179179

180180
public function testErrorHandlingForExcludedPath()
181181
{
182-
$crawler = $this->client->request('GET', '/content/content-1/content-excluded');
183-
$res = $this->client->getResponse();
182+
$crawler = $this->getClient()->request('GET', '/content/content-1/content-excluded');
183+
$res = $this->getClient()->getResponse();
184184

185185
$this->assertEquals(404, $res->getStatusCode());
186186

0 commit comments

Comments
 (0)