From 6e9f59da79be089e678f76f81fb0c4392a0339e1 Mon Sep 17 00:00:00 2001 From: battye Date: Sun, 21 Apr 2019 15:39:26 +0000 Subject: [PATCH 1/2] Testing for forks --- composer.json | 6 ++++++ composer.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index b9e2486..20e7584 100644 --- a/composer.json +++ b/composer.json @@ -29,6 +29,12 @@ "require-dev": { "phpunit/phpunit": "~5.7" }, + "bin": [ + "translation.php" + ], + "config": { + "bin-dir": "bin" + }, "autoload": { "classmap": [ "src/", diff --git a/composer.lock b/composer.lock index 44944f4..05bbe54 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "battye/php-array-parser", - "version": "v1.0.4", + "version": "v1.0.5", "source": { "type": "git", "url": "https://github.com/battye/php-array-parser.git", - "reference": "51338002233f0cae30a6aadcd4f45819e1329d19" + "reference": "f82fa89d205dc549afa456222867cd0128f9f288" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/battye/php-array-parser/zipball/51338002233f0cae30a6aadcd4f45819e1329d19", - "reference": "51338002233f0cae30a6aadcd4f45819e1329d19", + "url": "https://api.github.com/repos/battye/php-array-parser/zipball/f82fa89d205dc549afa456222867cd0128f9f288", + "reference": "f82fa89d205dc549afa456222867cd0128f9f288", "shasum": "" }, "require": { @@ -42,7 +42,7 @@ "parser", "php" ], - "time": "2019-04-13T11:53:09+00:00" + "time": "2019-04-19T12:12:45+00:00" }, { "name": "psr/log", @@ -93,16 +93,16 @@ }, { "name": "symfony/console", - "version": "v3.4.24", + "version": "v3.4.26", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "98ae3cdc4bec48fe7ee24afc81dbb4a242186c9e" + "reference": "15a9104356436cb26e08adab97706654799d31d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/98ae3cdc4bec48fe7ee24afc81dbb4a242186c9e", - "reference": "98ae3cdc4bec48fe7ee24afc81dbb4a242186c9e", + "url": "https://api.github.com/repos/symfony/console/zipball/15a9104356436cb26e08adab97706654799d31d8", + "reference": "15a9104356436cb26e08adab97706654799d31d8", "shasum": "" }, "require": { @@ -161,20 +161,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-03-31T11:33:18+00:00" + "time": "2019-04-08T09:29:13+00:00" }, { "name": "symfony/debug", - "version": "v3.4.24", + "version": "v3.4.26", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "adbdd5d66342fb0a0bce7422ba68181842b6610d" + "reference": "681afbb26488903c5ac15e63734f1d8ac430c9b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/adbdd5d66342fb0a0bce7422ba68181842b6610d", - "reference": "adbdd5d66342fb0a0bce7422ba68181842b6610d", + "url": "https://api.github.com/repos/symfony/debug/zipball/681afbb26488903c5ac15e63734f1d8ac430c9b9", + "reference": "681afbb26488903c5ac15e63734f1d8ac430c9b9", "shasum": "" }, "require": { @@ -217,20 +217,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-03-10T17:07:42+00:00" + "time": "2019-04-11T09:48:14+00:00" }, { "name": "symfony/finder", - "version": "v3.4.24", + "version": "v3.4.26", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "fcdde4aa38f48190ce70d782c166f23930084f9b" + "reference": "61af5ce0b34b942d414fe8f1b11950d0e9a90e98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/fcdde4aa38f48190ce70d782c166f23930084f9b", - "reference": "fcdde4aa38f48190ce70d782c166f23930084f9b", + "url": "https://api.github.com/repos/symfony/finder/zipball/61af5ce0b34b942d414fe8f1b11950d0e9a90e98", + "reference": "61af5ce0b34b942d414fe8f1b11950d0e9a90e98", "shasum": "" }, "require": { @@ -266,7 +266,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-02-22T14:44:53+00:00" + "time": "2019-04-02T19:54:57+00:00" }, { "name": "symfony/polyfill-ctype", @@ -387,7 +387,7 @@ }, { "name": "symfony/yaml", - "version": "v3.4.24", + "version": "v3.4.26", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", From 1a3e5863ac30fb77c53dee0ef27d0b5eaaa36770 Mon Sep 17 00:00:00 2001 From: battye Date: Mon, 22 Apr 2019 02:14:31 +0000 Subject: [PATCH 2/2] Update include path for the autoload --- README.md | 4 ++-- translation.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5964382..520dfcf 100644 --- a/README.md +++ b/README.md @@ -45,9 +45,9 @@ Add the TranslationValidator as a dependency: } } -Then add the `php translation.php` call you run locally to your `.travis.yml` file. +Then add a `php vendor/bin/translation.php` call to your `.travis.yml` file. -We use Travis-CI as a continous intergtation server and phpunit for our unit testing. See more information on the [phpBB development wiki](https://wiki.phpbb.com/Unit_Tests). +We use Travis-CI as a continuous integration server and phpunit for our unit testing. See more information on the [phpBB development wiki](https://wiki.phpbb.com/Unit_Tests). To run the unit tests locally, use this command: diff --git a/translation.php b/translation.php index f6ec6fc..d366ea4 100644 --- a/translation.php +++ b/translation.php @@ -8,7 +8,7 @@ * */ -require __DIR__ . '/vendor/autoload.php'; +require 'vendor/autoload.php'; use Phpbb\TranslationValidator\Cli;