Merge pull request #464 from cakephp/3.next-merge

merge 3.x => 3.next
cakephp · Sep 13, 2024 · 050465e · 050465e
2 parents 786d69e + a4e7ea3
commit 050465e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
         coverage: pcov
 
     - name: Composer install
-      uses: ramsey/composer-install@v2
+      uses: ramsey/composer-install@v3
       with:
         dependency-versions: ${{ matrix.dependencies }}
         composer-options: ${{ matrix.composer-options }}

diff --git a/docs/en/index.rst b/docs/en/index.rst
@@ -170,9 +170,9 @@ Once you have 2 instances of Chronos date/time objects you can compare them in
 a variety of ways::
 
     // Full suite of comparators exist
-    // ne, gt, lt, lte.
-    $first->eq($second);
-    $first->gte($second);
+    // equals, notEquals, greaterThan, greaterThanOrEquals, lessThan, lessThanOrEquals
+    $first->equals($second);
+    $first->greaterThanOrEquals($second);
 
     // See if the current object is between two others.
     $now->between($start, $end);

diff --git a/docs/fr/index.rst b/docs/fr/index.rst
@@ -184,10 +184,10 @@ Méthodes de Comparaison
 Une fois que vous avez 2 instances d'objets date/time de Chronos, vous pouvez
 les comparer de plusieurs façons::
 
-    // Il exste une suite complète de comparateurs
-    // ne, gt, lt, lte.
-    $first->eq($second);
-    $first->gte($second);
+    // Il existe une suite complète de comparateurs
+    // equals, notEquals, greaterThan, greaterThanOrEquals, lessThan, lessThanOrEquals
+    $first->equals($second);
+    $first->greaterThanOrEquals($second);
 
     // Regarder si l'objet courant est entre deux autres.
     $now->between($start, $end);

diff --git a/docs/ja/index.rst b/docs/ja/index.rst
@@ -165,9 +165,9 @@ Chronos オブジェクトは細やかに値を変更できるメソッドを提
 Chronos の日付/時間オブジェクトの2つのインスタンスを様々な方法で比較することができます。 ::
 
     // 比較のフルセットが存在します
-    // ne, gt, lt, lte.
-    $first->eq($second);
-    $first->gte($second);
+    // equals, notEquals, greaterThan, greaterThanOrEquals, lessThan, lessThanOrEquals
+    $first->equals($second);
+    $first->greaterThanOrEquals($second);
 
     // カレントオブジェクトが2つのオブジェクトの間にあるかどうかを確認します。
     $now->between($start, $end);

diff --git a/docs/pt/index.rst b/docs/pt/index.rst
@@ -152,9 +152,9 @@ Uma vez que você possui 2 instâncias de objetos data/hora do Chronos, é poss
 compará-los de várias maneiras::
 
     // Coleção completa de comparadores
-    // ne, gt, lt, lte.
-    $first->eq($second);
-    $first->gte($second);
+    // equals, notEquals, greaterThan, greaterThanOrEquals, lessThan, lessThanOrEquals
+    $first->equals($second);
+    $first->greaterThanOrEquals($second);
 
     // Veja se o objeto atual está entre outros
     $now->between($start, $end);