Merge remote-tracking branch 'origin/7.1' into 7.1

# Conflicts: # composer.json # composer.lock # config/bundles.php # src/ajax/core/Bans.php # src/ajax/core/Mounts.php # src/core/AjaxAbstract.php # src/core/Service/Jaxon.php
idmarinas · Nov 27, 2024 · 33ee94e · 33ee94e
2 parents c11bd87 + 4e94bad
commit 33ee94e
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 292 deletions.
diff --git a/.gitignore b/.gitignore
@@ -210,14 +210,6 @@ $RECYCLE.BIN/
 !/config/autoload/local/README.md
 
 # Ignore local content of LoTGD (except .gitkeep)
-/src/ajax/local/**
-/src/ajax/local/**/
-!/src/ajax/local/**/.gitkeep
-!/src/ajax/local/**/README.md
-/src/ajax/pattern/local/**
-/src/ajax/pattern/local/**/
-!/src/ajax/pattern/local/**/.gitkeep
-!/src/ajax/pattern/local/**/README.md
 /src/local/**
 !/src/local/**/
 !/src/local/**/.gitkeep
@@ -247,7 +239,6 @@ phan.csv
 /config/secrets/prod/prod.decrypt.private.php
 /public/bundles/
 /var/
-/vendor/
 ###< symfony/framework-bundle ###
 
 ###> symfony/phpunit-bridge ###
