Skip to content

Commit 1b9eecb

Browse files
author
Alexandre Guidet
committed
Merge branch 'release-3.6.0'
2 parents dce07ad + dad66df commit 1b9eecb

5 files changed

Lines changed: 27 additions & 12 deletions

File tree

.travis.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
language: php
2+
3+
php:
4+
- '5.6'
5+
- '7.0'
6+
- hhvm
7+
8+
install:
9+
- composer install
10+
11+
notifications:
12+
on_success: always
13+
on_failure: always
14+
15+
sudo: false

Migrate/Command/AbstractEnvCommand.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ protected function init(InputInterface $input, OutputInterface $output, $env = n
7171

7272
$envFile = $locator->locate($env . '.yml');
7373

74-
$loader = new Yaml();
75-
$conf = $loader->parse($envFile);
74+
$conf = Yaml::parse(file_get_contents($envFile));
7675

7776
$this->config = $conf;
7877

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
PhpDbMigration - full PHP database migration tool
22
=================================================
33

4+
[![Build Status](https://travis-ci.org/alwex/php-database-migration.svg?branch=master)](https://travis-ci.org/alwex/php-database-migration)
45
[![Packagist](https://img.shields.io/packagist/dt/php-database-migration/php-database-migration.svg?maxAge=2592000)]()
56

67
This is a full standalone PHP tool based on [Symfony Console](http://symfony.com/doc/current/components/console)

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"symfony/process": "~2.6",
1818
"symfony/config": "~2.6",
1919
"cocur/slugify": "~1.0",
20-
"symfony/yaml": "~2.6"
20+
"symfony/yaml": "~3.1"
2121
},
2222
"require-dev": {
2323
"phpunit/phpunit": "*"

composer.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)