From 62928b2d27ab6c5e4209ca7df187d068d54c41ef Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 21 Nov 2017 20:19:05 +0000 Subject: [PATCH 1/8] Removed duplicated files: CONDUCT.md and CONTRIBUTING.md Please see files in "docs" directory --- CONDUCT.md | 43 ---------- CONTRIBUTING.md | 218 ------------------------------------------------ 2 files changed, 261 deletions(-) delete mode 100644 CONDUCT.md delete mode 100644 CONTRIBUTING.md diff --git a/CONDUCT.md b/CONDUCT.md deleted file mode 100644 index c663d2b..0000000 --- a/CONDUCT.md +++ /dev/null @@ -1,43 +0,0 @@ -# Contributor Code of Conduct - -The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com) -as its guidelines for contributor interactions. - -## The Code Manifesto - -We want to work in an ecosystem that empowers developers to reach their -potential — one that encourages growth and effective collaboration. A space that -is safe for all. - -A space such as this benefits everyone that participates in it. It encourages -new developers to enter our field. It is through discussion and collaboration -that we grow, and through growth that we improve. - -In the effort to create such a place, we hold to these values: - -1. **Discrimination limits us.** This includes discrimination on the basis of - race, gender, sexual orientation, gender identity, age, nationality, technology - and any other arbitrary exclusion of a group of people. -2. **Boundaries honor us.** Your comfort levels are not everyone’s comfort - levels. Remember that, and if brought to your attention, heed it. -3. **We are our biggest assets.** None of us were born masters of our trade. - Each of us has been helped along the way. Return that favor, when and where - you can. -4. **We are resources for the future.** As an extension of #3, share what you - know. Make yourself a resource to help those that come after you. -5. **Respect defines us.** Treat others as you wish to be treated. Make your - discussions, criticisms and debates from a position of respectfulness. Ask - yourself, is it true? Is it necessary? Is it constructive? Anything less is - unacceptable. -6. **Reactions require grace.** Angry responses are valid, but abusive language - and vindictive actions are toxic. When something happens that offends you, - handle it assertively, but be respectful. Escalate reasonably, and try to - allow the offender an opportunity to explain themselves, and possibly correct - the issue. -7. **Opinions are just that: opinions.** Each and every one of us, due to our - background and upbringing, have varying opinions. The fact of the matter, is - that is perfectly acceptable. Remember this: if you respect your own - opinions, you should respect the opinions of others. -8. **To err is human.** You might not intend it, but mistakes do happen and - contribute to build experience. Tolerate honest mistakes, and don't hesitate - to apologize if you make one yourself. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 6a1d26a..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,218 +0,0 @@ -# CONTRIBUTING - -## RESOURCES - -If you wish to contribute to Zend Framework, please be sure to -read/subscribe to the following resources: - - - [Coding Standards](https://github.com/zendframework/zend-coding-standards) - - [Forums](https://discourse.zendframework.com/c/contribotors) - - [Slack](https://zendframework-slack.herokuapp.com) - -If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-expressive-cache/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). - -## RUNNING TESTS - -To run tests: - -- Clone the repository: - - ```console - $ git clone git://github.com/zendframework/zend-expressive-cache.git - $ cd zend-expressive-cache - ``` - -- Install dependencies via composer: - - ```console - $ composer install - ``` - - If you don't have `composer` installed, please download it from https://getcomposer.org/download/ - -- Run the tests using the "test" command shipped in the `composer.json`: - - ```console - $ composer test - ``` - -You can turn on conditional tests with the `phpunit.xml` file. -To do so: - - - Copy `phpunit.xml.dist` file to `phpunit.xml` - - Edit `phpunit.xml` to enable any specific functionality you - want to test, as well as to provide test values to utilize. - -## Running Coding Standards Checks - -First, ensure you've installed dependencies via composer, per the previous -section on running tests. - -To run CS checks only: - -```console -$ composer cs-check -``` - -To attempt to automatically fix common CS issues: - -```console -$ composer cs-fix -``` - -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. - -## 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](https://github.com/), if you haven't yet -2. Fork the repository (https://github.com/zendframework/zend-expressive-cache) -3. Clone the canonical repository locally and enter it. - - ```console - $ git clone git://github.com/zendframework/zend-expressive-cache.git - $ cd zend-expressive-cache - ``` - -4. Add a remote to your fork; substitute your GitHub username in the command - below. - - ```console - $ git remote add {username} git@github.com:{username}/zend-expressive-cache.git - $ git fetch {username} - ``` - -### Keeping Up-to-Date - -Periodically, you should update your fork or personal repository to -match the canonical ZF repository. Assuming you have setup your local repository -per the instructions above, you can do the following: - - -```console -$ git checkout master -$ git fetch origin -$ git rebase origin/master -# OPTIONALLY, to keep your remote up-to-date - -$ git push {username} master:master -``` - -If you're tracking other branches -- for example, the "develop" branch, where -new feature development occurs -- you'll want to do the same operations for that -branch; simply substitute "develop" for "master". - -### Working on a patch - -We recommend you do each new feature or bugfix in a new branch. This simplifies -the task of code review as well as the task of merging your changes into the -canonical repository. - -A typical workflow will then consist of the following: - -1. Create a new local branch based off either your master or develop branch. -2. Switch to your new local branch. (This step can be combined with the - previous step with the use of `git checkout -b`.) -3. Do some work, commit, repeat as necessary. -4. Push the local branch to your remote repository. -5. Send a pull request. - -The mechanics of this process are actually quite trivial. Below, we will -create a branch for fixing an issue in the tracker. - -```console -$ git checkout -b hotfix/9295 -Switched to a new branch 'hotfix/9295' -``` - -... do some work ... - - -```console -$ git commit -``` - -... write your log message ... - - -```console -$ git push {username} hotfix/9295:hotfix/9295 -Counting objects: 38, done. -Delta compression using up to 2 threads. -Compression objects: 100% (18/18), done. -Writing objects: 100% (20/20), 8.19KiB, done. -Total 20 (delta 12), reused 0 (delta 0) -To ssh://git@github.com/{username}/zend-expressive-cache.git - b5583aa..4f51698 HEAD -> master -``` - -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 - -#### What branch to issue the pull request against? - -Which branch should you issue a pull request against? - -- For fixes against the stable release, issue the pull request against the - "master" branch. -- For new features, or fixes that introduce new elements to the public API (such - as new public methods or properties), issue the pull request against the - "develop" branch. - -### Branch Cleanup - -As you might imagine, if you are a frequent contributor, you'll start to -get a ton of branches both locally and on your remote. - -Once you know that your changes have been accepted to the master -repository, we suggest doing some cleanup of these branches. - -- Local branch cleanup - - ```console - $ git branch -d - ``` - -- Remote branch removal - - ```console - $ git push {username} : - ``` - -## Conduct - -Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project. From 6d180ec38f3365d47e47b98f952e9664b833e7d2 Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 21 Nov 2017 20:19:20 +0000 Subject: [PATCH 2/8] Updated LICENSE.md template - wrap long lines --- LICENSE.md | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index be7b7bc..a7d89dc 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,12 +1,27 @@ Copyright (c) 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: +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 software without specific prior written permission. +- 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 + software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 522eed193673a3fd21eb7261b05de9a243c6e39f Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 21 Nov 2017 20:19:54 +0000 Subject: [PATCH 3/8] Updated travis and coveralls badges These were pointing wrong repository before --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eae7a6b..6c358a6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # OAuth2 server middleware for Expressive and PSR-7 applications -[![Build Status](https://secure.travis-ci.org/zendframework/zend-expressive-authorization.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-expressive-authorization) -[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-expressive-authorization/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-expressive-authorization?branch=master) +[![Build Status](https://secure.travis-ci.org/zendframework/zend-expressive-authentication-oauth2.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-expressive-authentication-oauth2) +[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-expressive-authentication-oauth2/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-expressive-authentication-oauth2?branch=master) Zend-expressive-authentication-oauth2 is middleware for [Expressive](https://github.com/zendframework/zend-expressive) and [PSR-7](http://www.php-fig.org/psr/psr-7/) applications providing an OAuth2 From bac1f2048ceaa7da5f9f6426b94aca930b06306b Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 21 Nov 2017 20:20:48 +0000 Subject: [PATCH 4/8] Updated support files - links to proper repository --- docs/CONTRIBUTING.md | 16 ++++++++-------- docs/SUPPORT.md | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 03a4439..ec1829f 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -11,7 +11,7 @@ read/subscribe to the following resources: - [Code of Conduct](CODE_OF_CONDUCT.md) If you are working on new features or refactoring -[create a proposal](https://github.com/zendframework/zend-expressive-authorization/issues/new). +[create a proposal](https://github.com/zendframework/zend-expressive-authentication-oauth2/issues/new). ## RUNNING TESTS @@ -20,8 +20,8 @@ To run tests: - Clone the repository: ```console - $ git clone git://github.com/zendframework/zend-expressive-authorization.git - $ cd zend-expressive-authorization + $ git clone git://github.com/zendframework/zend-expressive-authentication-oauth2.git + $ cd zend-expressive-authentication-oauth2 ``` - Install dependencies via composer: @@ -72,19 +72,19 @@ 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](https://github.com/), if you haven't yet -2. Fork the repository (https://github.com/zendframework/zend-expressive-authorization) +2. Fork the repository (https://github.com/zendframework/zend-expressive-authentication-oauth2) 3. Clone the canonical repository locally and enter it. ```console - $ git clone git://github.com/zendframework/zend-expressive-authorization.git - $ cd zend-expressive-authorization + $ git clone git://github.com/zendframework/zend-expressive-authentication-oauth2.git + $ cd zend-expressive-authentication-oauth2 ``` 4. Add a remote to your fork; substitute your GitHub username in the command below. ```console - $ git remote add {username} git@github.com:{username}/zend-expressive-authorization.git + $ git remote add {username} git@github.com:{username}/zend-expressive-authentication-oauth2.git $ git fetch {username} ``` @@ -147,7 +147,7 @@ Delta compression using up to 2 threads. Compression objects: 100% (18/18), done. Writing objects: 100% (20/20), 8.19KiB, done. Total 20 (delta 12), reused 0 (delta 0) -To ssh://git@github.com/{username}/zend-expressive-authorization.git +To ssh://git@github.com/{username}/zend-expressive-authentication-oauth2.git b5583aa..4f51698 HEAD -> master ``` diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md index e7a2866..daa20e7 100644 --- a/docs/SUPPORT.md +++ b/docs/SUPPORT.md @@ -5,9 +5,9 @@ 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) + [forums](https://discourse.zendframework.com/c/questions/expressive) - To report issues, use this repository's - [issue tracker](https://github.com/zendframework/zend-expressive-authorization/issues/new) + [issue tracker](https://github.com/zendframework/zend-expressive-authentication-oauth2/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. From 10e128f502f64c34f4d048e0db8d4f80605cc1f8 Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 21 Nov 2017 20:21:10 +0000 Subject: [PATCH 5/8] Updated github PR and ISSUE templates --- docs/ISSUE_TEMPLATE.md | 10 +++++++++- docs/PULL_REQUEST_TEMPLATE.md | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md index 6d3255a..eaaad0f 100644 --- a/docs/ISSUE_TEMPLATE.md +++ b/docs/ISSUE_TEMPLATE.md @@ -1,11 +1,19 @@ -Provide a narrative description of the issue. + - [ ] I was not able to find an [open](https://github.com/zendframework/zend-expressive-authentication-oauth2/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-expressive-authentication-oauth2/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 index 3ad6252..f00d90c 100644 --- a/docs/PULL_REQUEST_TEMPLATE.md +++ b/docs/PULL_REQUEST_TEMPLATE.md @@ -18,8 +18,8 @@ Provide a narrative description of what you are trying to accomplish: - [ ] Add a `CHANGELOG.md` entry for the new feature. - [ ] Is this related to quality assurance? - - [ ] Detail why the changes are necessary. + - [ ] Is this related to documentation? - - [ ] Is it a typographical and/or grammatical fix? - - [ ] Is it new documentation? + + From b1c774819843bd9ce91eefd6ed66779fb192634d Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 21 Nov 2017 20:28:41 +0000 Subject: [PATCH 6/8] Updated composer.json skeleton - added branch-alias dev-master - updated composer scripts - updated order of sections in composer - added rss link in support section - removed default type library and homepage --- composer.json | 19 +++++++++++-------- composer.lock | 33 ++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index 0f5849a..c62d13f 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,6 @@ { "name": "zendframework/zend-expressive-authentication-oauth2", "description": "OAuth2 (server) authentication middleware for Expressive and PSR-7 applications.", - "homepage": "https://docs.zendframework.com/zend-expressive-authentication-oauth2/", - "type": "library", "license": "BSD-3-Clause", "keywords": [ "authentication", @@ -14,13 +12,11 @@ "zendframework", "zf" ], - "config": { - "sort-packages": true - }, "support": { "docs": "https://docs.zendframework.com/zend-expressive-authentication-oauth2/", "issues": "https://github.com/zendframework/zend-expressive-authentication-oauth2/issues", "source": "https://github.com/zendframework/zend-expressive-authentication-oauth2", + "rss": "https://github.com/zendframework/zend-expressive-authentication-oauth2/releases.atom", "slack": "https://zendframework-slack.herokuapp.com", "forum": "https://discourse.zendframework.com/c/questions/expressive" }, @@ -51,17 +47,24 @@ "ZendTest\\Expressive\\Authentication\\OAuth2\\": "test/" } }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, "scripts": { "check": [ "@cs-check", "@test" ], - "upload-coverage": "coveralls -v", "cs-check": "phpcs", "cs-fix": "phpcbf", "test": "phpunit --colors=always", - "test-coverage": "phpunit --coverage-clover clover.xml", - "license-check": "vendor/bin/docheader check src/ test/", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", + "upload-coverage": "coveralls -v", "generate-keys": "php bin/generate-keys.php" } } diff --git a/composer.lock b/composer.lock index d865f80..08b300d 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": "ec2a4339b5b03a17381414928e2fb6a9", + "content-hash": "65f300b4517f986d74b4ae762de42ba8", "packages": [ { "name": "defuse/php-encryption", @@ -1308,12 +1308,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "a88d5f2e09a349e2d2f1dcde218860ede463a4f1" + "reference": "bf2267389f86ae9a168fd0166be59d36ffc07827" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/a88d5f2e09a349e2d2f1dcde218860ede463a4f1", - "reference": "a88d5f2e09a349e2d2f1dcde218860ede463a4f1", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/bf2267389f86ae9a168fd0166be59d36ffc07827", + "reference": "bf2267389f86ae9a168fd0166be59d36ffc07827", "shasum": "" }, "conflict": { @@ -1321,14 +1321,15 @@ "amphp/artax": ">=2,<2.0.6|<1.0.6", "aws/aws-sdk-php": ">=3,<3.2.1", "bugsnag/bugsnag-laravel": ">=2,<2.0.2", - "cakephp/cakephp": ">=2,<2.4.99|>=1.3,<1.3.18|>=3,<3.0.15|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3.1,<3.1.4", + "cakephp/cakephp": ">=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.0.15|>=3.1,<3.1.4|>=1.3,<1.3.18", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", "cartalyst/sentry": "<2.1", "codeigniter/framework": "<=3.0.6", "composer/composer": "<=1.0.0-alpha11", "contao-components/mediaelement": ">=2.14.2,<2.21.1", - "contao/core": ">=2,<3.5.28", - "contao/core-bundle": ">=4,<4.4.1", + "contao/core": ">=2,<3.5.31", + "contao/core-bundle": ">=4,<4.4.8", + "contao/listing-bundle": ">=4,<4.4.8", "doctrine/annotations": ">=1,<1.2.7", "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2", "doctrine/common": ">=2,<2.4.3|>=2.5,<2.5.1", @@ -1366,7 +1367,7 @@ "pusher/pusher-php-server": "<2.2.1", "sabre/dav": ">=1.6,<1.6.99|>=1.7,<1.7.11|>=1.8,<1.8.9", "shopware/shopware": "<5.2.25", - "silverstripe/cms": ">=3.1,<3.1.11|>=3,<=3.0.11", + "silverstripe/cms": ">=3,<=3.0.11|>=3.1,<3.1.11", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", "silverstripe/framework": ">=3,<3.3", "silverstripe/userforms": "<3", @@ -1377,16 +1378,18 @@ "squizlabs/php_codesniffer": ">=1,<2.8.1", "swiftmailer/swiftmailer": ">=4,<5.4.5", "symfony/dependency-injection": ">=2,<2.0.17", - "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.7", + "symfony/form": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13|>=2.3,<2.3.35|>=2.4,<2.6.12", "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2", "symfony/http-foundation": ">=2,<2.3.27|>=2.4,<2.5.11|>=2.6,<2.6.6", "symfony/http-kernel": ">=2,<2.3.29|>=2.4,<2.5.12|>=2.6,<2.6.8", + "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/routing": ">=2,<2.0.19", - "symfony/security": ">=2.3,<2.3.37|>=2.4,<2.6.13|>=2.7,<2.7.9|>=2,<2.0.25|>=2.1,<2.1.13|>=2.2,<2.2.9|>=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5", - "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.8,<2.8.6|>=3,<3.0.6|>=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5", - "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.13|>=2.8,<2.8.6|>=3,<3.0.6", + "symfony/security": ">=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5|>=2.3,<2.3.37|>=2.4,<2.6.13|>=2.7,<2.7.9|>=2,<2.0.25|>=2.1,<2.1.13|>=2.2,<2.2.9", + "symfony/security-core": ">=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5|>=2.4,<2.6.13|>=2.7,<2.7.9|>=2.8,<2.8.6|>=3,<3.0.6", + "symfony/security-csrf": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", + "symfony/security-http": ">=2.4,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13|>=2.3,<2.3.41", "symfony/serializer": ">=2,<2.0.11", - "symfony/symfony": ">=2,<2.3.41|>=2.4,<2.7.13|>=2.8,<2.8.6|>=3,<3.0.6|>=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5", + "symfony/symfony": ">=2,<2.3.41|>=2.4,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/translation": ">=2,<2.0.17", "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", @@ -1394,7 +1397,7 @@ "thelia/backoffice-default-template": ">=2.1,<2.1.2", "thelia/thelia": ">=2.1,<2.1.2|>=2.1.0-beta1,<2.1.3", "twig/twig": "<1.20", - "typo3/cms": ">=8,<8.7.5|>=6.2,<6.2.30|>=7,<7.6.22", + "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.22|>=8,<8.7.5", "typo3/flow": ">=1,<1.0.4|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5|>=1.1,<1.1.1|>=2,<2.0.1", "typo3/neos": ">=1.2,<1.2.13|>=2,<2.0.4|>=1.1,<1.1.3", "willdurand/js-translation-bundle": "<2.1.1", @@ -1441,7 +1444,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2017-11-16T05:39:47+00:00" + "time": "2017-11-17T12:15:33+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", From 354e2c06e10a1ae4f707c759f7141bffff9a7982 Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 21 Nov 2017 20:31:25 +0000 Subject: [PATCH 7/8] Run cs-checks also on "bin" directory --- phpcs.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/phpcs.xml b/phpcs.xml index c48d19c..665d57e 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -3,6 +3,7 @@ + bin src test From 6472252bc9ceaee6ec3fe8144b0d9b2047fe0a34 Mon Sep 17 00:00:00 2001 From: webimpress Date: Tue, 21 Nov 2017 20:31:38 +0000 Subject: [PATCH 8/8] CS fixes in bin/generate-keys.php --- bin/generate-keys.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bin/generate-keys.php b/bin/generate-keys.php index a9c008e..ca7e7c4 100644 --- a/bin/generate-keys.php +++ b/bin/generate-keys.php @@ -2,22 +2,23 @@ /** * @see https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com) - * @license https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md New BSD License + * @license https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md + * New BSD License */ /** * Script to generate public, private and encryption keys for thephpleague/oauth2-server * @see https://oauth2.thephpleague.com/installation/ */ - + $filePrivateKey = dirname(__DIR__) . '/data/private.key'; $filePublicKey = dirname(__DIR__) . '/data/public.key'; // Generate public/private keys with OpenSSL -$config = array( - "private_key_bits" => 1024, - "private_key_type" => OPENSSL_KEYTYPE_RSA, -); +$config = [ + 'private_key_bits' => 1024, + 'private_key_type' => OPENSSL_KEYTYPE_RSA, +]; // Private key $res = openssl_pkey_new($config);