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

Commit

Permalink
DevKit updates - Prepare Release (#350)
Browse files Browse the repository at this point in the history
* DevKit updates

* prepare release
  • Loading branch information
ElectricMaxxx authored and dbu committed Aug 17, 2018
1 parent 2befe17 commit 9808641
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 15 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ env:
matrix:
include:
- php: 7.2
env: STABILITY=dev SYMFONY_VERSION=4.0.*
env: SYMFONY_VERSION=4.0.*
- php: 7.1
env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
- php: 7.2
env: STABILITY=dev SYMFONY_VERSION=3.3.*
env: SYMFONY_VERSION=3.3.*
- php: 7.2
env: STABILITY=dev SYMFONY_VERSION=3.4.*
env: SYMFONY_VERSION=3.4.*
- env: TEST_INSTALLATION=true
fast_finish: true
allow_failures:
Expand All @@ -52,12 +52,12 @@ matrix:
before_install:
- phpenv config-rm xdebug.ini || true
- composer self-update
- composer validate --no-check-all --ansi
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)

install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS

script:
- if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi

Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
Changelog
=========

2.1.0
-----

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

2.0.0
-----
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"require-dev": {
"doctrine/phpcr-odm": "^1.4.2 || ^2.0",
"doctrine/orm": "^2.4",
"symfony-cmf/core-bundle": "^2.0",
"symfony-cmf/routing-bundle": "^1.4.0|^2.0",
"symfony-cmf/core-bundle": "^2.1",
"symfony-cmf/routing-bundle": "^1.4.0 || ^2.1",
"matthiasnoback/symfony-dependency-injection-test": "^1.1",
"matthiasnoback/symfony-config-test": "^2.1",
"symfony/phpunit-bridge": "^3.3 || ^4.0",
"burgov/key-value-form-bundle": "^1.0",
"symfony-cmf/testing": "^2.1@dev",
"symfony-cmf/testing": "^2.1.9",
"symfony/security-bundle": "^2.8 || ^3.3 || ^4.0",
"symfony/translation": "^2.8 || ^3.3 || ^4.0",
"symfony/validator": "^2.8 || ^3.3 || ^4.0",
Expand Down
12 changes: 6 additions & 6 deletions tests/WebTest/SeoFrontendTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ public function testAlternateLanguages()

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

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

Expand All @@ -173,14 +173,14 @@ public function testErrorHandling()

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

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

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

Expand Down

0 comments on commit 9808641

Please sign in to comment.