Skip to content

Commit

Permalink
Require Nette 2.1 dev, alternative build is done agains 2.1 stable
Browse files Browse the repository at this point in the history
  • Loading branch information
fprochazka committed May 24, 2014
1 parent 52e915b commit ff470c0
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
language: php

env:
- NETTE=default # 2.1 dev
- NETTE=nette-2.1

php:
- 5.3.3
- 5.4
Expand All @@ -12,6 +16,7 @@ matrix:
- php: hhvm

before_script:
- "php tests/prepare-composer.php"
- composer self-update
- composer install --no-interaction --prefer-source --dev
- ./vendor/bin/parallel-lint -e php,phpt --exclude vendor .
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
},
"require": {
"nette/nette": "2.1.*@dev",

"symfony/translation": "~2.4",
"symfony/config": "~2.4"
},
Expand All @@ -27,7 +28,6 @@
"symfony/yaml": "If you wanna store translations in YAML format - supports multiline strings."
},
"require-dev": {
"nette/nette": "~2.2@rc",
"symfony/console": "~2.4",
"nette/tester": "@dev",
"jakub-onderka/php-parallel-lint": "~0.6"
Expand Down
48 changes: 48 additions & 0 deletions tests/composer-nette-2.1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"name": "kdyby/translation",
"type": "library",
"description": "Integration of Symfony/Translation into Nette Framework",
"keywords": ["nette", "kdyby", "translation"],
"homepage": "http://kdyby.org",
"license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
"authors": [
{
"name": "Filip Procházka",
"homepage": "http://filip-prochazka.com",
"email": "[email protected]"
}
],
"support": {
"email": "[email protected]",
"issues": "https://github.com/kdyby/translation/issues"
},
"require": {
"nette/nette": "2.1.*",

"symfony/translation": "~2.4",
"symfony/config": "~2.4"
},
"suggest": {
"symfony/locale": "Locale component provides fallback code to handle cases when the intl extension is missing.",
"kdyby/console": "If you wanna use extract command and much others, install also console.",
"symfony/yaml": "If you wanna store translations in YAML format - supports multiline strings."
},
"require-dev": {
"symfony/console": "~2.4",
"nette/tester": "@dev",
"jakub-onderka/php-parallel-lint": "~0.6"
},
"autoload": {
"psr-0": {
"Kdyby\\Translation": "src/"
},
"classmap": [
"src/Kdyby/Translation/exceptions.php"
]
},
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
}
}
}
16 changes: 16 additions & 0 deletions tests/prepare-composer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

$rootDir = __DIR__ . '/..';
$testsDir = __DIR__;

if (getenv('NETTE') !== 'default') {
$composerFile = $testsDir . '/composer-' . getenv('NETTE') . '.json';

unlink($rootDir . '/composer.json');
copy($composerFile, $rootDir . '/composer.json');

echo "Using tests/", basename($composerFile);

} else {
echo "Using default composer.json";
}

0 comments on commit ff470c0

Please sign in to comment.