@@ -261,8 +252,3 @@ phan.csv
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###
-
-###> phpunit/phpunit ###
-/phpunit.xml
-.phpunit.result.cache
-###< phpunit/phpunit ###
diff --git a/CHANGELOG-dev.md b/CHANGELOG-dev.md
@@ -10,68 +10,42 @@ Visit **_V5_** [Changelog](https://github.com/idmarinas/lotgd-game/blob/migratio
 Visit **_V6_** [Changelog](https://github.com/idmarinas/lotgd-game/blob/migration/CHANGELOG-V6.md)  
 Visit **_V7_** [Changelog](https://github.com/idmarinas/lotgd-game/blob/migration/CHANGELOG-V7.md)  
 
-# Version: 7.1.0
+# Version: 7.2.0
 
 ### :cyclone: CHANGES
 
--   **BC** Min PHP version needed is `7.4`
--   `assets/lib/components/embed.js` `Lotgd.embed(this)` now also receives the event parameter `Lotgd.embed(this, event)`
--   `Faq menu` moved from Village/Shades menu to Top menu.
-    -   Now can see FAQ always.
+- Nothing
 
 ### :star: FEATURES
 
--   `stimulus-controller` Petition, add new function for load custom faq. Need pass url as param.
-    -   Example of usage
-    ```php
-        $args[] = [
-            'attr' => [
-                'data-action' => 'click->petition#loadFaq',
-                'data-petitition-url-param' => 'stimulus.php?method=NameOfMethod&controller=NamespaceOfController'
-            ],
-            'link'    => [
-                'section.faq.toc.cities',
-                [],
-                'cities_module',
-            ],
-        ];
-    ```
+- Nothing
 
 ### :fire: DEPRECATED
 
--   `src/functions.php` Mark functions as deprecated:
-    -   `myDefine`
-    -   `safeescape`
-    -   `nltoappon`
+- Nothing
 
 ### :wrench: FIXES
 
--   `src/core/Repository/UserRepository.php` Fixed error with place of `Debugger::log()` in function `getUserById`
--   `themes/LotgdModern/templates/page/bio.html.twig` Fixed error with key of translation
--   `translations/en/page_bio+intl-icu.en.yaml` add missin key translation
--   `src/core/Repository/User/Avatar.php` Fixed error when not found news for user, now return a correct empty array
--   `public/bans.php` Fixed error that can add bans
--   Fixed some code smells and vulnerabilities
+- Nothing
 
 ### :x: REMOVES
 
--   `public/common_common.php` Deleted code to create file `.env.local.php`
-    -   You need to create this file before upgrading from a version earlier than 4.9.0
--   `assets/lib/game/datacache.js` Deleted unused functions
-    -   Use console to clear cache.
+- **Jaxon-PHP** removed, migrated to StimulusJS
 
 ### :notebook: NOTES
 
--   **Important**:
-    -   :warning: Since version 5.0.0 Installer is only via terminal (command: `php bin/console lotgd:install`)
-    -   :warning: Avoid, as far as possible, using static classes (e.g. LotgdSetting, Doctrine, LotgdTranslation...) as these classes will be deleted in a future version. Use autowire, dependency injection when possible.
-    -   :warning: Version 7.0.0 change templates for use **TailwindCSS**
--   **Upgrade/Install for version 5.0.0 and up**
-    -   First read [docs](https://github.com/idmarinas/lotgd-game/wiki/Skeleton) and follow steps.
-    -   If you have problems:
-        -   Read info in `storage/log/tracy/*` files, and see the problem.
-        -   Read info in `var/log/*` files, and see the problem.
-        -   Read info in `var/log/apache2/error.log` (this is the default location in Debian, can change in your OS distribution) in your webserver.
-        -   If you can't solve the problem go to: [Repository issues](https://github.com/idmarinas/lotgd-game/issues)
--   **composer.json** Updated/Added/Deleted dependencies
--   **package.json** Updated/Added/Deleted dependencies
+- **Important**:
+    - :warning: Since version 5.0.0 Installer is only via terminal (command: `php bin/console lotgd:install`)
+    - :warning: Avoid, as far as possible, using static classes (e.g. LotgdSetting, Doctrine, LotgdTranslation...) as
+      these classes will be deleted in a future version. Use autowire, dependency injection when possible.
+    - :warning: Version 7.0.0 change templates for use **TailwindCSS**
+- **Upgrade/Install for version 5.0.0 and up**
+    - First read [docs](https://github.com/idmarinas/lotgd-game/wiki/Skeleton) and follow steps.
+    - If you have problems:
+        - Read info in `storage/log/tracy/*` files, and see the problem.
+        - Read info in `var/log/*` files, and see the problem.
+        - Read info in `var/log/apache2/error.log` (this is the default location in Debian, can change in your OS
+          distribution) in your webserver.
+        - If you can't solve the problem go to: [Repository issues](https://github.com/idmarinas/lotgd-game/issues)
+- **composer.json** Updated/Added/Deleted dependencies
+- **package.json** Updated/Added/Deleted dependencies
diff --git a/composer.lock b/composer.lock
diff --git a/config/services.yaml b/config/services.yaml
@@ -79,40 +79,6 @@ services:
         arguments:
             - "%lotgd_core.doctrine_prefix%"
 
-    # Jaxon-PHP Service
-    Lotgd\Core\Service\Jaxon:
-        arguments:
-            - {
-                  core:
-                      {
-                          request: { uri: "jaxon.php" },
-                          process: { exit: false },
-                      },
-                  dialogs:
-                      {
-                          default: { message: toastr, modal: semantic },
-                          classes:
-                              {
-                                  semantic: Lotgd\Core\Jaxon\Library\Semantic\Modal,
-                              },
-                          toastr:
-                              {
-                                  options:
-                                      {
-                                          progressBar: true,
-                                          newestOnTop: false,
-                                          closeButton: true,
-                                          preventDuplicates: true,
-                                          timeOut: 30000,
-                                          extendedTimeOut: 15000,
-                                      },
-                              },
-                      },
-              }
-    lotgd.core.jaxon:
-        alias: Lotgd\Core\Service\Jaxon
-        public: true
-
     # View Laminas Service
     Laminas\View\Helper\HeadLink:
         public: true

diff --git a/src/ajax/local/README.md b/src/ajax/local/README.md
diff --git a/src/ajax/pattern/core/.gitkeep b/src/ajax/pattern/core/.gitkeep
diff --git a/src/ajax/pattern/local/.gitkeep b/src/ajax/pattern/local/.gitkeep
diff --git a/src/core/Jaxon/Library/Semantic/Modal.php b/src/core/Jaxon/Library/Semantic/Modal.php
diff --git a/src/core/Twig/Extension/Jaxon.php b/src/core/Twig/Extension/Jaxon.php
diff --git a/themes/LotgdModern/templates/base.html.twig b/themes/LotgdModern/templates/base.html.twig
@@ -36,22 +36,14 @@
             {# Favicon can custom per theme #}
             <link rel="shortcut icon" href="favicon.png" type="image/png" />
         {% endblock lotgd_head_css %}
-        <!-- Jaxon CSS styles -->
-        {{ jaxon_css() }}
 
         {{ encore_entry_script_tags('lotgd_lib') }}
         {% block lotgd_head_theme_js %}{% endblock %}
 
-        <!-- Jaxon JS script -->
-        {{ jaxon_js() }}
-
         <!-- Dynamically added script/style code and files -->
         {{ head_link() }}
         {{ head_style() }}
         {{ head_script() }}
-
-        <!-- Jaxon inline Script -->
-        {{ jaxon_script() }}
     </head>
     <body>
         {% block lotgd_body %}{% endblock %}