From 7921745e46debe87d21743b082fea31800671ab8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 21:01:53 +0000
Subject: [PATCH 01/11] Bump twig/twig from 3.8.0 to 3.14.0
Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.8.0 to 3.14.0.
- [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG)
- [Commits](https://github.com/twigphp/Twig/compare/v3.8.0...v3.14.0)
---
updated-dependencies:
- dependency-name: twig/twig
dependency-type: direct:production
...
Signed-off-by: dependabot[bot]
---
composer.lock | 67 ++++++++++++++++++++++++++++-----------------------
1 file changed, 37 insertions(+), 30 deletions(-)
diff --git a/composer.lock b/composer.lock
index 3047243..c4a63a9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5392,20 +5392,20 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-ctype": "*"
@@ -5451,7 +5451,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
},
"funding": [
{
@@ -5467,7 +5467,7 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
@@ -5714,20 +5714,20 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-mbstring": "*"
@@ -5774,7 +5774,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
},
"funding": [
{
@@ -5790,7 +5790,7 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-php72",
@@ -6023,20 +6023,20 @@
},
{
"name": "symfony/polyfill-php81",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
+ "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
- "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
+ "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+ "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"type": "library",
"extra": {
@@ -6079,7 +6079,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
},
"funding": [
{
@@ -6095,7 +6095,7 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/process",
@@ -7409,30 +7409,37 @@
},
{
"name": "twig/twig",
- "version": "v3.8.0",
+ "version": "v3.14.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d"
+ "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
- "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/126b2c97818dbff0cdf3fbfc881aedb3d40aae72",
+ "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
+ "php": ">=8.0.2",
+ "symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-mbstring": "^1.3",
- "symfony/polyfill-php80": "^1.22"
+ "symfony/polyfill-php81": "^1.29"
},
"require-dev": {
"psr/container": "^1.0|^2.0",
- "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0"
+ "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
},
"type": "library",
"autoload": {
+ "files": [
+ "src/Resources/core.php",
+ "src/Resources/debug.php",
+ "src/Resources/escaper.php",
+ "src/Resources/string_loader.php"
+ ],
"psr-4": {
"Twig\\": "src/"
}
@@ -7465,7 +7472,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
- "source": "https://github.com/twigphp/Twig/tree/v3.8.0"
+ "source": "https://github.com/twigphp/Twig/tree/v3.14.0"
},
"funding": [
{
@@ -7477,7 +7484,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-21T18:54:41+00:00"
+ "time": "2024-09-09T17:55:12+00:00"
}
],
"packages-dev": [
From f9089e26077c2fac6247733eaaa62183355a1155 Mon Sep 17 00:00:00 2001
From: Rasmus Winter
Date: Tue, 15 Oct 2024 10:04:10 +0100
Subject: [PATCH 02/11] bumping circleci orb
---
.circleci/config.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 403954f..dd1d46d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
orbs:
# Hold off on 8.2.x+ until the fix for https://github.com/CircleCI-Public/aws-ecr-orb/issues/256
# is in a tagged version.
- aws-ecr: circleci/aws-ecr@8.1.3
+ aws-ecr: circleci/aws-ecr@9.3.4
aws-ecs: circleci/aws-ecs@3.2.0
workflows:
From 0ee4eb85d5d5b3b6a03a65b9d8327a7540c7325a Mon Sep 17 00:00:00 2001
From: Rasmus Winter
Date: Tue, 15 Oct 2024 10:08:27 +0100
Subject: [PATCH 03/11] renamed task
---
.circleci/config.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index dd1d46d..7a47a2d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,7 @@ orbs:
workflows:
deploy-staging:
jobs:
- - aws-ecr/build-and-push-image:
+ - aws-ecr/build_and_push_image:
context:
- ecs-deploys
filters:
@@ -23,14 +23,14 @@ workflows:
context:
- ecs-deploys
requires:
- - aws-ecr/build-and-push-image
+ - aws-ecr/build_and_push_image
family: 'ol-ecs-staging-wpackagist'
cluster: 'ol-ecs-staging-shared'
service-name: 'staging-wpackagist'
deploy-production:
jobs:
- - aws-ecr/build-and-push-image:
+ - aws-ecr/build_and_push_image:
context:
- ecs-deploys
filters:
@@ -44,7 +44,7 @@ workflows:
context:
- ecs-deploys
requires:
- - aws-ecr/build-and-push-image
+ - aws-ecr/build_and_push_image
family: 'ol-ecs-production-wpackagist'
cluster: 'ol-ecs-production-shared'
service-name: 'production-wpackagist'
From 7d1eb8f6239b4250ff4d1b9de4f6322d8b6a7023 Mon Sep 17 00:00:00 2001
From: Rasmus Winter
Date: Tue, 15 Oct 2024 10:14:59 +0100
Subject: [PATCH 04/11] reverting upgrade in favour of specifying image instead
---
.circleci/config.yml | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7a47a2d..35868d8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,13 +3,14 @@ version: 2.1
orbs:
# Hold off on 8.2.x+ until the fix for https://github.com/CircleCI-Public/aws-ecr-orb/issues/256
# is in a tagged version.
- aws-ecr: circleci/aws-ecr@9.3.4
+ aws-ecr: circleci/aws-ecr@8.1.3
aws-ecs: circleci/aws-ecs@3.2.0
workflows:
deploy-staging:
jobs:
- - aws-ecr/build_and_push_image:
+ - aws-ecr/build-and-push-image:
+ image: ubuntu-2004:edge
context:
- ecs-deploys
filters:
@@ -23,14 +24,15 @@ workflows:
context:
- ecs-deploys
requires:
- - aws-ecr/build_and_push_image
+ - aws-ecr/build-and-push-image
family: 'ol-ecs-staging-wpackagist'
cluster: 'ol-ecs-staging-shared'
service-name: 'staging-wpackagist'
deploy-production:
jobs:
- - aws-ecr/build_and_push_image:
+ - aws-ecr/build-and-push-image:
+ image: ubuntu-2004:edge
context:
- ecs-deploys
filters:
@@ -44,7 +46,7 @@ workflows:
context:
- ecs-deploys
requires:
- - aws-ecr/build_and_push_image
+ - aws-ecr/build-and-push-image
family: 'ol-ecs-production-wpackagist'
cluster: 'ol-ecs-production-shared'
service-name: 'production-wpackagist'
From 0631ea4110fb6bd8c283adc4a08f1375e764acd1 Mon Sep 17 00:00:00 2001
From: Rasmus Winter
Date: Tue, 15 Oct 2024 10:17:12 +0100
Subject: [PATCH 05/11] image -> machine.image
---
.circleci/config.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 35868d8..22feac7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,8 @@ workflows:
deploy-staging:
jobs:
- aws-ecr/build-and-push-image:
- image: ubuntu-2004:edge
+ machine:
+ image: ubuntu-2004:edge
context:
- ecs-deploys
filters:
@@ -32,7 +33,8 @@ workflows:
deploy-production:
jobs:
- aws-ecr/build-and-push-image:
- image: ubuntu-2004:edge
+ machine:
+ image: ubuntu-2004:edge
context:
- ecs-deploys
filters:
From 668b9f07886b7d6519e5a256862e372ee1ffd310 Mon Sep 17 00:00:00 2001
From: Rasmus Winter
Date: Tue, 15 Oct 2024 10:22:15 +0100
Subject: [PATCH 06/11] more nesting
---
.circleci/config.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 22feac7..8f43393 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,8 +10,9 @@ workflows:
deploy-staging:
jobs:
- aws-ecr/build-and-push-image:
- machine:
- image: ubuntu-2004:edge
+ executor:
+ machine:
+ image: ubuntu-2004:edge
context:
- ecs-deploys
filters:
@@ -33,8 +34,9 @@ workflows:
deploy-production:
jobs:
- aws-ecr/build-and-push-image:
- machine:
- image: ubuntu-2004:edge
+ executor:
+ machine:
+ image: ubuntu-2004:edge
context:
- ecs-deploys
filters:
From a8a8d95f197274e327d1b1446cddb9551907a4d6 Mon Sep 17 00:00:00 2001
From: Rasmus Winter
Date: Tue, 15 Oct 2024 10:23:07 +0100
Subject: [PATCH 07/11] quoting strings
---
.circleci/config.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8f43393..0404890 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,7 +12,7 @@ workflows:
- aws-ecr/build-and-push-image:
executor:
machine:
- image: ubuntu-2004:edge
+ image: 'ubuntu-2004:edge'
context:
- ecs-deploys
filters:
@@ -36,7 +36,7 @@ workflows:
- aws-ecr/build-and-push-image:
executor:
machine:
- image: ubuntu-2004:edge
+ image: 'ubuntu-2004:edge'
context:
- ecs-deploys
filters:
From 7a3671a386fbfc4be4714ef984e4edb9eccdc5b1 Mon Sep 17 00:00:00 2001
From: Rasmus Winter
Date: Tue, 15 Oct 2024 10:26:24 +0100
Subject: [PATCH 08/11] defining executor separately
---
.circleci/config.yml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0404890..2cfd768 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,13 +6,16 @@ orbs:
aws-ecr: circleci/aws-ecr@8.1.3
aws-ecs: circleci/aws-ecs@3.2.0
+executors:
+ outlandish:
+ machine:
+ image: ubuntu-2004:edge
+
workflows:
deploy-staging:
jobs:
- aws-ecr/build-and-push-image:
- executor:
- machine:
- image: 'ubuntu-2004:edge'
+ executor: outlandish
context:
- ecs-deploys
filters:
@@ -34,9 +37,7 @@ workflows:
deploy-production:
jobs:
- aws-ecr/build-and-push-image:
- executor:
- machine:
- image: 'ubuntu-2004:edge'
+ executor: outlandish
context:
- ecs-deploys
filters:
From 49ce1303e755005debea0cc4cfac47d56a43bc35 Mon Sep 17 00:00:00 2001
From: Rasmus
Date: Thu, 27 Mar 2025 13:40:28 +0000
Subject: [PATCH 09/11] Adding trademark disclaimer
---
web/templates/footer.twig | 35 ++++++++++++++++++++---------------
web/templates/index.twig | 10 +++++-----
2 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/web/templates/footer.twig b/web/templates/footer.twig
index 4d4d6bc..ff63210 100644
--- a/web/templates/footer.twig
+++ b/web/templates/footer.twig
@@ -1,15 +1,20 @@
-
+
+
+
+
+
+
An Outlandish experiment.
+
+ The WordPress® trademark is the intellectual property of the WordPress Foundation. Uses of the WordPress®
+ name in this website are for identification purposes only and do not imply an endorsement by WordPress Foundation.
+ WPackagist is not endorsed or owned by, or affiliated with, the WordPress Foundation.
+
+
diff --git a/web/templates/index.twig b/web/templates/index.twig
index 313f617..a326953 100644
--- a/web/templates/index.twig
+++ b/web/templates/index.twig
@@ -5,7 +5,7 @@
{% endblock %}
{% block content %}
- This site mirrors the WordPress This site mirrors the WordPress® plugin and theme directories as a Composer repository.
@@ -106,7 +106,7 @@
Avoid having to use git submodules.
- Manage WordPress and non-WordPress project libraries with the
+ Manage WordPress® and non-WordPress® project libraries with the
same tools.
Could eventually be used to manage dependencies between
@@ -116,7 +116,7 @@
How does the repository work?
- WordPress Core
+ WordPress® Core
See
fancyguy/webroot-installer or
roots/wordpress for installing
- WordPress itself using Composer.
+ WordPress® itself using Composer.
Contribute or get support
From 7cc34d717310d79e6006241c114d24872e813779 Mon Sep 17 00:00:00 2001
From: Rasmus
Date: Thu, 27 Mar 2025 14:07:54 +0000
Subject: [PATCH 10/11] more consistent naming as wpackagist
---
src/Controller/MainController.php | 4 ++--
web/templates/layout.twig | 6 +++---
web/templates/opensearch.twig | 12 ++++++------
web/templates/search.twig | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 6ac3531..2846fd9 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -111,7 +111,7 @@ public function packageJson(string $package, string $hash, string $dir): Respons
public function home(Request $request): Response
{
return $this->render('index.twig', [
- 'title' => 'WordPress Packagist: Manage your plugins and themes with Composer',
+ 'title' => 'WPackagist: Manage your WordPress® plugins and themes with Composer',
'searchForm' => $this->getForm()->handleRequest($request)->createView(),
]);
}
@@ -130,7 +130,7 @@ public function search(Request $request, EntityManagerInterface $entityManager):
$query = mb_convert_encoding($query, 'UTF-8');
$data = [
- 'title' => "WordPress Packagist: Search packages",
+ 'title' => "WPackagist: Search packages",
'searchForm' => $form->createView(),
'currentPageResults' => '',
'error' => '',
diff --git a/web/templates/layout.twig b/web/templates/layout.twig
index ca5d4cc..879b2c0 100644
--- a/web/templates/layout.twig
+++ b/web/templates/layout.twig
@@ -7,7 +7,7 @@
-
+