Merge branch 'release-candidate' into stable

.gitattributes

@@ -1,4 +1,2 @@
 # Auto detect text files and perform LF normalization
-* text=auto
-
-*.php text eol=lf
+* text=auto eol=lf

.github/workflows/close-stale-issues.yml

@@ -0,0 +1,13 @@
+name: "Close stale issues and pull requests"
+on:
+    schedule:
+        - cron: "0 0 * * *"
+
+jobs:
+    stale:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/stale@v6
+              with:
+                  stale-issue-label: "stale"
+                  stale-pr-label: "stale"

.gitignore

@@ -1,3 +1,5 @@
+*.code-workspace
+
 /src/cache/*
 
 /vendor/bin

.htaccess

@@ -4,17 +4,20 @@
 <IfModule mod_rewrite.c>
   RewriteEngine On
 
+  RewriteBase /
+
   # Page
   RewriteRule ^([a-z\-]+)$ /?page=$1 [QSA,L]
 
   # Wishlists (My lists)
   RewriteRule ^(wishlists)/([0-9]+)$ /?page=$1&id=$2 [QSA,L]
-
-  # Wish
-  RewriteRule ^(wish)/(\d+)$ /?page=$1&id=$2 [QSA,L]
+  RewriteRule ^(wishlists)/([0-9]+)/add$ /?page=$1&id=$2&wish_add=true [QSA,L]
 
   # Wishlist
   RewriteRule ^(wishlist)/([0-9a-f]{40})$ /?page=$1&hash=$2 [QSA,L]
+
+  # Blog Post
+  RewriteRule ^blog/([a-z\-0-9]+)$ /?page=post&slug=$1 [QSA,L]
 </IfModule>
 
 ##-- When caching of gzipped JS and CSS files is used, enable this setting
@@ -38,7 +41,7 @@
     Header set Cache-Control "max-age=2592000, public, must-revalidate"
   </FilesMatch>
   <FilesMatch "(\.css|\.js|\.CSS|\.JS)$">
-    Header set Cache-Control "max-age=604800, private, must-revalidate"
+    Header set Cache-Control "max-age=604800, public, must-revalidate"
   </FilesMatch>
   <FilesMatch "(\.xml|\.txt|\.XML|\.TXT)$">
     Header set Cache-Control "max-age=604800, public, must-revalidate"

README.md

@@ -1,109 +1,74 @@
-![wishthis logo](/src/assets/img/logo-readme.svg "wishthis logo")
+![wishthis logo](/src/assets/img/logo-readme.svg?v=2 "wishthis logo")
 
 # Make a wish
 
-wishthis is a simple, intuitive and modern wishlist platform to create, manage and view
-your wishes for any kind of occasion ([demo](https://wishthis.online)).
+wishthis is a simple, intuitive and modern wishlist platform to create, manage and view your wishes for any kind of occasion ([demo](https://wishthis.online)). Currently, wishthis is available in **99** different locales!
 
 ## :desktop_computer: Screenshots
+
 | Home                                                 | Wishlists                                                           |
 | ---------------------------------------------------- | ------------------------------------------------------------------- |
 | ![Home](/src/assets/img/screenshots/home.png "Home") | ![Wishlists](/src/assets/img/screenshots/wishlists.png "Wishlists") |
 
 ## :family_man_man_boy: Join the conversation
 
-[![Discord](https://badgen.net/discord/members/WrUXnpNyza/?label=Discord&color=purple&icon=discord)](https://discord.gg/WrUXnpNyza)
-[![Matrix](https://badgen.net/matrix/members/wishthis/matrix.org)](https://matrix.to/#/#wishthis:matrix.org)
-
-## :earth_africa: Available in 3 different locales
-:gb: English (United Kingdom),
-:us: English (United States),
-:de: German  (Germany)
+[![Discord](https://img.shields.io/discord/935867122729496616?color=6435c9&label=Discord&logo=discord&logoColor=%23fff&style=for-the-badge)](https://discord.gg/WrUXnpNyza)
+[![Matrix](https://img.shields.io/matrix/wishthis:matrix.org?color=6435c9&label=Matrix&logo=matrix&logoColor=%23fff&style=for-the-badge)](https://matrix.to/#/#wishthis:matrix.org)
 
 ## :heavy_check_mark: Requirements
-* Apache or Nginx
-* PHP 8.1
+
+-   Apache or Nginx
+-   PHP 8.1
+    -   [intl](https://www.php.net/manual/en/book.intl.php)
+-   [MJML](https://mjml.io/api) api keys
 
 ## :hammer: Installation
 
 ### Git (recommended)
+
 ```
 git clone -b stable https://github.com/grandeljay/wishthis.git .
 ```
 
 Note: after pulling updates for a new version you might be prompted to update the database schema in the wishthis user interface (if necessary). Make sure you are logged in.
 
 ### Manual
+
 Download the code using the [stable branch](https://github.com/grandeljay/wishthis/tree/stable) and upload it to your server.
 
 Note: You will have to manually update wishthis by replacing all files with the changes from the `stable` branch.
 
 ## :trophy: Contributing
 
 ### As a tester
+
 In the wishthis plattform, navigate to:
+
 1. Account -> Profile
 1. Preferences
 
 And set your channel to "Release candidate". Make sure to give feedback!
 
 ### As a translator
+
+Localisation is currently done via Transifex.
+
 https://www.transifex.com/wishthis/wishthis/
 
-### As a developer
-Install dependencies
+### As a sponsor
 
-#### Composer
-Use one of the following commands.
+Time spent on wishthis is time not doing for-profit work. Of course there is no expectation but if you would still like to show your appreciation, you can here. It is very appreciated!
 
-| Command                     | Description                         |
-| --------------------------- | ----------------------------------- |
-| `composer install`          | Install all dependencies.           |
-| `composer install --no-dev` | Install only required dependencies. |
+[![GitHub Sponsors](https://img.shields.io/github/sponsors/grandeljay?color=6435c9&logo=githubsponsors&logoColor=fff&style=for-the-badge)](https://github.com/sponsors/grandeljay)
 
-#### NPM
-Use one of the following commands.
+### As a developer
 
-| Command                                       | Description                         |
-| --------------------------------------------- | ----------------------------------- |
-| `npm install`                                 | Install all dependencies.           |
-| `npm install --only=production --no-optional` | Install only required dependencies. |
+To setup your development environment you currently have two possibilities:
 
-#### Yarn
-Use one of the following commands.
+1. Git
 
-| Command        | Description               |
-| ---------------| ------------------------- |
-| `yarn install` | Install all dependencies. |
+    Clone this repository and you're good to go!
 
-#### Theme changes
-```
-cd semantic
-```
+1. Docker
 
-And then one of the following commands:
-- `gulp build`
-- `gulp watch`
-
-For more information see: https://fomantic-ui.com/introduction/build-tools.html
-
-#### Code style
-| Language | Style  |
-| -------- | ------ |
-| PHP      | PSR-12 |
-
-## :construction: Roadmap
-| Item                                                | Status              |
-| --------------------------------------------------- | ------------------- |
-| Add "or similar" option to wishes                   | Planned             |
-| Combined/separate (and/or) wishes                   | Planned             |
-| Group wishes by store                               | Planned             |
-| Option to show/notify when a wish was fulfilled     | Planned             |
-| Price field for wishes                              | Planned             |
-| Redirect to original target after login             | Planned             |
-| Request more wishes on shared wishlist              | Planned             |
-| Activity feed and friends                           | Under consideration |
-| Browser extension to quickly create wishes from url | Under consideration |
-| Bulk add wishes via link list                       | Under consideration |
-| Folders / Subcategories for wishlists               | Under consideration |
-| Synchronise Steam wishlist                          | Under consideration |
+    An unofficial Docker image is available on Docker Hub: [hiob/wishthis](https://hub.docker.com/r/hiob/wishthis), thanks [Hiobi](https://github.com/Hiobi)!

composer.json

@@ -1,19 +1,9 @@
 {
-    "require-dev": {
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1"
-    },
     "require": {
         "embed/embed": "^4.3",
-        "laminas/laminas-diactoros": "^2.8",
         "grandel/include-directory": "^0.2.2",
-        "guzzlehttp/guzzle": "^7.0.1",
-        "http-interop/http-factory-guzzle": "^1.0",
         "qferr/mjml-php": "^1.1",
-        "gettext/gettext": "^5.6"
-    },
-    "config": {
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true
-        }
+        "gettext/gettext": "^5.6",
+        "gettext/translator": "^1.1"
     }
 }