Release v4.x

.github/workflows/tests.yml

@@ -54,6 +54,13 @@ jobs:
       - name: "Install composer dependencies"
         run: composer install --prefer-dist --no-progress
 
+      # WordPress tests works only with PHPUnit 9.x :(
+      # https://github.com/dimitriBouteille/wp-orm/actions/runs/11192354429/job/31116408495
+      - name: "Install PHPUnit v9"
+        run: |
+          composer require --dev phpunit/phpunit ^9.0 -W
+          composer require --dev yoast/phpunit-polyfills ^3.0 -W
+
       - name: "Install WP"
         shell: bash
         run: ./config/scripts/install-wp-tests.sh wordpress_test root '' 127.0.0.1:3306 ${{ matrix.wp_version }}

.php-cs-fixer.php

@@ -15,7 +15,7 @@
 ;
 
 $header = <<<EOF
-    Copyright (c) 2024 Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
+    Copyright © Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
     See LICENSE.txt for license details.
 
     Author: Dimitri BOUTEILLE <bonjour@dimitri-bouteille.fr>

README.md

@@ -2,9 +2,6 @@
 
 ![GitHub Release](https://img.shields.io/github/v/release/dimitriBouteille/wp-orm) [![tests](https://img.shields.io/github/actions/workflow/status/dimitriBouteille/wp-orm/tests.yml?label=tests)](https://github.com/dimitriBouteille/wp-orm/actions/workflows/tests.yml) [![Packagist Downloads](https://img.shields.io/packagist/dt/dbout/wp-orm?color=yellow)](https://packagist.org/packages/dbout/wp-orm) ![Eloquent version](https://img.shields.io/packagist/dependency-v/dbout/wp-orm/illuminate%2Fdatabase?color=orange)
 
-> [!IMPORTANT]
-> The phinx package will be removed in a future release in order to use the Laravel migration system. It is therefore advisable to stop using the tool. [More info](https://github.com/dimitriBouteille/wp-orm/issues/27).
-
 WordPress ORM with Eloquent is a small library that adds a basic ORM into WordPress, which is easily extendable and includes models for core WordPress models such as posts, post metas, users, comments and more.
 The ORM is based on [Eloquent ORM](https://laravel.com/docs/eloquent) and uses the WordPress connection (`wpdb` class).
 
@@ -39,7 +36,6 @@ This documentation only covers the specific points of this library, if you want
 - [Create custom model](doc/create-model.md)
     - [Generic Model](doc/create-model.md#generic-model)
     - [Custom Post Type Model](doc/create-model.md#custom-post-type-model)
-- [~~Migration with Phinx~~](doc/migration.md)
 
 ## Installation
 

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "dbout/wp-orm",
-  "description": "WordPress ORM with Eloquent and Phinx.",
+  "description": "WordPress ORM with Eloquent.",
   "type": "package",
   "license": "MIT",
   "authors": [
@@ -11,7 +11,7 @@
       "role": "Developer"
     }
   ],
-  "keywords": ["wordpress", "wp", "orm", "database", "eloquent", "db", "sql", "migration", "phinx"],
+  "keywords": ["wordpress", "wp", "orm", "database", "eloquent", "db", "sql", "migration"],
   "homepage": "https://github.com/dimitriBouteille/wp-orm",
   "support": {
     "issues": "https://github.com/dimitriBouteille/wp-orm/issues",
@@ -21,17 +21,13 @@
   "prefer-stable": true,
   "require": {
     "php": ">=8.2",
-    "robmorgan/phinx": "^0.12.5",
-    "illuminate/database": "^11.0",
-    "laravel/serializable-closure": "^1.3"
+    "laravel/serializable-closure": "^1.3",
+    "illuminate/database": "^11.0"
   },
   "suggest": {
     "illuminate/events": "Add events to your models"
   },
   "autoload": {
-    "files": [
-      "src/includes/migrations.php"
-    ],
     "psr-4": {
       "Dbout\\WpOrm\\": "src/"
     }
@@ -42,20 +38,19 @@
     }
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^3.28",
-    "phpstan/phpstan": ">=1.10.59",
-    "phpstan/phpstan-phpunit": "^1.3",
-    "phpstan/extension-installer": "^1.3",
-    "rector/rector": "^1.0",
+    "friendsofphp/php-cs-fixer": "^3.64",
+    "phpstan/phpstan": "^1.12",
+    "phpstan/extension-installer": "^1.4",
     "szepeviktor/phpstan-wordpress": "^1.3",
-    "phpunit/phpunit": "^9.6",
-    "yoast/phpunit-polyfills": "^2.0",
-    "roots/wordpress": "^6.5"
+    "rector/rector": "^1.2",
+    "roots/wordpress": "^6.6",
+    "phpunit/phpunit": "^11.0",
+    "yoast/phpunit-polyfills": "^3.0"
   },
   "config": {
     "allow-plugins": {
-      "phpstan/extension-installer": true,
-      "roots/wordpress-core-installer": true
+      "roots/wordpress-core-installer": true,
+      "phpstan/extension-installer": true
     }
   },
   "extra": {

config/scripts/install-wp-tests.sh

@@ -26,11 +26,22 @@ WP_TESTS_DIR=${WP_TESTS_DIR-$TMPDIR/wordpress-tests-lib}
 WP_CORE_DIR=${WP_CORE_DIR-$TMPDIR/wordpress}
 
 download() {
-	if [ `which curl` ]; then
-		curl -s "$1" > "$2";
-	elif [ `which wget` ]; then
-		wget -nv -O "$2" "$1"
-	fi
+    if [ `which curl` ]; then
+        curl -s "$1" > "$2";
+    elif [ `which wget` ]; then
+        wget -nv -O "$2" "$1"
+    else
+        echo "Error: Neither curl nor wget is installed."
+        exit 1
+    fi
+}
+
+# Check if svn is installed
+check_svn_installed() {
+    if ! command -v svn > /dev/null; then
+        echo "Error: svn is not installed. Please install svn and try again."
+        exit 1
+    fi
 }
 
 if [[ $WP_VERSION =~ ^[0-9]+\.[0-9]+\-(beta|RC)[0-9]+$ ]]; then
@@ -72,6 +83,7 @@ install_wp() {
 	if [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
 		mkdir -p $TMPDIR/wordpress-trunk
 		rm -rf $TMPDIR/wordpress-trunk/*
+        check_svn_installed
 		svn export --quiet https://core.svn.wordpress.org/trunk $TMPDIR/wordpress-trunk/wordpress
 		mv $TMPDIR/wordpress-trunk/wordpress/* $WP_CORE_DIR
 	else
@@ -116,6 +128,7 @@ install_test_suite() {
 		# set up testing suite
 		mkdir -p $WP_TESTS_DIR
 		rm -rf $WP_TESTS_DIR/{includes,data}
+        check_svn_installed
 		svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
 		svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
 	fi

phpstan.neon

@@ -4,4 +4,4 @@ parameters:
         - src
         - tests
     excludePaths:
-        - tests/WordPress
+        - tests/WordPress/TestCase

phpunit.xml

@@ -2,21 +2,19 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          bootstrap="./tests/Unit/Bootstrap.php"
-         cacheResultFile="var/cache/phpunit/unit"
+         cacheDirectory="var/cache/phpunit/unit"
          backupGlobals="false"
-         backupStaticAttributes="false"
          colors="true"
-         convertDeprecationsToExceptions="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         forceCoversAnnotation="true"
+         stopOnDeprecation="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"
          stopOnIncomplete="false"
-         stopOnSkipped="false"
-         verbose="true">
+         stopOnSkipped="false">
   <testsuites>
     <testsuite name="Tests">
       <directory>tests/Unit/</directory>

src/Api/CustomModelTypeInterface.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2024 Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
+ * Copyright © Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
  * See LICENSE.txt for license details.
  *
  * Author: Dimitri BOUTEILLE <bonjour@dimitri-bouteille.fr>

src/Api/WithMetaModelInterface.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2024 Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
+ * Copyright © Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
  * See LICENSE.txt for license details.
  *
  * Author: Dimitri BOUTEILLE <bonjour@dimitri-bouteille.fr>

src/Builders/AbstractBuilder.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2024 Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
+ * Copyright © Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
  * See LICENSE.txt for license details.
  *
  * Author: Dimitri BOUTEILLE <bonjour@dimitri-bouteille.fr>

src/Builders/AbstractWithMetaBuilder.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2024 Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
+ * Copyright © Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
  * See LICENSE.txt for license details.
  *
  * Author: Dimitri BOUTEILLE <bonjour@dimitri-bouteille.fr>

src/Builders/CommentBuilder.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2024 Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
+ * Copyright © Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
  * See LICENSE.txt for license details.
  *
  * Author: Dimitri BOUTEILLE <bonjour@dimitri-bouteille.fr>

src/Builders/OptionBuilder.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2024 Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
+ * Copyright © Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
  * See LICENSE.txt for license details.
  *
  * Author: Dimitri BOUTEILLE <bonjour@dimitri-bouteille.fr>
@@ -12,19 +12,6 @@
 
 class OptionBuilder extends AbstractBuilder
 {
-    /**
-     * @param string $optionName
-     * @return Option|null
-     * @deprecated Remove in next version
-     * @see Option::findOneByName()
-     */
-    public function findOneByName(string $optionName): ?Option
-    {
-        /** @var Option|null $model */
-        $model = $this->firstWhere(Option::NAME, $optionName);
-        return $model;
-    }
-
     /**
      * @param string $optionName
      * @return $this

src/Builders/PostBuilder.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2024 Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
+ * Copyright © Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
  * See LICENSE.txt for license details.
  *
  * Author: Dimitri BOUTEILLE <bonjour@dimitri-bouteille.fr>
@@ -13,23 +13,6 @@
 
 class PostBuilder extends AbstractWithMetaBuilder
 {
-    /**
-     * @param string|null $name
-     * @return Post|null
-     * @deprecated Remove in next version
-     * @see Post::findOneByName()
-     */
-    public function findOneByName(?string $name): ?Post
-    {
-        if (!$name) {
-            return null;
-        }
-
-        /** @var Post|null $model */
-        $model = $this->firstWhere(Post::POST_NAME, $name);
-        return $model;
-    }
-
     /**
      * @param string $type
      * @return Collection

src/Builders/TermBuilder.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2024 Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
+ * Copyright © Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
  * See LICENSE.txt for license details.
  *
  * Author: Dimitri BOUTEILLE <bonjour@dimitri-bouteille.fr>

src/Builders/UserBuilder.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2024 Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
+ * Copyright © Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
  * See LICENSE.txt for license details.
  *
  * Author: Dimitri BOUTEILLE <bonjour@dimitri-bouteille.fr>
@@ -12,32 +12,6 @@
 
 class UserBuilder extends AbstractWithMetaBuilder
 {
-    /**
-     * @param string $email
-     * @return User|null
-     * @deprecated Remove in next version
-     * @see User::findOneByEmail()
-     */
-    public function findOneByEmail(string $email): ?User
-    {
-        /** @var User|null $model */
-        $model = $this->firstWhere(User::EMAIL, $email);
-        return $model;
-    }
-
-    /**
-     * @param string $login
-     * @return User|null
-     * @deprecated Remove in next version
-     * @see User::findOneByLogin()
-     */
-    public function findOneByLogin(string $login): ?User
-    {
-        /** @var User|null $model */
-        $model = $this->firstWhere(User::LOGIN, $login);
-        return $model;
-    }
-
     /**
      * @param string $email
      * @return $this