Skip to content

Commit

Permalink
Merge pull request #334 from netglue/1.9.x-merge-up-into-2.0.x_mtwtdrgK
Browse files Browse the repository at this point in the history
Merge release 1.9.0 into 2.0.x
  • Loading branch information
gsteel authored Sep 18, 2023
2 parents 55bd697 + 2820a07 commit eddad30
Show file tree
Hide file tree
Showing 8 changed files with 478 additions and 390 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
name: PHPUnit Coverage
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: shivammathur/setup-php@2.25.1
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@2.26.0
with:
php-version: 8.1
extensions: pcov
Expand All @@ -38,8 +38,8 @@ jobs:
runs-on: "ubuntu-latest"

steps:
- uses: actions/checkout@v3
- uses: shivammathur/setup-php@2.25.1
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@2.26.0
with:
php-version: 8.1
- uses: "ramsey/[email protected]"
Expand Down
5 changes: 5 additions & 0 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ignore_php_platform_requirements": {
"8.3": true
}
}
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine)

# PHP Api Client for Prismic.io

[![Build Status](https://github.com/netglue/prismic-client/workflows/Continuous%20Integration/badge.svg)](https://github.com/netglue/prismic-client/actions?query=workflow%3A"Continuous+Integration")
[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine)

[![Build Status](https://github.com/netglue/prismic-client/workflows/Continuous%20Integration/badge.svg)](https://github.com/netglue/prismic-client/actions?query=workflow%3A"Continuous+Integration")
[![codecov](https://codecov.io/gh/netglue/prismic-client/branch/main/graph/badge.svg)](https://codecov.io/gh/netglue/prismic-client)
[![Psalm Type Coverage](https://shepherd.dev/github/netglue/prismic-client/coverage.svg)](https://shepherd.dev/github/netglue/prismic-client)
[![Latest Stable Version](https://poser.pugx.org/netglue/prismic-client/v/stable)](https://packagist.org/packages/netglue/prismic-client)
Expand Down Expand Up @@ -31,7 +31,7 @@ There is practically zero backwards compatibility with other prismic clients so

## Installation

Install with composer: `composer require netglue/prismic-client`
Install with composer: `composer require netglue/prismic-client`

You will also require a PSR-18 HTTP client implementation, of which there are many, for example:

Expand All @@ -46,7 +46,7 @@ Docs are a work in progress and are hosted in a public prismic repository _(obvi

You can view the docs by cloning the library, cd to the source and issue a `composer install` followed by a `composer serve`. This will start up PHP's built-in server on [http://127.0.0.1:8080](http://127.0.0.1:8080) showing the docs.

#### Samples & Examples
### Samples & Examples

Take a look around in the `./samples` directory; that's where you’ll find the document explorer used for rendering the documentation and examples for setting up hydrating result sets, link resolver implementations and other stuff.

Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}
},
"require": {
"php": "~8.1 || ~8.2",
"php": "~8.1 || ~8.2 || ~8.3",
"ext-json": "*",
"laminas/laminas-escaper": "^2.9",
"php-http/discovery": "^1.18.0",
Expand All @@ -48,17 +48,17 @@
"require-dev": {
"ext-curl": "*",
"doctrine/coding-standard": "^12.0",
"laminas/laminas-diactoros": "^3.0.0",
"laminas/laminas-diactoros": "^3.2.0",
"php-http/cache-plugin": "^1.8",
"php-http/curl-client": "^2.3",
"php-http/mock-client": "^1.5.1",
"phpunit/phpunit": "^10.1.3",
"php-http/mock-client": "^1.6",
"phpunit/phpunit": "^10.3.4",
"psalm/plugin-phpunit": "^0.18.4",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.7.2",
"symfony/cache": "^5.4.15 || ^6.2.10",
"symfony/options-resolver": "^5.4.11 || ^6.2.7",
"vimeo/psalm": "^5.11"
"symfony/cache": "^5.4.15 || ^6.3.4",
"symfony/options-resolver": "^5.4.11 || ^6.3",
"vimeo/psalm": "^5.15.0"
},
"scripts": {
"check": [
Expand Down
Loading

0 comments on commit eddad30

Please sign in to comment.