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

Commit

Permalink
Merge pull request #68 from symfony-cmf/prepare_release
Browse files Browse the repository at this point in the history
prepare version 2.0.0 release
  • Loading branch information
ElectricMaxxx authored Jul 14, 2017
2 parents 3a3e7f9 + 40e13a5 commit 61c5454
Show file tree
Hide file tree
Showing 12 changed files with 732 additions and 308 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ language: php
php:
- 5.6
- 7.0
- hhvm

sudo: false

Expand All @@ -20,6 +19,8 @@ matrix:
include:
- php: 7.1
env: COMPOSER_CMD=install
- php: hhvm
dist: trusty

before_install:
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
Expand All @@ -32,7 +33,7 @@ before_script:
- bin/console doctrine:phpcr:init:dbal --force -e=test
- bin/console doctrine:phpcr:repository:init -e=test

script: phpunit
script: make test

notifications:
irc: "irc.freenode.org#symfony-cmf"
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Makefile symfony-cmf/standard-edition

test:
vendor/bin/simple-phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
9 changes: 9 additions & 0 deletions app/AppCache.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of the Symfony CMF package.
*
* (c) 2011-2017 Symfony CMF
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;

class AppCache extends HttpCache
Expand Down
9 changes: 9 additions & 0 deletions app/AppKernel.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of the Symfony CMF package.
*
* (c) 2011-2017 Symfony CMF
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\Config\Loader\LoaderInterface;

Expand Down
9 changes: 9 additions & 0 deletions app/autoload.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of the Symfony CMF package.
*
* (c) 2011-2017 Symfony CMF
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

use Doctrine\Common\Annotations\AnnotationRegistry;
use Composer\Autoload\ClassLoader;

Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@
"liip/functional-test-bundle": "~1.0",
"sensio/generator-bundle": "~3.0",
"incenteev/composer-parameter-handler": "~2.0",
"symfony/phpunit-bridge": "~3.0"
"symfony/phpunit-bridge": "^3.3"
},
"minimum-stability": "RC",
"prefer-stable": true,
"scripts": {
"symfony-scripts": [
Expand Down
Loading

0 comments on commit 61c5454

Please sign in to comment.