Merge branch 'release/2.0.0'

.composer-require-checker.config.json

@@ -4,9 +4,9 @@
 
     "ctype", "date", "fileinfo", "filter", "iconv", "json", "pcre", "reflection", "session", "simplexml", "spl", "xml",
 
-    "curl", "gd", "intl", "mbstring", "mysqli", "zlib", "pdo", "pgsql", "gettext", "tidy",
+    "curl", "gd", "intl", "mbstring", "mysqli", "zlib", "pdo", "pgsql", "gettext",
 
-    "exif", "pcntl", "zip"
+    "exif", "pcntl"
   ],
   "symbol-whitelist": [
     "// PHP symbols",
@@ -40,11 +40,15 @@
     "GALETTE_TEMPIMAGES_PATH",
     "GALETTE_THEME",
     "GALETTE_THEMES_PATH",
-    "GALETTE_THEME_DIR",
-    "GALETTE_TPL_SUBDIR",
     "GALETTE_VERSION",
     "GALETTE_X_FORWARDED_FOR_INDEX",
     "_CURRENT_THEME_PATH",
+    "GALETTE_URI",
+    "GALETTE_MYSQL_MIN",
+    "GALETTE_MARIADB_MIN",
+    "GALETTE_PGSQL_MIN",
+    "GALETTE_DISPLAY_VERSION",
+    "GALETTE_PHP_MIN",
     "_T",
     "__",
     "_Tn",
@@ -87,7 +91,16 @@
     "DI\\autowire",
     "DI\\Container",
     "DI\\ContainerBuilder",
-    "DI\\Bridge\\Slim\\App"
+    "DI\\Bridge\\Slim\\App",
+
+    "// Should not error (not used) but...",
+    "mt_rand",
+    "rand",
+    "random_int",
+
+
+    "// Not detected, do not know why.",
+    "Psr\\Http\\Server\\RequestHandlerInterface"
   ],
   "scan-files": [
     "*.php",

.github/workflows/ci-linux.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [ '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php-versions: [ '8.1', '8.3' ]
         coverage: [none]
       fail-fast: false
 
@@ -30,47 +30,49 @@ jobs:
           tools: composer
           coverage: ${{ matrix.coverage }}
 
-      - name: Checkout plugin
-        uses: actions/checkout@v2
-
       - name: Checkout Galette core
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: galette/galette
           path: galette-core
           fetch-depth: 1
           ref: develop
 
+      - name: Checkout plugin
+        uses: actions/checkout@v3
+        with:
+          path: galette-core/galette/plugins/plugin-objectslend
+
       - name: Get composer cache directory
         id: composer-cache
         run: |
-          mv composer.json.checker composer.json
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-        if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }}
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
-        if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }}
 
       - name: Install dependencies
         run: |
+          cd galette-core/galette
           composer install --ignore-platform-reqs
-        if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }}
-
-      - name: Install CS only
-        run: |
-          composer require squizlabs/php_codesniffer
-        if: ${{ matrix.php-versions== '7.2' || matrix.php-versions== '7.3' }}
 
       - name: CS
         run: |
-          vendor/bin/phpcs -n -p --standard=galette-core/phpcs-rules.xml lib/ ./*.php
+          cd galette-core/galette/plugins/plugin-objectslend
+          ../../vendor/bin/phpcs -n -p --standard=../../../phpcs-rules.xml lib/ ./*.php
 
       - name: Check missing symbols
         run: |
-          vendor/bin/composer-require-checker check --config-file=.composer-require-checker.config.json
-        if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }}
+          cd galette-core/galette/plugins/plugin-objectslend
+          composer require maglnet/composer-require-checker -W
+          vendor/bin/composer-require-checker check --config-file=.composer-require-checker.config.json ../../composer.json
+
+      - name: PHPStan checks
+        run: |
+          cd galette-core/galette/plugins/plugin-objectslend
+          ../../vendor/bin/phpstan analyze --ansi --memory-limit=2G --no-interaction --no-progress
+        if: matrix.php-versions == '8.1'

.gitignore

@@ -1,4 +1,5 @@
 .vimfiles*
 *.vimentry
 quick_gen_project_*
-
+dist/
+tempcache/

.scrutinizer.yml

@@ -14,17 +14,14 @@ build:
         analysis:
             environment:
                 php:
-                    version: 7.4
+                    version: 8.1
 
             project_setup:
                 override:
                     - 'true'
             tests:
                 override:
                     - php-scrutinizer-run
-                    -
-                        command: phpcs-run
-                        use_website_config: true
                     - js-scrutinizer-run
 
     cache:

_define.php

@@ -8,9 +8,9 @@
  * PHP version 5
  *
  * Copyright © 2013-2016 Mélissa Djebel
- * Copyright © 2017-2021 The Galette Team
+ * Copyright © 2017-2023 The Galette Team
  *
- * This file is part of Galette (http://galette.tuxfamily.org).
+ * This file is part of Galette (https://galette.eu).
  *
  * ObjectsLend is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,24 +31,22 @@
  * @author    Mélissa Djebel <[email protected]>
  * @author    Johan Cwiklinski <[email protected]>
  * @copyright 2013-2016 Mélissa Djebel
- * @copyright 2017-2021 The Galette Team
+ * @copyright 2017-2023 The Galette Team
  * @license   http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version
- * @link      http://galette.tuxfamily.org
+ * @link      https://galette.eu
  */
 
 $this->register(
     'Galette Objects Lend',             //Name
     'Manage rent/lend of object',       //Short description
     'Mélissa Djebel, Johan Cwiklinski', //Author
-    '1.2.0',                            //Version
-    '0.9.6',                            //Galette version compatibility
+    '2.0.0',                            //Version
+    '1.0.0',                            //Galette version compatibility
     'objectslend',                      //routing name and translation domain
-    '2021-11-29',                       //Date
+    '2023-12-07',                       //Date
     [
         'objectslend_preferences'       => 'admin',
         'store_objectlend_preferences'  => 'admin',
-        'objectslend_adminimages'       => 'staff',
-        'objectslend_adminimages_action' => 'staff',
         'objectslend_category_add'      => 'staff',
         'objectslend_category_edit'     => 'staff',
         'objectslend_category_action_add' => 'staff',
@@ -67,6 +65,7 @@
         'objectslend_doremove_status'   => 'admin',
         'objectslend_object_add'        => 'staff',
         'objectslend_object_edit'       => 'staff',
+        'objectslend_object_updatestatus' => 'staff',
         'objectslend_object_action_add' => 'staff',
         'objectslend_object_action_edit' => 'staff',
         'objectslend_object_clone'      => 'staff',
@@ -81,6 +80,6 @@
         'objectslend_show_object_lend'  => 'staff',
         'objectslend_object_take'       => 'member',
         'objectslend_object_dotake'     => 'member',
-        'objectslend_object_doreturn'   => 'staff'
+        'objectslend_object_doreturn'   => 'member'
     ]
 );