Merge branch 1.6.x into main (#1295)

.gitignore

@@ -9,7 +9,7 @@
 build/
 composer.phar
 docs/api
-library/Hamcrest/*
+src/Hamcrest/*
 pearfarm.spec
 phpDocumentor.phar*
 phpunit.xml

.php-cs-fixer.dist.php

@@ -5,7 +5,7 @@
 
 if (class_exists('PhpCsFixer\Finder')) {    // PHP-CS-Fixer 2.x
     $finder = PhpCsFixer\Finder::create()->in([
-        'library',
+        'src',
         'tests',
     ]);
 
@@ -21,7 +21,7 @@
 
 $finder = DefaultFinder::create()->in(
     [
-        'library',
+        'src',
         'tests',
     ]);
 

.php_cs

@@ -5,7 +5,7 @@ use Symfony\CS\Finder\DefaultFinder;
 
 if (class_exists('PhpCsFixer\Finder')) {    // PHP-CS-Fixer 2.x
     $finder = PhpCsFixer\Finder::create()->in([
-        'library',
+        'src',
         'tests',
     ]);
 
@@ -20,7 +20,7 @@ if (class_exists('PhpCsFixer\Finder')) {    // PHP-CS-Fixer 2.x
 
 $finder = DefaultFinder::create()->in(
     [
-        'library',
+        'src',
         'tests',
     ]);
 

README.md

@@ -39,10 +39,10 @@ The current version can be seen at [docs.mockery.io](http://docs.mockery.io).
 ## PHPUnit Integration
 
 Mockery ships with some helpers if you are using PHPUnit. You can extend the
-[`Mockery\Adapter\Phpunit\MockeryTestCase`](library/Mockery/Adapter/Phpunit/MockeryTestCase.php)
+[`Mockery\Adapter\Phpunit\MockeryTestCase`](src/Mockery/Adapter/Phpunit/MockeryTestCase.php)
 class instead of `PHPUnit\Framework\TestCase`, or if you are already using a
 custom base class for your tests, take a look at the traits available in the
-[`Mockery\Adapter\Phpunit`](library/Mockery/Adapter/Phpunit) namespace.
+[`Mockery\Adapter\Phpunit`](src/Mockery/Adapter/Phpunit) namespace.
 
 ## Test Doubles
 

composer.json

@@ -28,7 +28,7 @@
     ],
     "homepage": "https://github.com/mockery/mockery",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": ">=7.4,<8.3",
         "lib-pcre": ">=7.0",
         "hamcrest/hamcrest-php": "^2.0.1"
     },
@@ -42,11 +42,11 @@
     },
     "autoload": {
         "psr-4": {
-            "Mockery\\": "library/Mockery"
+            "Mockery\\": "src/Mockery"
         },
         "files": [
-            "library/helpers.php",
-            "library/Mockery.php"
+            "src/helpers.php",
+            "src/Mockery.php"
         ]
     },
     "autoload-dev": {
@@ -73,7 +73,7 @@
             "@composer validate",
             "@test"
         ],
-        "docs": "vendor/bin/phpdoc -d library -t docs/api",
+        "docs": "vendor/bin/phpdoc -d src -t docs/api",
         "phpunit": "vendor/bin/phpunit --colors=always --testdox --stop-on-failure",
         "phpunit:coverage": "vendor/bin/phpunit --colors=always --testdox --stop-on-failure --coverage-clover=coverage.xml",
         "psalm": [