Merge pull request #760 from moneyphp/php83

Support PHP 8.3

.gitattributes

@@ -8,12 +8,10 @@ Dockerfile             export-ignore
 /benchmark/            export-ignore
 /hack/                 export-ignore
 /phpbench.json         export-ignore
-/phpspec.yml.dist      export-ignore
 /phpstan-baseline.neon export-ignore
 /phpstan.neon.dist     export-ignore
 /phpunit.xml.dist      export-ignore
 /psalm.xml             export-ignore
-/spec/                 export-ignore
 /tests/                export-ignore
 
 /doc/               export-ignore

.github/workflows/checks.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install
         uses: docker://composer

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up locales
         run: ./hack/setup-locales.sh
@@ -40,6 +40,7 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
 
     steps:
       - name: Set up PHP
@@ -53,7 +54,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up locales
         run: ./hack/setup-locales.sh
@@ -70,7 +71,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
@@ -95,7 +96,7 @@ jobs:
           architecture: 'x64'
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |

.github/workflows/static.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2

.gitignore

@@ -3,7 +3,6 @@
 .php_cs.cache
 .phpunit.result.cache
 /build/
-/phpspec.yml
 /phpunit.xml
 /vendor/
 

README.md

@@ -67,7 +67,7 @@ Please see the [official documentation](http://moneyphp.org).
 
 ## Testing
 
-We try to follow BDD and TDD, as such we use both [phpspec](http://www.phpspec.net) and [phpunit](https://phpunit.de) to test this library.
+We try to follow TDD by using [phpunit](https://phpunit.de) to test this library.
 
 ```bash
 $ composer test

composer.json

@@ -24,7 +24,7 @@
     ],
     "homepage": "http://moneyphp.org",
     "require": {
-        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
         "ext-bcmath": "*",
         "ext-filter": "*",
         "ext-json": "*"
@@ -42,11 +42,10 @@
         "php-http/message": "^1.11.0",
         "php-http/mock-client": "^1.4.1",
         "phpbench/phpbench": "^1.2.5",
-        "phpspec/phpspec": "^7.3",
         "phpunit/phpunit": "^9.5.4",
         "psalm/plugin-phpunit": "^0.18.4",
         "psr/cache": "^1.0.1",
-        "vimeo/psalm": "~5.3.0"
+        "vimeo/psalm": "~5.15.0"
     },
     "suggest": {
         "ext-gmp": "Calculate without integer limits",
@@ -65,8 +64,7 @@
     "autoload-dev": {
         "psr-4": {
             "Benchmark\\Money\\": "benchmark/",
-            "Tests\\Money\\": "tests/",
-            "spec\\Money\\": "spec/"
+            "Tests\\Money\\": "tests/"
         }
     },
     "config": {
@@ -90,7 +88,6 @@
         ],
         "clean": "rm -rf build/ vendor/",
         "test": [
-            "vendor/bin/phpspec run",
             "vendor/bin/phpunit -v",
             "vendor/bin/phpbench run",
             "vendor/bin/psalm",

doc/conf.py

@@ -78,7 +78,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:

doc/features/teller.rst

@@ -24,14 +24,14 @@ The Teller offers these methods:
 
 * operation
 
-    * ``absolute($amount) : string`` Returns an absoute monetary amount.
+    * ``absolute($amount) : string`` Returns an absolute monetary amount.
     * ``add($amount, $other, ...$others) : string`` Adds one or more monetary amounts to a monetary amount.
     * ``divide($amount, $divisor) : string`` Divides a monetary amount by a divisor.
-    * ``mod($amount, $divisor)`` Retuns the mod of one amount by another.
+    * ``mod($amount, $divisor)`` Returns the mod of one amount by another.
     * ``multiply($amount, $multiplier) : string`` Multiplies a monetary amount by a multiplier.
     * ``negative($amount) : string`` Negates a monetary amount.
     * ``ratioOf($amount, $other)`` Determines the ratio of one monetary amount to another.
-    * ``subtract($amount, $other, ...$others) : string`` Subracts one or more monetary amounts from a monetary amount.
+    * ``subtract($amount, $other, ...$others) : string`` Subtracts one or more monetary amounts from a monetary amount.
 
 * comparison
 

doc/requirements.txt

@@ -1,6 +1,6 @@
 git+https://github.com/fabpot/sphinx-php.git
-sphinx~=4.3.1
-sphinx-rtd-theme==1.0.0
+sphinx~=7.2.6
+sphinx-rtd-theme~=1.3.0
 git+https://github.com/markstory/sphinxcontrib-phpdomain.git
-sphinxcontrib-spelling==7.2.1
+sphinxcontrib-spelling==8.0.0
 pyenchant

doc/spelling_word_list.txt

@@ -1,5 +1,7 @@
 amongst
 integrations
+codebases
+formatter
 formatters
 eg
 Bitcoin