Migrate from objectmodel to doctrine

.github/workflows/php.yml

@@ -3,15 +3,12 @@ on: [push, pull_request]
 jobs:
   # Check there is no syntax errors in the project
   php-linter:
-    name: PHP Syntax check 5.6 => 8.1
+    name: PHP Syntax check 7.2 => 8.2
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/[email protected]
 
-      - name: PHP syntax checker 5.6
-        uses: prestashop/github-action-php-lint/5.6@master
-
       - name: PHP syntax checker 7.2
         uses: prestashop/github-action-php-lint/7.2@master
 
@@ -27,6 +24,9 @@ jobs:
       - name: PHP syntax checker 8.1
         uses: prestashop/github-action-php-lint/8.1@master
 
+      - name: PHP syntax checker 8.2
+        uses: prestashop/github-action-php-lint/8.2@master        
+
   # Check the PHP code follow the coding standards
   php-cs-fixer:
     name: PHP-CS-Fixer
@@ -50,15 +50,15 @@ jobs:
         run: composer install
 
       - name: Run PHP-CS-Fixer
-        run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --using-cache=no --diff-format udiff
+        run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --using-cache=no
 
   # Run PHPStan against the module and a PrestaShop release
   phpstan:
     name: PHPStan
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        presta-versions: ['1.7.6', '1.7.7', '1.7.8', 'latest']
+        presta-versions: ['1.7.7', '1.7.8', '8.0', 'latest']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -86,4 +86,4 @@ jobs:
 
       # Docker images prestashop/prestashop may be used, even if the shop remains uninstalled
       - name: Execute PHPStan on PrestaShop (Tag ${{ matrix.presta-versions }})
-        run: ./tests/phpstan.sh ${{ matrix.presta-versions }}
+        run: ./tests/phpstan.sh ${{ matrix.presta-versions }}

ProductComment.php

@@ -190,6 +190,9 @@ public static function getRatings($id_product)
         return Db::getInstance((bool) _PS_USE_SQL_SLAVE_)->getRow($sql);
     }
 
+    /**
+     * @deprecated 4.0.0
+     */
     public static function getAverageGrade($id_product)
     {
         $validate = Configuration::get('PRODUCT_COMMENTS_MODERATE');
@@ -235,6 +238,8 @@ public static function getAveragesByProduct($id_product, $id_lang)
      * Return number of comments and average grade by products
      *
      * @return int|false
+     *
+     * @deprecated 4.0.0
      */
     public static function getCommentNumber($id_product)
     {
@@ -279,6 +284,8 @@ public static function getGradedCommentNumber($id_product)
      * Get comments by Validation
      *
      * @return array Comments
+     *
+     * @deprecated 6.0.0
      */
     public static function getByValidate($validate = '0', $deleted = false, $p = null, $limit = null, $skip_validate = false)
     {
@@ -306,6 +313,8 @@ public static function getByValidate($validate = '0', $deleted = false, $p = nul
      * Get numbers of comments by Validation
      *
      * @return int Count of comments
+     *
+     * @deprecated 6.0.0
      */
     public static function getCountByValidate($validate = '0', $skip_validate = false)
     {
@@ -360,6 +369,8 @@ public function validate($validate = '1')
      * Delete a comment, grade and report data
      *
      * @return bool succeed
+     *
+     * @deprecated 6.0.0
      */
     public function delete()
     {
@@ -373,6 +384,8 @@ public function delete()
      * Delete Grades
      *
      * @return bool succeed
+     *
+     * @deprecated 6.0.0
      */
     public static function deleteGrades($id_product_comment)
     {
@@ -389,6 +402,8 @@ public static function deleteGrades($id_product_comment)
      * Delete Reports
      *
      * @return bool succeed
+     *
+     * @deprecated 6.0.0
      */
     public static function deleteReports($id_product_comment)
     {
@@ -405,6 +420,8 @@ public static function deleteReports($id_product_comment)
      * Delete usefulness
      *
      * @return bool succeed
+     *
+     * @deprecated 6.0.0
      */
     public static function deleteUsefulness($id_product_comment)
     {
@@ -473,6 +490,8 @@ public static function isAlreadyUsefulness($id_product_comment, $id_customer)
      * Get reported comments
      *
      * @return array Comments
+     *
+     * @deprecated 6.0.0
      */
     public static function getReportedComments()
     {

ProductCommentCriterion.php

@@ -130,6 +130,8 @@ public function addCategory($id_category)
      * Add grade to a criterion
      *
      * @return bool succeed
+     *
+     * @deprecated 4.0.0
      */
     public function addGrade($id_product_comment, $grade)
     {
@@ -154,6 +156,8 @@ public function addGrade($id_product_comment, $grade)
      * Get criterion by Product
      *
      * @return array Criterion
+     *
+     * @deprecated 4.0.0
      */
     public static function getByProduct($id_product, $id_lang)
     {
@@ -201,6 +205,8 @@ public static function getByProduct($id_product, $id_lang)
      * Get Criterions
      *
      * @return array Criterions
+     *
+     * @deprecated 6.0.0
      */
     public static function getCriterions($id_lang, $type = false, $active = false)
     {
@@ -224,6 +230,9 @@ public static function getCriterions($id_lang, $type = false, $active = false)
         return $criterions;
     }
 
+    /**
+     * @deprecated 6.0.0
+     */
     public function getProducts()
     {
         $res = Db::getInstance()->executeS('
@@ -240,6 +249,9 @@ public function getProducts()
         return $products;
     }
 
+    /**
+     * @deprecated 6.0.0
+     */
     public function getCategories()
     {
         $res = Db::getInstance()->executeS('
@@ -256,20 +268,29 @@ public function getCategories()
         return $criterions;
     }
 
+    /**
+     * @deprecated 6.0.0
+     */
     public function deleteCategories()
     {
         return Db::getInstance()->execute('
 			DELETE FROM `' . _DB_PREFIX_ . 'product_comment_criterion_category`
 			WHERE `id_product_comment_criterion` = ' . (int) $this->id);
     }
 
+    /**
+     * @deprecated 6.0.0
+     */
     public function deleteProducts()
     {
         return Db::getInstance()->execute('
 			DELETE FROM `' . _DB_PREFIX_ . 'product_comment_criterion_product`
 			WHERE `id_product_comment_criterion` = ' . (int) $this->id);
     }
 
+    /**
+     * @deprecated 6.0.0
+     */
     public static function getTypes()
     {
         // Instance of module class for translations

config/common.yml

@@ -5,12 +5,14 @@ services:
   product_comment_criterion_repository:
     class: PrestaShop\Module\ProductComment\Repository\ProductCommentCriterionRepository
     arguments:
+      - '@doctrine'
       - '@doctrine.dbal.default_connection'
       - '%database_prefix%'
 
   product_comment_repository:
     class: PrestaShop\Module\ProductComment\Repository\ProductCommentRepository
     arguments:
+      - '@doctrine'
       - '@doctrine.dbal.default_connection'
       - '%database_prefix%'
       - '@=service("prestashop.adapter.legacy.configuration").get("PRODUCT_COMMENTS_ALLOW_GUESTS")'