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: srh/php-rql
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: chswx/php-rql
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 14 commits
  • 34 files changed
  • 1 contributor

Commits on Aug 26, 2022

  1. Update phpunit to ~9.0

    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    091cfdd View commit details

  2. Rename match to match_, to avoid PHP 8 keyword

    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    ee50f54 View commit details

  3. Update MathTest.php to use match_

    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    7ef391e View commit details

  4. Make setUp() and tearDown() functions have a void type

    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    628a901 View commit details

  5. Use expectedException instead of setExpectedException

    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    553ae44 View commit details

  6. Use assertStringContainsString

    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    0bac1b4 View commit details

  7. Update phpunit version to 9.5 and php-parallel-lint to 1.3

    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    f332e9d View commit details

  8. Use colors attribute in phpunit.xml

    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    ddb144a View commit details

  9. Migrate phpunit.xml to 9.3 schema 

    This was done with phpunit --migrate-configuration
    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    378e812 View commit details

  10. Make Cursor use types from Iterator interface

    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    674bd09 View commit details

  11. Use three-way comparison for usort in JoinTest

    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    a6d1f6b View commit details

  12. Update docs to php 8.1 and fix curly brace array/string access fatal … 

    …errors
    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    4817499 View commit details

  13. Just an existing docs patch to use match_

    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    d3e3f38 View commit details

  14. Add new patches to docs for match_ 

    That's in addition to the one already-modified patch.
    @srh
    srh committed Aug 26, 2022
    Copy the full SHA
    1269745 View commit details
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@
"php": ">=5.3.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8",
"jakub-onderka/php-parallel-lint": "dev-master",
"phpunit/phpunit": "~9.5",
"php-parallel-lint/php-parallel-lint": "~1.3",
"squizlabs/php_codesniffer": "~2.5"
},
"autoload": {
4 changes: 2 additions & 2 deletions docs/generate.sh
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
cat js-index.md | php5 jsToPhp.php > php-index.md
cat js-index.md | php8.1 jsToPhp.php > php-index.md
cat php-patches.patch | patch php-index.md
cat php-index.md | php5 mdToHtml.php > index.html
cat php-index.md | php8.1 mdToHtml.php > index.html
6 changes: 3 additions & 3 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
@@ -1279,9 +1279,9 @@ <h3>object</h3>
<p><h2 id="String+manipulation">String manipulation</h2>
These commands provide string operators.</p>

<h3>match</h3>
<h3>match_</h3>

<pre class="syntax"><code class="syntax">string-&gt;match(regexp) &rarr; null/object
<pre class="syntax"><code class="syntax">string-&gt;match_(regexp) &rarr; null/object
</code></pre>

<p>Matches against a regular expression. If there is a match, returns an object with the fields:</p>
@@ -1298,7 +1298,7 @@ <h3>match</h3>
<p><strong>Example:</strong> Get all users whose name starts with "A".</p>

<pre class="example"><code class="php">r\table('users')-&gt;filter(function($doc){
return $doc('name')-&gt;match("^A");
return $doc('name')-&gt;match_("^A");
})-&gt;run($conn)
</code></pre>

Loading