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

Commit

Permalink
Merge pull request #5 from coduo/travis-ci-config
Browse files Browse the repository at this point in the history
Added prefer lowest to composer update and droped php 5.3 support
  • Loading branch information
Norbert Orzechowicz committed Oct 24, 2015
2 parents 2780074 + e34eb25 commit f6c2a00
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 37 deletions.
24 changes: 17 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
language: php

php:
- 5.3
- 5.4
- 5.5
- 5.4
- 5.5
- 5.6

env:
- COMPOSER_OPTIONS='install --prefer-source'

matrix:
include:
- php: 5.4
env: COMPOSER_OPTIONS='update --prefer-lowest --prefer-source'

before_install:
- composer self-update

before_script:
- curl -s http://getcomposer.org/installer | php
- php composer.phar update
- COMPOSER_ROOT_VERSION=dev-master composer $COMPOSER_OPTIONS

script:
- bin/phpspec r -v
- bin/behat -v
- ./bin/phpspec run --format=dot
- ./bin/behat
1 change: 0 additions & 1 deletion behat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ default:
suites:
default:
contexts:
- FeatureContext
- PHPSpecContext
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@
}
],
"require": {
"php": ">=5.3.0",
"phpspec/phpspec": "2.0.*"
"php": ">=5.4.0",
"phpspec/phpspec": "^2"
},
"require-dev": {
"behat/behat": "3.0.*@stable",
"behat/behat": "3.0.15",
"symfony/filesystem": "~2.3",
"symfony/console": "~2.3.2",
"guzzle/http": "~3.0",
"bossa/phpspec2-expect": "dev-master"
"bossa/phpspec2-expect": "^1"
},
"autoload": {
"psr-0": { "Coduo\\PhpSpec": "src/"}
Expand Down
19 changes: 0 additions & 19 deletions features/bootstrap/FeatureContext.php

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace spec\Coduo\PhpSpec\Annotation;
namespace spec\Coduo\PhpSpec\PrepareExtension\Annotation;

use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace spec\Coduo\PhpSpec\Runner\Maintainer;
namespace spec\Coduo\PhpSpec\PrepareExtension\Runner\Maintainer;

use PhpSpec\Loader\Node\ExampleNode;
use PhpSpec\Loader\Node\SpecificationNode;
Expand Down
2 changes: 1 addition & 1 deletion src/Coduo/PhpSpec/PrepareExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Coduo\PhpSpec;

use Coduo\PhpSpec\Runner\Maintainer\BeforeMaintainer;
use Coduo\PhpSpec\PrepareExtension\Runner\Maintainer\BeforeMaintainer;
use PhpSpec\Extension\ExtensionInterface;
use PhpSpec\ServiceContainer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Coduo\PhpSpec\Annotation;
namespace Coduo\PhpSpec\PrepareExtension\Annotation;

class Parser
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Coduo\PhpSpec\Runner\Maintainer;
namespace Coduo\PhpSpec\PrepareExtension\Runner\Maintainer;

use Coduo\PhpSpec\Annotation\Parser;
use Coduo\PhpSpec\PrepareExtension\Annotation\Parser;
use PhpSpec\Loader\Node\ExampleNode;
use PhpSpec\Runner\Maintainer\MaintainerInterface;
use PhpSpec\SpecificationInterface;
Expand Down

0 comments on commit f6c2a00

Please sign in to comment.