Skip to content

Commit e5bef8c

Browse files
authored
chore: update frankenphp and fix cs (#588)
1 parent eb19c71 commit e5bef8c

File tree

13 files changed

+2051
-3845
lines changed

13 files changed

+2051
-3845
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ jobs:
1717
uses: actions/setup-node@v4
1818
with:
1919
node-version: 'current'
20-
-
21-
name: Setup npm
22-
uses: bahmutov/npm-install@v1
23-
with:
24-
install-command: yarn --immutable
20+
-
21+
name: Enable corepack
22+
run: corepack enable
2523
-
2624
name: Install dependencies
2725
run: yarn install

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FROM node_upstream AS base
1111
WORKDIR /srv/app
1212

1313
RUN corepack enable && \
14-
corepack prepare --activate yarn@*
14+
corepack prepare --activate yarn@4
1515

1616
ENV HOSTNAME localhost
1717
EXPOSE 3000

api/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# Versions
77
# hadolint ignore=DL3007
8-
FROM dunglas/frankenphp:latest-alpine AS frankenphp_upstream
8+
FROM dunglas/frankenphp:1-php8.3-alpine AS frankenphp_upstream
99

1010

1111
# The different stages of this Dockerfile are meant to be built into separate images

api/config/packages/api_platform.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ api_platform:
1515
stateless: true
1616
cache_headers:
1717
vary: ['Content-Type', 'Authorization', 'Origin']
18-
extra_properties:

api/migrations/Version20210930074739.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ public function getDescription(): string
2020
public function up(Schema $schema): void
2121
{
2222
// this up() migration is auto-generated, please modify it to your needs
23-
$this->addSql('CREATE SEQUENCE greeting_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
2423
$this->addSql('CREATE TABLE greeting (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))');
24+
$this->addSql('CREATE SEQUENCE greeting_seq INCREMENT BY 100 MINVALUE 1 START 1');
2525
}
2626

2727
public function down(Schema $schema): void
2828
{
2929
// this down() migration is auto-generated, please modify it to your needs
3030
$this->addSql('CREATE SCHEMA public');
31-
$this->addSql('DROP SEQUENCE greeting_id_seq CASCADE');
31+
$this->addSql('DROP SEQUENCE greeting_seq CASCADE');
3232
$this->addSql('DROP TABLE greeting');
3333
}
3434
}

api/migrations/Version20240305143335.php

Lines changed: 0 additions & 34 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,5 @@
9494
"storybook:serve": "serve storybook-static",
9595
"storybook:test": "test-storybook"
9696
},
97-
"packageManager": "[email protected]"
97+
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
9898
}

src/create/CreateGuesser.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ export const IntrospectedCreateGuesser = ({
7373
mutationOptions,
7474
transform,
7575
redirectTo,
76+
children: [],
7677
});
7778

7879
const displayOverrideCode = useDisplayOverrideCode();

src/edit/EditGuesser.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ export const IntrospectedEditGuesser = ({
7878
mutationOptions,
7979
transform,
8080
redirectTo,
81+
children: [],
8182
});
8283
useMercureSubscription(resource, id);
8384

src/hydra/fetchHydra.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function fetchHydra(
7272
Promise.reject(
7373
new HttpError(
7474
(
75-
json[0][
75+
json[0]?.[
7676
'http://www.w3.org/ns/hydra/core#description'
7777
] as JsonLdObj[]
7878
)?.[0]?.['@value'],

src/introspection/Introspecter.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ const Introspecter = ({
6363

6464
return (
6565
<ResourcesIntrospecter
66+
{...rest}
6667
component={component}
6768
schemaAnalyzer={schemaAnalyzerProxy}
6869
includeDeprecated={includeDeprecated}
6970
resource={resource}
7071
resources={resources ?? []}
7172
loading={isPending}
7273
error={error}
73-
{...rest}
7474
/>
7575
);
7676
};

src/useOnSubmit.test.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const onSubmitProps = {
1919
fields: API_FIELDS_DATA,
2020
resource: 'books',
2121
schemaAnalyzer: schemaAnalyzer(),
22+
children: [],
2223
};
2324

2425
jest.mock('./getIdentifierValue.js');

0 commit comments

Comments
 (0)