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.2.1
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.2.2
Choose a head ref
  • 5 commits
  • 6 files changed
  • 1 contributor

Commits on Dec 12, 2021

  1. Update composer.json

    GrahamCampbell committed Dec 12, 2021

    Verified

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

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

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

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

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    77e9746 View commit details
Showing with 16 additions and 10 deletions.
  1. +4 −2 composer.json
  2. +0 −1 phpstan.src.neon.dist
  3. +2 −2 phpstan.tests.neon.dist
  4. +5 −0 src/Repository/AbstractRepository.php
  5. +4 −4 vendor-bin/phpstan/composer.json
  6. +1 −1 vendor-bin/psalm/composer.json
6 changes: 4 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -6,11 +6,13 @@
"authors": [
{
"name": "Graham Campbell",
"email": "hello@gjcampbell.co.uk"
"email": "hello@gjcampbell.co.uk",
"homepage": "https://github.com/GrahamCampbell"
},
{
"name": "Vance Lucas",
"email": "vance@vancelucas.com"
"email": "vance@vancelucas.com",
"homepage": "https://github.com/vlucas"
}
],
"require": {
1 change: 0 additions & 1 deletion phpstan.src.neon.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
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.#'
- '#Method Dotenv\\Regex\\Regex::split\(\) should return Dotenv\\Result\\Result\<array\<string\>, string\> but returns Dotenv\\Result\\Result\<array\<int, bool\|string\>, string\>.#'
4 changes: 2 additions & 2 deletions phpstan.tests.neon.dist
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@ parameters:
checkMissingIterableValueType: false
ignoreErrors:
- '#Parameter \#1 \$name of method Dotenv\\Repository\\RepositoryInterface::[a-z]+\(\) expects string, [a-z]+ given.#'
- '#no return typehint specified#'
- '#with no typehint#'
- '#no return type specified#'
- '#with no type#'
- '#Call to deprecated method assertInternalType.+#'
5 changes: 5 additions & 0 deletions src/Repository/AbstractRepository.php
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@

use Dotenv\Repository\Adapter\ArrayAdapter;
use InvalidArgumentException;
use ReturnTypeWillChange;

abstract class AbstractRepository implements RepositoryInterface
{
@@ -144,6 +145,7 @@ public function has($name)
/**
* {@inheritdoc}
*/
#[ReturnTypeWillChange]
public function offsetExists($offset)
{
return $this->has($offset);
@@ -152,6 +154,7 @@ public function offsetExists($offset)
/**
* {@inheritdoc}
*/
#[ReturnTypeWillChange]
public function offsetGet($offset)
{
return $this->get($offset);
@@ -160,6 +163,7 @@ public function offsetGet($offset)
/**
* {@inheritdoc}
*/
#[ReturnTypeWillChange]
public function offsetSet($offset, $value)
{
$this->set($offset, $value);
@@ -168,6 +172,7 @@ public function offsetSet($offset, $value)
/**
* {@inheritdoc}
*/
#[ReturnTypeWillChange]
public function offsetUnset($offset)
{
$this->clear($offset);
8 changes: 4 additions & 4 deletions vendor-bin/phpstan/composer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"require": {
"phpstan/phpstan": "0.12.99",
"phpstan/phpstan": "1.2.0",
"phpstan/extension-installer": "1.1.0",
"phpstan/phpstan-deprecation-rules": "0.12.6",
"phpstan/phpstan-strict-rules": "0.12.11",
"thecodingmachine/phpstan-strict-rules": "0.12.1"
"phpstan/phpstan-deprecation-rules": "1.0.0",
"phpstan/phpstan-strict-rules": "1.1.0",
"thecodingmachine/phpstan-strict-rules": "1.0.0"
},
"config": {
"preferred-install": "dist"
2 changes: 1 addition & 1 deletion vendor-bin/psalm/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"psalm/phar": "4.10.0"
"psalm/phar": "4.15.0"
},
"config": {
"preferred-install": "dist"