From 555985b05165e5db943dca3366d0db8b7b30ef1c Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 25 Oct 2017 20:14:30 +0100 Subject: [PATCH 01/23] Renamed documentation directory: doc -> docs --- .gitattributes | 18 ++++++++++-------- .gitignore | 15 +++------------ {doc => docs}/book/console-helper.md | 0 {doc => docs}/book/index.html | 0 {doc => docs}/book/index.md | 0 {doc => docs}/book/migration.md | 0 {doc => docs}/bookdown.json | 0 mkdocs.yml | 4 ++-- 8 files changed, 15 insertions(+), 22 deletions(-) rename {doc => docs}/book/console-helper.md (100%) rename {doc => docs}/book/index.html (100%) rename {doc => docs}/book/index.md (100%) rename {doc => docs}/book/migration.md (100%) rename {doc => docs}/bookdown.json (100%) diff --git a/.gitattributes b/.gitattributes index c1ba0e6b8..fa5218242 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,9 +1,11 @@ +/benchmarks export-ignore +/docs export-ignore /test export-ignore -/vendor export-ignore -.coveralls.yml export-ignore -.gitattributes export-ignore -.gitignore export-ignore -.travis.yml export-ignore -.composer.lock export-ignore -phpbench.json export-ignore -phpunit.xml.dist export-ignore +/.coveralls.yml export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore +/.travis.yml export-ignore +/composer.lock export-ignore +/mkdocs.yml export-ignore +/phpcs.xml export-ignore +/phpunit.xml.dist export-ignore diff --git a/.gitignore b/.gitignore index 673fe323d..9e6850012 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,7 @@ -.buildpath -.DS_Store -.idea -.project -.settings/ -.*.sw* -.*.un~ -nbproject -doc/html/ -tmp/ +docs/html/ +vendor/ zf-mkdoc-theme/ - clover.xml coveralls-upload.json phpunit.xml -vendor +zf-mkdoc-theme.tgz diff --git a/doc/book/console-helper.md b/docs/book/console-helper.md similarity index 100% rename from doc/book/console-helper.md rename to docs/book/console-helper.md diff --git a/doc/book/index.html b/docs/book/index.html similarity index 100% rename from doc/book/index.html rename to docs/book/index.html diff --git a/doc/book/index.md b/docs/book/index.md similarity index 100% rename from doc/book/index.md rename to docs/book/index.md diff --git a/doc/book/migration.md b/docs/book/migration.md similarity index 100% rename from doc/book/migration.md rename to docs/book/migration.md diff --git a/doc/bookdown.json b/docs/bookdown.json similarity index 100% rename from doc/bookdown.json rename to docs/bookdown.json diff --git a/mkdocs.yml b/mkdocs.yml index 89f84200d..6e381541d 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,5 +1,5 @@ -docs_dir: doc/book -site_dir: doc/html +docs_dir: docs/book +site_dir: docs/html pages: - index.md - Reference: From d7b622c2a8fc2ce092e3d016b7ca1e3f3ba5538a Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 25 Oct 2017 20:15:25 +0100 Subject: [PATCH 02/23] Suport files moved into docs directory + update --- CONDUCT.md => docs/CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md => docs/CONTRIBUTING.md | 105 ++++++------------------ docs/SUPPORT.md | 25 ++++++ 3 files changed, 51 insertions(+), 81 deletions(-) rename CONDUCT.md => docs/CODE_OF_CONDUCT.md (96%) rename CONTRIBUTING.md => docs/CONTRIBUTING.md (50%) create mode 100644 docs/SUPPORT.md diff --git a/CONDUCT.md b/docs/CODE_OF_CONDUCT.md similarity index 96% rename from CONDUCT.md rename to docs/CODE_OF_CONDUCT.md index c663d2be9..02fafcd1a 100644 --- a/CONDUCT.md +++ b/docs/CODE_OF_CONDUCT.md @@ -1,6 +1,6 @@ # Contributor Code of Conduct -The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com) +This project adheres to [The Code Manifesto](http://codemanifesto.com) as its guidelines for contributor interactions. ## The Code Manifesto diff --git a/CONTRIBUTING.md b/docs/CONTRIBUTING.md similarity index 50% rename from CONTRIBUTING.md rename to docs/CONTRIBUTING.md index 39327161b..afefd0811 100644 --- a/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -2,73 +2,43 @@ ## RESOURCES -If you wish to contribute to Zend Framework, please be sure to +If you wish to contribute to this project, please be sure to read/subscribe to the following resources: - - [Coding Standards](/~https://github.com/zendframework/zf2/wiki/Coding-Standards) - - [Contributor's Guide](http://framework.zend.com/participate/contributor-guide) - - ZF Contributor's mailing list: - Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html - Subscribe: zf-contributors-subscribe@lists.zend.com - - ZF Contributor's IRC channel: - #zftalk.dev on Freenode.net + - [Coding Standards](/~https://github.com/zendframework/zend-coding-standard) + - [Forums](https://discourse.zendframework.com/c/contributors) + - [Slack](https://zendframework-slack.herokuapp.com) + - [Code of Conduct](CODE_OF_CONDUCT.md) -If you are working on new features or refactoring [create a proposal](/~https://github.com/zendframework/zend-stdlib/issues/new). - -## Reporting Potential Security Issues - -If you have encountered a potential security vulnerability, please **DO NOT** report it on the public -issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead. -We will work with you to verify the vulnerability and patch it as soon as possible. - -When reporting issues, please provide the following information: - -- Component(s) affected -- A description indicating how to reproduce the issue -- A summary of the security vulnerability and impact - -We request that you contact us via the email address above and give the project -contributors a chance to resolve the vulnerability and issue a new release prior -to any public exposure; this helps protect users and provides them with a chance -to upgrade and/or update in order to protect their applications. - -For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc). +If you are working on new features or refactoring +[create a proposal](/~https://github.com/zendframework/zend-stdlib/issues/new). ## RUNNING TESTS -> ### Note: testing versions prior to 2.4 -> -> This component originates with Zend Framework 2. During the lifetime of ZF2, -> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no -> changes were necessary. However, due to the migration, tests may not run on -> versions < 2.4. As such, you may need to change the PHPUnit dependency if -> attempting a fix on such a version. - To run tests: - Clone the repository: ```console - $ git clone git@github.com:zendframework/zend-stdlib.git - $ cd + $ git clone git://github.com/zendframework/zend-stdlib.git + $ cd zend-stdlib ``` - Install dependencies via composer: ```console - $ curl -sS https://getcomposer.org/installer | php -- - $ ./composer.phar install + $ composer install ``` - If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/ + If you don't have `composer` installed, please download it from https://getcomposer.org/download/ -- Run the tests via `phpunit` and the provided PHPUnit config, like in this example: +- Run the tests using the "test" command shipped in the `composer.json`: ```console - $ ./vendor/bin/phpunit + $ composer test ``` -You can turn on conditional tests with the phpunit.xml file. +You can turn on conditional tests with the `phpunit.xml` file. To do so: - Copy `phpunit.xml.dist` file to `phpunit.xml` @@ -77,48 +47,36 @@ To do so: ## Running Coding Standards Checks -This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding -standards checks, and provides configuration for our selected checks. -`php-cs-fixer` is installed by default via Composer. +First, ensure you've installed dependencies via composer, per the previous +section on running tests. -To run checks only: +To run CS checks only: ```console -$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs +$ composer cs-check ``` -To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run` -flag: +To attempt to automatically fix common CS issues: ```console -$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs +$ composer cs-fix ``` -If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure +If the above fixes any CS issues, please re-run the tests to ensure they pass, and make sure you add and commit the changes after verification. -## Benchmarks - -We provide benchmark tests for zend-stdlib under the directory [benchmark/](benchmark/), -using. [athletic](/~https://github.com/polyfractal/athletic). You can execute -the benchmarks running the following command: - -```bash -$ ./vendor/bin/athletic -p benchmark -``` - ## Recommended Workflow for Contributions Your first step is to establish a public repository from which we can pull your work into the master repository. We recommend using [GitHub](https://github.com), as that is where the component is already hosted. -1. Setup a [GitHub account](http://github.com/), if you haven't yet -2. Fork the repository (http://github.com/zendframework/zend-stdlib) +1. Setup a [GitHub account](/~https://github.com/), if you haven't yet +2. Fork the repository (/~https://github.com/zendframework/zend-stdlib) 3. Clone the canonical repository locally and enter it. ```console - $ git clone git://github.com:zendframework/zend-stdlib.git + $ git clone git://github.com/zendframework/zend-stdlib.git $ cd zend-stdlib ``` @@ -198,15 +156,7 @@ To send a pull request, you have two options. If using GitHub, you can do the pull request from there. Navigate to your repository, select the branch you just created, and then select the "Pull Request" button in the upper right. Select the user/organization -"zendframework" as the recipient. - -If using your own repository - or even if using GitHub - you can use `git -format-patch` to create a patchset for us to apply; in fact, this is -**recommended** for security-related patches. If you use `format-patch`, please -send the patches as attachments to: - -- zf-devteam@zend.com for patches without security implications -- zf-security@zend.com for security patches +"zendframework" (or whatever the upstream organization is) as the recipient. #### What branch to issue the pull request against? @@ -237,8 +187,3 @@ repository, we suggest doing some cleanup of these branches. ```console $ git push {username} : ``` - - -## Conduct - -Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project. diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md new file mode 100644 index 000000000..82a7461bc --- /dev/null +++ b/docs/SUPPORT.md @@ -0,0 +1,25 @@ +# Getting Support + +Zend Framework offers three support channels: + +- For real-time questions, use our + [Slack](https://zendframework-slack.herokuapp.com) +- For detailed questions (e.g., those requiring examples) use our + [forums](https://discourse.zendframework.com/c/questions/components) +- To report issues, use this repository's + [issue tracker](/~https://github.com/zendframework/zend-stdlib/issues/new) + +**DO NOT** use the issue tracker to ask questions; use Slack or the forums for +that. Questions posed to the issue tracker will be closed. + +When reporting an issue, please include the following details: + +- A narrative description of what you are trying to accomplish. +- The minimum code necessary to reproduce the issue. +- The expected results of exercising that code. +- The actual results received. + +We may ask for additional details: what version of the library you are using, +and what PHP version was used to reproduce the issue. + +You may also submit a failing test case as a pull request. From 1e1e63c6beaf6e67a99bfaa727693e6264630745 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 25 Oct 2017 20:16:21 +0100 Subject: [PATCH 03/23] Renamed directory with benchmarks -> "benchmark" --- README.md | 2 +- {benchmarks => benchmark}/ExtractPriorityQueueBench.php | 0 {benchmarks => benchmark}/InsertPriorityQueueBench.php | 0 {benchmarks => benchmark}/RemovePriorityQueueBench.php | 0 phpbench.json | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) rename {benchmarks => benchmark}/ExtractPriorityQueueBench.php (100%) rename {benchmarks => benchmark}/InsertPriorityQueueBench.php (100%) rename {benchmarks => benchmark}/RemovePriorityQueueBench.php (100%) diff --git a/README.md b/README.md index 46fdda951..2dc975bf4 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ class for different scopes like: We provide scripts for benchmarking zend-stdlib using the [PHPBench](/~https://github.com/phpbench/phpbench) framework; these can be -found in the `benchmarks/` directory. +found in the `benchmark/` directory. To execute the benchmarks you can run the following command: diff --git a/benchmarks/ExtractPriorityQueueBench.php b/benchmark/ExtractPriorityQueueBench.php similarity index 100% rename from benchmarks/ExtractPriorityQueueBench.php rename to benchmark/ExtractPriorityQueueBench.php diff --git a/benchmarks/InsertPriorityQueueBench.php b/benchmark/InsertPriorityQueueBench.php similarity index 100% rename from benchmarks/InsertPriorityQueueBench.php rename to benchmark/InsertPriorityQueueBench.php diff --git a/benchmarks/RemovePriorityQueueBench.php b/benchmark/RemovePriorityQueueBench.php similarity index 100% rename from benchmarks/RemovePriorityQueueBench.php rename to benchmark/RemovePriorityQueueBench.php diff --git a/phpbench.json b/phpbench.json index f7b810369..7d6181f3e 100644 --- a/phpbench.json +++ b/phpbench.json @@ -1,5 +1,5 @@ { "bootstrap": "vendor/autoload.php", - "path": "benchmarks", + "path": "benchmark", "retry_threshold": 5 } From 7c974a30fa447a00e2c9a05fcb8c8eaaec690c8c Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 25 Oct 2017 20:19:30 +0100 Subject: [PATCH 04/23] Updated year in mkdocs.yml and LICENSE.md --- LICENSE.md | 12 ++++++------ mkdocs.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index dbb1b49c0..3846b8c21 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,16 +1,16 @@ -Copyright (c) 2005-2015, Zend Technologies USA, Inc. +Copyright (c) 2005-2017, Zend Technologies USA, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -- Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. +- Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. +- Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. - Neither the name of Zend Technologies USA, Inc. nor the names of its contributors may be used to endorse or promote products derived from this diff --git a/mkdocs.yml b/mkdocs.yml index 6e381541d..ee243e5cb 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -8,4 +8,4 @@ pages: site_name: zend-stdlib site_description: Zend\Stdlib repo_url: '/~https://github.com/zendframework/zend-stdlib' -copyright: 'Copyright (c) 2016 Zend Technologies USA Inc.' +copyright: 'Copyright (c) 2017 Zend Technologies USA Inc.' From 6e9335b074a88a4f68b3fc37a92efd3c77f4097b Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 25 Oct 2017 20:22:48 +0100 Subject: [PATCH 05/23] Updated composer skeleton --- composer.json | 35 +++++++++++++++++++++++------------ composer.lock | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index e221dbc99..1bf2efdc5 100644 --- a/composer.json +++ b/composer.json @@ -1,29 +1,31 @@ { "name": "zendframework/zend-stdlib", - "description": " ", + "description": "SPL extensions, array utilities, error handlers, and more", + "type": "library", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "stdlib" ], - "homepage": "/~https://github.com/zendframework/zend-stdlib", - "autoload": { - "psr-4": { - "Zend\\Stdlib\\": "src/" - } + "support": { + "docs": "https://docs.zendframework.com/zend-stdlib/", + "issues": "/~https://github.com/zendframework/zend-stdlib/issues", + "source": "/~https://github.com/zendframework/zend-stdlib", + "slack": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { "php": "^5.6 || ^7.0" }, "require-dev": { "phpbench/phpbench": "^0.13", - "phpunit/PHPUnit": "^5.7.21 || ^6.3", + "phpunit/phpunit": "^5.7.23 || ^6.4.3", "zendframework/zend-coding-standard": "~1.0.0" }, - "extra": { - "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "autoload": { + "psr-4": { + "Zend\\Stdlib\\": "src/" } }, "autoload-dev": { @@ -32,6 +34,15 @@ "ZendBench\\Stdlib\\": "benchmark/" } }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" + } + }, "scripts": { "check": [ "@cs-check", diff --git a/composer.lock b/composer.lock index ee43dacd2..31b3ee6a9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "6fa4b5a45d377d9562bb5b894c005faf", + "content-hash": "6077a20b2a83ed8b93e603aaac911c37", "packages": [], "packages-dev": [ { From a54ad0c623a6733529e1152d14ded0f2bfb00b7d Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 25 Oct 2017 20:24:05 +0100 Subject: [PATCH 06/23] Fixed directory name in .gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index fa5218242..23fba580d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ -/benchmarks export-ignore +/benchmark export-ignore /docs export-ignore /test export-ignore /.coveralls.yml export-ignore From 04ee848b7ef7d73793bc0d5608f88bfb6ccf5590 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 25 Oct 2017 20:36:10 +0100 Subject: [PATCH 07/23] Added rss link in composer.json - per @froschdesign --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 1bf2efdc5..431669a38 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ "docs": "https://docs.zendframework.com/zend-stdlib/", "issues": "/~https://github.com/zendframework/zend-stdlib/issues", "source": "/~https://github.com/zendframework/zend-stdlib", + "rss": "/~https://github.com/zendframework/zend-stdlib/releases.atom", "slack": "https://zendframework-slack.herokuapp.com", "forum": "https://discourse.zendframework.com/c/questions/components" }, From d58731221f39c2ef5a2bf2c75b3e8c155b20db4e Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 25 Oct 2017 20:37:10 +0100 Subject: [PATCH 08/23] Removed type "library" in composer.json as it is default type - per @froschdesign --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 431669a38..4753e0f09 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,6 @@ { "name": "zendframework/zend-stdlib", "description": "SPL extensions, array utilities, error handlers, and more", - "type": "library", "license": "BSD-3-Clause", "keywords": [ "zf", From 7ce966445edf1d5c4d849c4042d5665be50952d3 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 25 Oct 2017 20:52:04 +0100 Subject: [PATCH 09/23] Updated PHPUnit configuration --- phpunit.xml.dist | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 8205e0f18..fb62eb779 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,34 +1,25 @@ - ./test/ + ./test - - - disable - - - - + ./src - - - From 11ccc1be8c533bbd5b3919dbb68c51c2b9db86e3 Mon Sep 17 00:00:00 2001 From: webimpress Date: Thu, 2 Nov 2017 18:51:43 +0000 Subject: [PATCH 10/23] Removed unused redundant PHPUnit bootstrap --- test/bootstrap.php | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 test/bootstrap.php diff --git a/test/bootstrap.php b/test/bootstrap.php deleted file mode 100644 index 022faaa73..000000000 --- a/test/bootstrap.php +++ /dev/null @@ -1,23 +0,0 @@ - Date: Thu, 2 Nov 2017 18:51:55 +0000 Subject: [PATCH 11/23] Removed unused PHPUnit env variable --- phpunit.xml.dist | 8 -------- 1 file changed, 8 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index fb62eb779..00bc6dd6f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,12 +14,4 @@ ./src - - - - - From bc9abef1449fb431d54ef613b030384785a3354e Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 8 Nov 2017 13:25:23 +0000 Subject: [PATCH 12/23] Added phpbench.json into .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 23fba580d..fe09e4667 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,5 +7,6 @@ /.travis.yml export-ignore /composer.lock export-ignore /mkdocs.yml export-ignore +/phpbench.json export-ignore /phpcs.xml export-ignore /phpunit.xml.dist export-ignore From c946176a4fa1774cc00458aa37ebf752e61c68f5 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 8 Nov 2017 13:25:33 +0000 Subject: [PATCH 13/23] Removed empty line in LICENSE.md --- LICENSE.md | 1 - 1 file changed, 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 3846b8c21..63df4102c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,5 +1,4 @@ Copyright (c) 2005-2017, Zend Technologies USA, Inc. - All rights reserved. Redistribution and use in source and binary forms, with or without modification, From d769ba4901aaee7a7a4e2985f4ec6df62ba68998 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 8 Nov 2017 13:25:49 +0000 Subject: [PATCH 14/23] Updated coverage badge in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2dc975bf4..8d9ff96cc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # zend-stdlib [![Build Status](https://secure.travis-ci.org/zendframework/zend-stdlib.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-stdlib) -[![Coverage Status](https://coveralls.io/repos/zendframework/zend-stdlib/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-stdlib?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-stdlib/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-stdlib?branch=master) `Zend\Stdlib` is a set of components that implements general purpose utility class for different scopes like: From 49be59e9a339bef5fa58f27a1b7be8107866a645 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 8 Nov 2017 13:26:04 +0000 Subject: [PATCH 15/23] Added ISSUE and PR templates --- docs/ISSUE_TEMPLATE.md | 19 +++++++++++++++++++ docs/PULL_REQUEST_TEMPLATE.md | 25 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 docs/ISSUE_TEMPLATE.md create mode 100644 docs/PULL_REQUEST_TEMPLATE.md diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..55d129570 --- /dev/null +++ b/docs/ISSUE_TEMPLATE.md @@ -0,0 +1,19 @@ + - [ ] I was not able to find an [open](/~https://github.com/zendframework/zend-stdlib/issues?q=is%3Aopen) or [closed](/~https://github.com/zendframework/zend-stdlib/issues?q=is%3Aclosed) issue matching what I'm seeing. + - [ ] This is not a question. (Questions should be asked on [slack](https://zendframework.slack.com/) ([Signup for Slack here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).) + +Provide a narrative description of what you are trying to accomplish. + +### Code to reproduce the issue + + + +```php +``` + +### Expected results + + + +### Actual results + + diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..f00d90c06 --- /dev/null +++ b/docs/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,25 @@ +Provide a narrative description of what you are trying to accomplish: + +- [ ] Are you fixing a bug? + - [ ] Detail how the bug is invoked currently. + - [ ] Detail the original, incorrect behavior. + - [ ] Detail the new, expected behavior. + - [ ] Base your feature on the `master` branch, and submit against that branch. + - [ ] Add a regression test that demonstrates the bug, and proves the fix. + - [ ] Add a `CHANGELOG.md` entry for the fix. + +- [ ] Are you creating a new feature? + - [ ] Why is the new feature needed? What purpose does it serve? + - [ ] How will users use the new feature? + - [ ] Base your feature on the `develop` branch, and submit against that branch. + - [ ] Add only one feature per pull request; split multiple features over multiple pull requests + - [ ] Add tests for the new feature. + - [ ] Add documentation for the new feature. + - [ ] Add a `CHANGELOG.md` entry for the new feature. + +- [ ] Is this related to quality assurance? + + +- [ ] Is this related to documentation? + + From 18a1beaf8294bf93676a267f6faba469178d4f09 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 8 Nov 2017 21:55:12 +0000 Subject: [PATCH 16/23] Updated .gitattributes and .gitignore - natsort --- .gitattributes | 6 +++--- .gitignore | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitattributes b/.gitattributes index fe09e4667..b488837aa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,12 +1,12 @@ -/benchmark export-ignore -/docs export-ignore -/test export-ignore /.coveralls.yml export-ignore /.gitattributes export-ignore /.gitignore export-ignore /.travis.yml export-ignore +/benchmark export-ignore /composer.lock export-ignore +/docs/ export-ignore /mkdocs.yml export-ignore /phpbench.json export-ignore /phpcs.xml export-ignore /phpunit.xml.dist export-ignore +/test/ export-ignore diff --git a/.gitignore b/.gitignore index 9e6850012..245087af8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -docs/html/ -vendor/ -zf-mkdoc-theme/ -clover.xml -coveralls-upload.json -phpunit.xml -zf-mkdoc-theme.tgz +/clover.xml +/coveralls-upload.json +/docs/html/ +/phpunit.xml +/vendor/ +/zf-mkdoc-theme.tgz +/zf-mkdoc-theme/ From 6dcbd675bfd0a7c25ceb85682ea0adb224e71078 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 8 Nov 2017 21:55:34 +0000 Subject: [PATCH 17/23] Updated copyright year range in mkdocs.yml to match LICENSE.md --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index ee243e5cb..6e258b589 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -8,4 +8,4 @@ pages: site_name: zend-stdlib site_description: Zend\Stdlib repo_url: '/~https://github.com/zendframework/zend-stdlib' -copyright: 'Copyright (c) 2017 Zend Technologies USA Inc.' +copyright: 'Copyright (c) 2005-2017 Zend Technologies USA Inc.' From b7f954e2bf6354d8b81518feefa9916c77a98b07 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 22 Nov 2017 09:04:45 +0000 Subject: [PATCH 18/23] Removed white characters at the end of the line in the docs --- docs/book/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/book/index.html b/docs/book/index.html index f4b09ab44..680275458 100644 --- a/docs/book/index.html +++ b/docs/book/index.html @@ -1,7 +1,7 @@

