Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vlucas/phpdotenv
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.1.6
Choose a base ref
...
head repository: vlucas/phpdotenv
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.1.7
Choose a head ref
  • 15 commits
  • 4 files changed
  • 3 contributors

Commits on Jun 2, 2020

  1. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    96b7204 View commit details
  2. Update .travis.yml

    GrahamCampbell authored Jun 2, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    0d35282 View commit details
  3. Update .travis.yml

    GrahamCampbell authored Jun 2, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    6e67a04 View commit details
  4. Create .editorconfig (#404)

    Musa authored and GrahamCampbell committed Jun 2, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a3af521 View commit details
  5. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    471ea86 View commit details
  6. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    333c21d View commit details
  7. Update composer.json

    GrahamCampbell committed Jun 2, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1a195f4 View commit details
  8. Update .travis.yml

    GrahamCampbell committed Jun 2, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    929846b View commit details
  9. Update .travis.yml

    GrahamCampbell committed Jun 2, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    f52b0a0 View commit details
  10. Copy the full SHA
    6ffd8a6 View commit details
  11. Copy the full SHA
    6566020 View commit details
  12. Revert "Update .travis.yml"

    This reverts commit f52b0a0.
    GrahamCampbell committed Jun 2, 2020
    Copy the full SHA
    2e97731 View commit details
  13. Copy the full SHA
    4669484 View commit details
  14. Copy the full SHA
    47f5f6a View commit details

Commits on Jun 7, 2020

  1. Copy the full SHA
    db63b2e View commit details
Showing with 15 additions and 6 deletions.
  1. +3 −1 .travis.yml
  2. +4 −4 composer.json
  3. +3 −0 phpstan.src.neon.dist
  4. +5 −1 vendor-bin/phpstan/composer.json
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -4,12 +4,14 @@ jobs:
dist: trusty
language: php
php: 5.5.9
before_install: composer self-update --2
install: travis_retry composer update -n -o
script: vendor/bin/phpunit
- name: PHP 5.5
dist: trusty
language: php
php: 5.5
before_install: composer self-update --2
install: travis_retry composer update -n -o
script: vendor/bin/phpunit
- name: PHP 5.6
@@ -38,7 +40,7 @@ jobs:
script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.4-cli
- name: PHP 8.0
dist: bionic
install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:8.0-base update -n -o --ignore-platform-reqs
install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:8.0-base update -n -o --ignore-platform-req=php
script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:8.0-cli
- name: PHPStan
dist: bionic
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -17,14 +17,14 @@
],
"require": {
"php": "^5.5.9 || ^7.0 || ^8.0",
"phpoption/phpoption": "^1.7.2",
"symfony/polyfill-ctype": "^1.9"
"phpoption/phpoption": "^1.7.3",
"symfony/polyfill-ctype": "^1.16"
},
"require-dev": {
"ext-filter": "*",
"ext-pcre": "*",
"bamarni/composer-bin-plugin": "^1.3",
"phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
"bamarni/composer-bin-plugin": "^1.4.1",
"phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0"
},
"autoload": {
"psr-4": {
3 changes: 3 additions & 0 deletions phpstan.src.neon.dist
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
parameters:
level: max
ignoreErrors:
- '#Anonymous function should have native return typehint ".+".#'
- '#Call to function is_string\(\) with string will always evaluate to true.#'
- '#Variable \$defaults might not be defined.#'
- '/^Parameter \#1 \$readers of class Dotenv\\Repository\\[a-zA-Z]*Repository[a-zA-Z]* constructor expects/'
- '/^Parameter \#2 \$writers of class Dotenv\\Repository\\[a-zA-Z]*Repository[a-zA-Z]* constructor expects/'
@@ -9,3 +11,4 @@ parameters:
- '#Parameter \#1 \$callable of method PhpOption\\Option<Dotenv\\Loader\\Value\|null>::map\(\) expects callable\(Dotenv\\Loader\\Value\|null\): mixed, Closure\(Dotenv\\Loader\\Value\): mixed given.#'
- '#Parameter \#1 \$callable of method PhpOption\\Option<array\|null>::[a-z]+\(\) expects callable\(array\|null\): [a-z]+, Closure\(array\): mixed given.#'
- '#Parameter \#1 \$name of method Dotenv\\Repository\\AbstractRepository::set\(\) expects string, string\|null given.#'
- '#Parameter \#.+ of method Dotenv\\Repository\\AbstractRepository::offset.+ should be contravariant .+#'
6 changes: 5 additions & 1 deletion vendor-bin/phpstan/composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"require": {
"phpstan/phpstan": "^0.12.25"
"phpstan/phpstan": "^0.12.25",
"phpstan/extension-installer": "^1.0.4",
"phpstan/phpstan-deprecation-rules": "^0.12.4",
"phpstan/phpstan-strict-rules": "^0.12.2",
"thecodingmachine/phpstan-strict-rules": "^0.12.0"
}
}