From 064ab2ff7ba28fbb020bd9eccf144a2358f8d52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Havl=C3=AD=C4=8Dek?= Date: Thu, 4 Jun 2020 12:57:02 +0200 Subject: [PATCH 1/2] require autoloader for tests only if available --- tests/Bootstrap.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index ff47ac7..0de479d 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -5,15 +5,15 @@ namespace Mathematicator\Engine\Tests; -require __DIR__ . '/../vendor/autoload.php'; - - use Mathematicator\Engine\Translation\TranslatorHelper; use Nette\Configurator; use Nette\DI\Container; use Tester\Environment; -Environment::setup(); +if (\is_file($autoload = __DIR__ . '/../vendor/autoload.php')) { + require_once $autoload; + Environment::setup(); +} class Bootstrap { @@ -29,8 +29,8 @@ public static function boot(): Container ->register(); $configurator - ->addConfig(__DIR__ . '/../common.neon') - ->addConfig(__DIR__ . '/../vendor/mathematicator-core/tokenizer/common.neon'); + ->addConfig(__DIR__ . '/../vendor/mathematicator-core/tokenizer/common.neon') + ->addConfig(__DIR__ . '/../common.neon'); $container = $configurator->createContainer(); From d6ff5d8e194b351f21b7cdb84db47844e0e1fd52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Havl=C3=AD=C4=8Dek?= Date: Fri, 5 Jun 2020 11:51:55 +0200 Subject: [PATCH 2/2] Same unstable versioning as other packages --- README.md | 3 ++- composer.json | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3c50fd9..fb38c8a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,8 @@ [![Integrity check](https://github.com/mathematicator-core/engine/workflows/Integrity%20check/badge.svg)](https://github.com/mathematicator-core/engine/actions?query=workflow%3A%22Integrity+check%22) [![codecov](https://codecov.io/gh/mathematicator-core/engine/branch/master/graph/badge.svg)](https://codecov.io/gh/mathematicator-core/engine) -[![Latest stable version](https://poser.pugx.org/mathematicator-core/engine/v/stable)](https://packagist.org/packages/mathematicator-core/engine) +[![Latest Stable Version](https://poser.pugx.org/mathematicator-core/engine/v/stable)](https://packagist.org/packages/mathematicator-core/engine) +[![Latest Unstable Version](https://poser.pugx.org/mathematicator-core/engine/v/unstable)](https://packagist.org/packages/mathematicator-core/engine) [![License: MIT](https://img.shields.io/badge/License-MIT-brightgreen.svg)](./LICENSE) [![PHPStan Enabled](https://img.shields.io/badge/PHPStan-enabled%20L8-brightgreen.svg?style=flat)](https://phpstan.org/) diff --git a/composer.json b/composer.json index f546b44..b0cc265 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,8 @@ "require": { "php": ">=7.2", "contributte/psr11-container-interface": "^0.4.1", - "mathematicator-core/numbers": "^2.1@dev", - "mathematicator-core/tokenizer": "^2.1@dev", + "mathematicator-core/numbers": "^2.2@dev", + "mathematicator-core/tokenizer": "^2.2@dev", "nette/di": "^3.0", "nette/utils": "^3.0", "symfony/yaml": "^5.0", @@ -77,7 +77,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "2.2.x-dev" }, "hooks": { "post-merge": "composer install",