zend-stdlib

- +

SPL extensions, array utilities, error handlers, and more.

$ composer require zendframework/zend-stdlib
From e152aee14e11eccc41fe2245142db8620fa01bf4 Mon Sep 17 00:00:00 2001 From: webimpress Date: Thu, 12 Apr 2018 09:15:22 +0100 Subject: [PATCH 19/23] Updated php-coveralls - removed composer upload-coverage script - updated Travis CI config --- .travis.yml | 5 ++--- composer.json | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cd84eb70..d7f816860 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ cache: env: global: - COMPOSER_ARGS="--no-interaction" - - COVERAGE_DEPS="satooshi/php-coveralls" + - COVERAGE_DEPS="php-coveralls/php-coveralls" matrix: include: @@ -57,7 +57,6 @@ matrix: before_install: - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi - - travis_retry composer self-update install: - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs @@ -73,7 +72,7 @@ script: - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi after_script: - - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi + - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi notifications: email: false diff --git a/composer.json b/composer.json index 4753e0f09..e0a0eaa67 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,6 @@ "cs-check": "phpcs", "cs-fix": "phpcbf", "test": "phpunit --colors=always", - "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", - "upload-coverage": "coveralls -v" + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" } } From 09b84a240dc70da3e6630b790289e587a24b37e2 Mon Sep 17 00:00:00 2001 From: webimpress Date: Thu, 12 Apr 2018 09:15:43 +0100 Subject: [PATCH 20/23] Updated copyright year range in LICENSE.md and mkdocs.yml --- LICENSE.md | 2 +- mkdocs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 63df4102c..d44ab5dc7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2005-2017, Zend Technologies USA, Inc. +Copyright (c) 2005-2018, Zend Technologies USA, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/mkdocs.yml b/mkdocs.yml index 6e258b589..85c68b11e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -8,4 +8,4 @@ pages: site_name: zend-stdlib site_description: Zend\Stdlib repo_url: '/~https://github.com/zendframework/zend-stdlib' -copyright: 'Copyright (c) 2005-2017 Zend Technologies USA Inc.' +copyright: 'Copyright (c) 2005-2018 Zend Technologies USA Inc.' From 8695661b84c5874d1086fc3dda38ab1ea2938639 Mon Sep 17 00:00:00 2001 From: webimpress Date: Thu, 12 Apr 2018 09:16:03 +0100 Subject: [PATCH 21/23] Updated link to https in mkdocs.yml --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 85c68b11e..09d9ba600 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -8,4 +8,4 @@ pages: site_name: zend-stdlib site_description: Zend\Stdlib repo_url: '/~https://github.com/zendframework/zend-stdlib' -copyright: 'Copyright (c) 2005-2018 Zend Technologies USA Inc.' +copyright: 'Copyright (c) 2005-2018 Zend Technologies USA Inc.' From 63c15f029fb1001ed093e9833c0da11105cd5ac6 Mon Sep 17 00:00:00 2001 From: webimpress Date: Thu, 12 Apr 2018 09:25:44 +0100 Subject: [PATCH 22/23] Updated branch aliases in composer.json and deps to allow PHPUnit 7 --- composer.json | 6 +- composer.lock | 411 ++++++++++++++++++++++++-------------------------- 2 files changed, 197 insertions(+), 220 deletions(-) diff --git a/composer.json b/composer.json index e0a0eaa67..41bffd888 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ }, "require-dev": { "phpbench/phpbench": "^0.13", - "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", "zendframework/zend-coding-standard": "~1.0.0" }, "autoload": { @@ -39,8 +39,8 @@ }, "extra": { "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "dev-master": "3.1.x-dev", + "dev-develop": "3.2.x-dev" } }, "scripts": { diff --git a/composer.lock b/composer.lock index 31b3ee6a9..93879cb8b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "6077a20b2a83ed8b93e603aaac911c37", + "content-hash": "dac90bf8b7bb16083fd10989f78f3d7b", "packages": [], "packages-dev": [ { "name": "beberlei/assert", - "version": "v2.7.8", + "version": "v2.9.4", "source": { "type": "git", "url": "/~https://github.com/beberlei/assert.git", - "reference": "be6aa40e3f2d2f0766f159409ab9a80c8db6ca23" + "reference": "7c24bedba95c600bba7b6021185a7d7fa2deb961" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/beberlei/assert/zipball/be6aa40e3f2d2f0766f159409ab9a80c8db6ca23", - "reference": "be6aa40e3f2d2f0766f159409ab9a80c8db6ca23", + "url": "https://api.github.com/repos/beberlei/assert/zipball/7c24bedba95c600bba7b6021185a7d7fa2deb961", + "reference": "7c24bedba95c600bba7b6021185a7d7fa2deb961", "shasum": "" }, "require": { @@ -27,7 +27,7 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.1.1", - "phpunit/phpunit": "^4|^5" + "phpunit/phpunit": "^4.8.35|^5.7" }, "type": "library", "autoload": { @@ -60,51 +60,20 @@ "assertion", "validation" ], - "time": "2017-10-20T15:59:40+00:00" - }, - { - "name": "container-interop/container-interop", - "version": "1.2.0", - "source": { - "type": "git", - "url": "/~https://github.com/container-interop/container-interop.git", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "shasum": "" - }, - "require": { - "psr/container": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Interop\\Container\\": "src/Interop/Container/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", - "homepage": "/~https://github.com/container-interop/container-interop", - "time": "2017-02-14T19:40:03+00:00" + "time": "2018-04-09T14:40:28+00:00" }, { "name": "doctrine/annotations", - "version": "v1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "/~https://github.com/doctrine/annotations.git", - "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f" + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5beebb01b025c94e93686b7a0ed3edae81fe3e7f", - "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", "shasum": "" }, "require": { @@ -113,12 +82,12 @@ }, "require-dev": { "doctrine/cache": "1.*", - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^6.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -159,7 +128,7 @@ "docblock", "parser" ], - "time": "2017-07-22T10:58:02+00:00" + "time": "2017-12-06T07:11:42+00:00" }, { "name": "doctrine/instantiator", @@ -271,16 +240,16 @@ }, { "name": "lstrojny/functional-php", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "/~https://github.com/lstrojny/functional-php.git", - "reference": "c0c15f048355d0a7ab17914022ec1f901fe5144a" + "reference": "7c2091ddea572e012aa980e5d19d242d3a06ad5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lstrojny/functional-php/zipball/c0c15f048355d0a7ab17914022ec1f901fe5144a", - "reference": "c0c15f048355d0a7ab17914022ec1f901fe5144a", + "url": "https://api.github.com/repos/lstrojny/functional-php/zipball/7c2091ddea572e012aa980e5d19d242d3a06ad5b", + "reference": "7c2091ddea572e012aa980e5d19d242d3a06ad5b", "shasum": "" }, "require": { @@ -367,6 +336,7 @@ "src/Functional/Reject.php", "src/Functional/Retry.php", "src/Functional/Select.php", + "src/Functional/SelectKeys.php", "src/Functional/SequenceConstant.php", "src/Functional/SequenceExponential.php", "src/Functional/SequenceLinear.php", @@ -374,6 +344,7 @@ "src/Functional/Sort.php", "src/Functional/Sum.php", "src/Functional/SuppressError.php", + "src/Functional/Tap.php", "src/Functional/Tail.php", "src/Functional/TailRecursion.php", "src/Functional/True.php", @@ -403,7 +374,7 @@ "keywords": [ "functional" ], - "time": "2017-05-08T10:17:44+00:00" + "time": "2018-01-03T10:08:50+00:00" }, { "name": "myclabs/deep-copy", @@ -554,20 +525,23 @@ }, { "name": "phpbench/container", - "version": "1.1", + "version": "1.2", "source": { "type": "git", "url": "/~https://github.com/phpbench/container.git", - "reference": "8cd29cf58104e68b4d5cc2af5703e6235e41e7b9" + "reference": "c0e3cbf1cd8f867c70b029cb6d1b0b39fe6d409d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpbench/container/zipball/8cd29cf58104e68b4d5cc2af5703e6235e41e7b9", - "reference": "8cd29cf58104e68b4d5cc2af5703e6235e41e7b9", + "url": "https://api.github.com/repos/phpbench/container/zipball/c0e3cbf1cd8f867c70b029cb6d1b0b39fe6d409d", + "reference": "c0e3cbf1cd8f867c70b029cb6d1b0b39fe6d409d", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.1" + "psr/container": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" }, "type": "library", "extra": { @@ -591,7 +565,7 @@ } ], "description": "Simple, configurable, service container.", - "time": "2017-07-18T12:10:10+00:00" + "time": "2018-02-12T08:08:59+00:00" }, { "name": "phpbench/dom", @@ -763,29 +737,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.1.1", + "version": "4.3.0", "source": { "type": "git", "url": "/~https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2" + "reference": "94fd0001232e47129dd3504189fa1c7225010d08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2", - "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", + "reference": "94fd0001232e47129dd3504189fa1c7225010d08", "shasum": "" }, "require": { "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0@dev", + "phpdocumentor/reflection-common": "^1.0.0", "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -804,7 +784,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-08-30T18:51:59+00:00" + "time": "2017-11-30T07:14:17+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -855,16 +835,16 @@ }, { "name": "phpspec/prophecy", - "version": "v1.7.2", + "version": "1.7.5", "source": { "type": "git", "url": "/~https://github.com/phpspec/prophecy.git", - "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" + "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", - "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401", + "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401", "shasum": "" }, "require": { @@ -876,7 +856,7 @@ }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8 || ^5.6.5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" }, "type": "library", "extra": { @@ -914,45 +894,44 @@ "spy", "stub" ], - "time": "2017-09-04T11:05:03+00:00" + "time": "2018-02-19T10:16:54+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "5.2.2", + "version": "6.0.3", "source": { "type": "git", "url": "/~https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "8ed1902a57849e117b5651fc1a5c48110946c06b" + "reference": "774a82c0c5da4c1c7701790c262035d235ab7856" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8ed1902a57849e117b5651fc1a5c48110946c06b", - "reference": "8ed1902a57849e117b5651fc1a5c48110946c06b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/774a82c0c5da4c1c7701790c262035d235ab7856", + "reference": "774a82c0c5da4c1c7701790c262035d235ab7856", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^7.0", + "php": "^7.1", "phpunit/php-file-iterator": "^1.4.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^1.4.11 || ^2.0", + "phpunit/php-token-stream": "^3.0", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.0", + "sebastian/environment": "^3.1", "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, "require-dev": { - "ext-xdebug": "^2.5", - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^7.0" }, "suggest": { - "ext-xdebug": "^2.5.5" + "ext-xdebug": "^2.6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.2.x-dev" + "dev-master": "6.0-dev" } }, "autoload": { @@ -967,7 +946,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -978,20 +957,20 @@ "testing", "xunit" ], - "time": "2017-08-03T12:40:43+00:00" + "time": "2018-04-06T15:39:20+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.2", + "version": "1.4.5", "source": { "type": "git", "url": "/~https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", "shasum": "" }, "require": { @@ -1025,7 +1004,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03T07:40:28+00:00" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -1070,28 +1049,28 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.9", + "version": "2.0.0", "source": { "type": "git", "url": "/~https://github.com/sebastianbergmann/php-timer.git", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f", + "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1106,7 +1085,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1115,33 +1094,33 @@ "keywords": [ "timer" ], - "time": "2017-02-26T11:10:40+00:00" + "time": "2018-02-01T13:07:23+00:00" }, { "name": "phpunit/php-token-stream", - "version": "2.0.1", + "version": "3.0.0", "source": { "type": "git", "url": "/~https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0" + "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0", - "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace", + "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": "^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^6.2.4" + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1164,20 +1143,20 @@ "keywords": [ "tokenizer" ], - "time": "2017-08-20T05:47:52+00:00" + "time": "2018-02-01T13:16:43+00:00" }, { "name": "phpunit/phpunit", - "version": "6.4.3", + "version": "7.1.2", "source": { "type": "git", "url": "/~https://github.com/sebastianbergmann/phpunit.git", - "reference": "06b28548fd2b4a20c3cd6e247dc86331a7d4db13" + "reference": "6a17c170fb92845896e1b3b00fcb462cd4b3c017" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/06b28548fd2b4a20c3cd6e247dc86331a7d4db13", - "reference": "06b28548fd2b4a20c3cd6e247dc86331a7d4db13", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6a17c170fb92845896e1b3b00fcb462cd4b3c017", + "reference": "6a17c170fb92845896e1b3b00fcb462cd4b3c017", "shasum": "" }, "require": { @@ -1189,15 +1168,15 @@ "myclabs/deep-copy": "^1.6.1", "phar-io/manifest": "^1.0.1", "phar-io/version": "^1.0", - "php": "^7.0", + "php": "^7.1", "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^5.2.2", - "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-code-coverage": "^6.0.1", + "phpunit/php-file-iterator": "^1.4.3", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^1.0.9", - "phpunit/phpunit-mock-objects": "^4.0.3", - "sebastian/comparator": "^2.0.2", - "sebastian/diff": "^2.0", + "phpunit/php-timer": "^2.0", + "phpunit/phpunit-mock-objects": "^6.1", + "sebastian/comparator": "^2.1", + "sebastian/diff": "^3.0", "sebastian/environment": "^3.1", "sebastian/exporter": "^3.1", "sebastian/global-state": "^2.0", @@ -1205,16 +1184,12 @@ "sebastian/resource-operations": "^1.0", "sebastian/version": "^2.0.1" }, - "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2", - "phpunit/dbunit": "<3.0" - }, "require-dev": { "ext-pdo": "*" }, "suggest": { "ext-xdebug": "*", - "phpunit/php-invoker": "^1.1" + "phpunit/php-invoker": "^2.0" }, "bin": [ "phpunit" @@ -1222,7 +1197,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.4.x-dev" + "dev-master": "7.1-dev" } }, "autoload": { @@ -1248,33 +1223,30 @@ "testing", "xunit" ], - "time": "2017-10-16T13:18:59+00:00" + "time": "2018-04-10T11:40:22+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "4.0.4", + "version": "6.1.1", "source": { "type": "git", "url": "/~https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "2f789b59ab89669015ad984afa350c4ec577ade0" + "reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0", - "reference": "2f789b59ab89669015ad984afa350c4ec577ade0", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/70c740bde8fd9ea9ea295be1cd875dd7b267e157", + "reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.5", - "php": "^7.0", + "php": "^7.1", "phpunit/php-text-template": "^1.2.1", - "sebastian/exporter": "^3.0" - }, - "conflict": { - "phpunit/phpunit": "<6.0" + "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^7.0" }, "suggest": { "ext-soap": "*" @@ -1282,7 +1254,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "6.1-dev" } }, "autoload": { @@ -1297,7 +1269,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1307,7 +1279,7 @@ "mock", "xunit" ], - "time": "2017-08-03T14:08:16+00:00" + "time": "2018-04-11T04:50:36+00:00" }, { "name": "psr/container", @@ -1452,30 +1424,30 @@ }, { "name": "sebastian/comparator", - "version": "2.0.2", + "version": "2.1.3", "source": { "type": "git", "url": "/~https://github.com/sebastianbergmann/comparator.git", - "reference": "ae068fede81d06e7bb9bb46a367210a3d3e1fe6a" + "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ae068fede81d06e7bb9bb46a367210a3d3e1fe6a", - "reference": "ae068fede81d06e7bb9bb46a367210a3d3e1fe6a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9", + "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9", "shasum": "" }, "require": { "php": "^7.0", - "sebastian/diff": "^2.0", - "sebastian/exporter": "^3.0" + "sebastian/diff": "^2.0 || ^3.0", + "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^6.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { @@ -1506,38 +1478,39 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", + "homepage": "/~https://github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", "equality" ], - "time": "2017-08-03T07:14:59+00:00" + "time": "2018-02-01T13:46:46+00:00" }, { "name": "sebastian/diff", - "version": "2.0.1", + "version": "3.0.0", "source": { "type": "git", "url": "/~https://github.com/sebastianbergmann/diff.git", - "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd" + "reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", - "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/e09160918c66281713f1c324c1f4c4c3037ba1e8", + "reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^6.2" + "phpunit/phpunit": "^7.0", + "symfony/process": "^2 || ^3.3 || ^4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1562,9 +1535,12 @@ "description": "Diff implementation", "homepage": "/~https://github.com/sebastianbergmann/diff", "keywords": [ - "diff" + "diff", + "udiff", + "unidiff", + "unified diff" ], - "time": "2017-08-03T08:09:46+00:00" + "time": "2018-02-01T13:45:15+00:00" }, { "name": "sebastian/environment", @@ -1966,23 +1942,23 @@ }, { "name": "seld/jsonlint", - "version": "1.6.1", + "version": "1.7.1", "source": { "type": "git", "url": "/~https://github.com/Seldaek/jsonlint.git", - "reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77" + "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77", - "reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38", + "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38", "shasum": "" }, "require": { "php": "^5.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "bin": [ "bin/jsonlint" @@ -2011,7 +1987,7 @@ "parser", "validator" ], - "time": "2017-06-18T15:11:04+00:00" + "time": "2018-01-24T12:46:19+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -2093,44 +2069,45 @@ }, { "name": "symfony/console", - "version": "v3.3.10", + "version": "v3.4.8", "source": { "type": "git", "url": "/~https://github.com/symfony/console.git", - "reference": "116bc56e45a8e5572e51eb43ab58c769a352366c" + "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/116bc56e45a8e5572e51eb43ab58c769a352366c", - "reference": "116bc56e45a8e5572e51eb43ab58c769a352366c", + "url": "https://api.github.com/repos/symfony/console/zipball/d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf", + "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0", + "symfony/debug": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3", - "symfony/dependency-injection": "~3.3", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/filesystem": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.3|~4.0" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", - "symfony/filesystem": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2157,20 +2134,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2018-04-03T05:22:50+00:00" }, { "name": "symfony/debug", - "version": "v3.3.10", + "version": "v3.4.8", "source": { "type": "git", "url": "/~https://github.com/symfony/debug.git", - "reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd" + "reference": "9cf7c2271cfb89ef9727db1b740ca77be57bf9d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd", - "reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd", + "url": "https://api.github.com/repos/symfony/debug/zipball/9cf7c2271cfb89ef9727db1b740ca77be57bf9d7", + "reference": "9cf7c2271cfb89ef9727db1b740ca77be57bf9d7", "shasum": "" }, "require": { @@ -2181,12 +2158,12 @@ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/http-kernel": "~2.8|~3.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2213,20 +2190,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2018-04-03T05:22:50+00:00" }, { "name": "symfony/filesystem", - "version": "v3.3.10", + "version": "v3.4.8", "source": { "type": "git", "url": "/~https://github.com/symfony/filesystem.git", - "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1" + "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/90bc45abf02ae6b7deb43895c1052cb0038506f1", - "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/253a4490b528597aa14d2bf5aeded6f5e5e4a541", + "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541", "shasum": "" }, "require": { @@ -2235,7 +2212,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2262,20 +2239,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-10-03T13:33:10+00:00" + "time": "2018-02-22T10:48:49+00:00" }, { "name": "symfony/finder", - "version": "v3.3.10", + "version": "v3.4.8", "source": { "type": "git", "url": "/~https://github.com/symfony/finder.git", - "reference": "773e19a491d97926f236942484cb541560ce862d" + "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/773e19a491d97926f236942484cb541560ce862d", - "reference": "773e19a491d97926f236942484cb541560ce862d", + "url": "https://api.github.com/repos/symfony/finder/zipball/bd14efe8b1fabc4de82bf50dce62f05f9a102433", + "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433", "shasum": "" }, "require": { @@ -2284,7 +2261,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2311,20 +2288,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2018-04-04T05:07:11+00:00" }, { "name": "symfony/options-resolver", - "version": "v3.3.10", + "version": "v3.4.8", "source": { "type": "git", "url": "/~https://github.com/symfony/options-resolver.git", - "reference": "ee4e22978fe885b54ee5da8c7964f0a5301abfb6" + "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ee4e22978fe885b54ee5da8c7964f0a5301abfb6", - "reference": "ee4e22978fe885b54ee5da8c7964f0a5301abfb6", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f3109a6aedd20e35c3a33190e932c2b063b7b50e", + "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e", "shasum": "" }, "require": { @@ -2333,7 +2310,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2365,20 +2342,20 @@ "configuration", "options" ], - "time": "2017-07-29T21:54:42+00:00" + "time": "2018-01-11T07:56:07+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.6.0", + "version": "v1.7.0", "source": { "type": "git", "url": "/~https://github.com/symfony/polyfill-mbstring.git", - "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296" + "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", - "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", "shasum": "" }, "require": { @@ -2390,7 +2367,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.7-dev" } }, "autoload": { @@ -2424,20 +2401,20 @@ "portable", "shim" ], - "time": "2017-10-11T12:05:26+00:00" + "time": "2018-01-30T19:27:44+00:00" }, { "name": "symfony/process", - "version": "v3.3.10", + "version": "v3.4.8", "source": { "type": "git", "url": "/~https://github.com/symfony/process.git", - "reference": "fdf89e57a723a29baf536e288d6e232c059697b1" + "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/fdf89e57a723a29baf536e288d6e232c059697b1", - "reference": "fdf89e57a723a29baf536e288d6e232c059697b1", + "url": "https://api.github.com/repos/symfony/process/zipball/4b7d64e852886319e93ddfdecff0d744ab87658b", + "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b", "shasum": "" }, "require": { @@ -2446,7 +2423,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2473,7 +2450,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2018-04-03T05:22:50+00:00" }, { "name": "theseer/tokenizer", @@ -2517,16 +2494,16 @@ }, { "name": "webmozart/assert", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "/~https://github.com/webmozart/assert.git", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" + "reference": "0df1908962e7a3071564e857d86874dad1ef204a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", + "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", + "reference": "0df1908962e7a3071564e857d86874dad1ef204a", "shasum": "" }, "require": { @@ -2563,7 +2540,7 @@ "check", "validate" ], - "time": "2016-11-23T20:04:58+00:00" + "time": "2018-01-29T19:49:41+00:00" }, { "name": "zendframework/zend-coding-standard", From cf2b976bea353d751e705086aea951ba36186cc8 Mon Sep 17 00:00:00 2001 From: webimpress Date: Thu, 12 Apr 2018 09:30:47 +0100 Subject: [PATCH 23/23] Updated .gitattributes - added trailing / for benchamrk directory --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index b488837aa..5ad1a226f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,7 +2,7 @@ /.gitattributes export-ignore /.gitignore export-ignore /.travis.yml export-ignore -/benchmark export-ignore +/benchmark/ export-ignore /composer.lock export-ignore /docs/ export-ignore /mkdocs.yml export-ignore