Does not use lizmapRepository any more

Author: rldhont

lizmap/modules/admin_api/controllers/project_rest.classic.php

@@ -10,6 +10,7 @@
  */
 
 use Lizmap\App\VersionTools;
+use Lizmap\Project\Repository;
 use LizmapApi\ApiException;
 use LizmapApi\Credentials;
 use LizmapApi\Error;
@@ -65,8 +66,8 @@ public function get(): object
     /**
      * Return a list of available projects and their basic information.
      *
-     * @param jResponseJson    $rep  response to fill
-     * @param lizmapRepository $repo repository
+     * @param jResponseJson $rep  response to fill
+     * @param Repository    $repo repository
      *
      * @return object a JSON response object containing projects
      */
@@ -91,8 +92,8 @@ protected function getProjList($rep, $repo)
     /**
      * Return detailed information and user rights.
      *
-     * @param jResponseJson    $rep  response to fill
-     * @param lizmapRepository $repo repository
+     * @param jResponseJson $rep  response to fill
+     * @param Repository    $repo repository
      *
      * @return object a JSON response object containing a specific repository with rights
      */

lizmap/modules/lizmap/classes/lizmap.class.php

@@ -36,7 +36,7 @@ class lizmap
     protected static $repositories = array();
 
     /**
-     * @var lizmapRepository[] list of repository instances. keys are repository names
+     * @var Repository[] list of repository instances. keys are repository names
      */
     protected static $repositoryInstances = array();
 
@@ -166,8 +166,8 @@ public static function getRepositoryPropertiesOptions()
     /**
      * Get the jForm for a repository.
      *
-     * @param null|lizmapRepository $rep
-     * @param jFormsBase            $form
+     * @param null|Repository $rep
+     * @param jFormsBase      $form
      *
      * @return jFormsBase
      */
@@ -259,7 +259,7 @@ public static function constructRepositoryForm($rep, $form)
      *
      * @param string $key Key of the repository to get
      *
-     * @return null|lizmapRepository
+     * @return null|Repository
      */
     public static function getRepository($key)
     {
@@ -286,7 +286,7 @@ public static function getRepository($key)
      * @param string $key  the repository name
      * @param array  $data list of properties for the repository
      *
-     * @return null|lizmapRepository
+     * @return null|Repository
      */
     public static function createRepository($key, $data)
     {

lizmap/modules/lizmap/classes/lizmapServices.class.php

@@ -1,5 +1,6 @@
 <?php
 
+use Lizmap\Project\Repository;
 use Lizmap\Server\Server;
 
 /**
@@ -701,11 +702,11 @@ public function sendNotificationEmail($subject, $body)
     }
 
     /**
-     * This method will create and return a lizmapRepository instance.
+     * This method will create and return a lizmap repository instance.
      *
      * @param string $key the name of the repository
      *
-     * @return lizmapRepository The lizmapRepository instance
+     * @return bool|Repository The lizmap repository instance
      */
     public function getLizmapRepository($key)
     {
@@ -722,6 +723,6 @@ public function getLizmapRepository($key)
             $data = array();
         }
 
-        return new lizmapRepository($key, $data, $this->varPath, $this, $this->appContext);
+        return new Repository($key, $data, $this->varPath, $this, $this->appContext);
     }
 }

lizmap/modules/lizmap/controllers/edition.classic.php

@@ -14,6 +14,7 @@
 use GuzzleHttp\Psr7\Utils as Psr7Utils;
 use Lizmap\Form;
 use Lizmap\Project\Project;
+use Lizmap\Project\Repository;
 use Lizmap\Project\UnknownLizmapProjectException;
 use Lizmap\Request\WFSRequest;
 
@@ -22,7 +23,7 @@ class editionCtrl extends jController
     /** @var null|Project */
     private $project;
 
-    /** @var lizmapRepository */
+    /** @var null|Repository */
     private $repository;
 
     /** @var string layer id in the QGIS project file */

lizmap/modules/lizmap/controllers/service.classic.php

@@ -5,6 +5,7 @@
 use Lizmap\App\ControllerTools;
 use Lizmap\Project\Project;
 
+use Lizmap\Project\Repository;
 use Lizmap\Project\UnknownLizmapProjectException;
 use Lizmap\Request\Proxy;
 use Lizmap\Request\WFSRequest;
@@ -30,7 +31,7 @@ class serviceCtrl extends jController
     protected $project;
 
     /**
-     * @var null|lizmapRepository
+     * @var null|Repository
      */
     protected $repository;
 

phpstan-baseline.neon

@@ -105,11 +105,6 @@ parameters:
       count: 1
       path: lizmap/modules/lizmap/classes/lizmapOGCRequest.class.php
 
-    -
-      message: "#^Method lizmapServices\\:\\:getLizmapRepository\\(\\) should return lizmapRepository but returns false\\.$#"
-      count: 1
-      path: lizmap/modules/lizmap/classes/lizmapServices.class.php
-
     -
       message: "#^Strict comparison using \\=\\=\\= between int\\|false and '1' will always evaluate to false\\.$#"
       count: 1