Skip to content

Same unstable versioning as other packages #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 5, 2020
Merged

Same unstable versioning as other packages #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
064ab2f
require autoloader for tests only if available
flokixdev Jun 4, 2020
d6ff5d8
Same unstable versioning as other packages
flokixdev Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/)

Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -77,7 +77,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
"dev-master": "2.2.x-dev"
},
"hooks": {
"post-merge": "composer install",
Expand Down
12 changes: 6 additions & 6 deletions tests/Bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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();

Expand Down