pkp#8845 Fixed namespaces

Author: jonasraoni

classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.php

@@ -40,7 +40,7 @@
 use PKP\core\PKPServices;
 use PKP\db\DAO;
 use PKP\db\DAORegistry;
-use PKP\emailtemplate\EmailTemplate;
+use PKP\emailTemplate\EmailTemplate;
 use PKP\facades\Locale;
 use PKP\linkAction\LinkAction;
 use PKP\linkAction\request\AjaxModal;

classes/core/PKPContainer.php

@@ -151,7 +151,7 @@ public function registerCoreContainerAliases()
             'config' => [\Illuminate\Config\Repository::class, \Illuminate\Contracts\Config\Repository::class],
             'cache' => [\Illuminate\Cache\CacheManager::class, \Illuminate\Contracts\Cache\Factory::class],
             'cache.store' => [\Illuminate\Cache\Repository::class, \Illuminate\Contracts\Cache\Repository::class, \Psr\SimpleCache\CacheInterface::class],
-            'cache.psr6' => [\Symfony\Component\Cache\Adapter\Psr16Adapter::class, \Symfony\Component\Cache\Adapter\AdapterInterface::class, \Psr\Cache\CacheItemPoolInterface::class],
+            'cache.psr6' => [\Psr\Cache\CacheItemPoolInterface::class],
             'db' => [\Illuminate\Database\DatabaseManager::class, \Illuminate\Database\ConnectionResolverInterface::class],
             'db.connection' => [\Illuminate\Database\Connection::class, \Illuminate\Database\ConnectionInterface::class],
             'files' => [\Illuminate\Filesystem\Filesystem::class],

classes/db/DAOResultFactory.php

@@ -17,6 +17,7 @@
 namespace PKP\db;
 
 use APP\submission\DAO;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Enumerable;
 use PKP\core\ItemIterator;
 use ReflectionClass;
@@ -113,7 +114,7 @@ public function next()
         if ($this->records instanceof \Generator) {
             $row = $this->records->current();
             $this->records->next();
-        } elseif ($this->records instanceof Enumerable) {
+        } elseif ($this->records instanceof Collection) {
             $row = $this->records->shift();
         } else {
             throw new \Exception('Unsupported record set type (' . join(', ', class_implements($this->records)) . ')');
@@ -200,7 +201,9 @@ public function eof()
         if ($this->records == null) {
             return true;
         }
-        return !$this->records->valid();
+        /** @var DAOResultIterator */
+        $records = $this->records;
+        return !$records->valid();
     }
 
     /**

classes/file/FileArchive.php

@@ -44,7 +44,7 @@ public function create($files, $filesDir)
         if (self::zipFunctional()) {
             $zipTest = true;
             $zip = new ZipArchive();
-            if ($zip->open($archivePath, ZIPARCHIVE::CREATE) == true) {
+            if ($zip->open($archivePath, ZipArchive::CREATE) == true) {
                 foreach ($files as $serverPath => $clientFilename) {
                     $zip->addFile($filesDir . '/' . $serverPath, $clientFilename);
                 }

classes/xml/PKPXMLParser.php

@@ -47,7 +47,7 @@ function parseText($text) {
 
 		if (!isset($this->handler)) {
 			// Use default handler for parsing
-			$handler = new PKPXMLParserDOMHandler();
+			$handler = new XMLParserDOMHandler();
 			$this->setHandler($handler);
 		}
 

controllers/grid/eventLog/EventLogGridCellProvider.php

@@ -20,6 +20,7 @@
 use PKP\controllers\grid\DataObjectGridCellProvider;
 use PKP\controllers\grid\GridColumn;
 use PKP\db\DAORegistry;
+use PKP\log\EmailLogEntry;
 use PKP\log\EventLogEntry;
 use PKP\log\PKPSubmissionEventLogEntry;
 use PKP\submission\reviewAssignment\ReviewAssignment;
@@ -56,6 +57,7 @@ public function __construct($isCurrentUserAssignedAuthor)
      */
     public function getTemplateVarsFromRowColumn($row, $column)
     {
+        /** @var EmailLogEntry */
         $element = $row->getData();
         $columnId = $column->getId();
         assert($element instanceof \PKP\core\DataObject && !empty($columnId));

controllers/grid/settings/user/form/UserRoleForm.php

@@ -15,7 +15,7 @@
 
 namespace PKP\controllers\grid\settings\user\form;
 
-use App\core\Application;
+use APP\core\Application;
 use APP\facades\Repo;
 use APP\template\TemplateManager;
 
@@ -64,7 +64,7 @@ public function execute(...$functionParams)
 
         //save the user's user group assignment
         $this->saveUserGroupAssignments($request);
-        
+
         parent::execute(...$functionParams);
 
         // Role management handled by parent form, just return user.

controllers/grid/users/author/AuthorGridHandler.php

@@ -18,7 +18,7 @@
 namespace PKP\controllers\grid\users\author;
 
 use APP\controllers\grid\users\author\form\AuthorForm;
-use App\core\Application;
+use APP\core\Application;
 use APP\facades\Repo;
 use APP\notification\NotificationManager;
 use PKP\controllers\grid\feature\OrderGridItemsFeature;

pages/login/LoginHandler.php

@@ -15,7 +15,7 @@
 
 namespace PKP\pages\login;
 
-use App\core\Application;
+use APP\core\Application;
 use APP\facades\Repo;
 use APP\handler\Handler;
 use APP\template\TemplateManager;

plugins/importexport/users/index.php

@@ -16,4 +16,4 @@
  *
  */
 
-return new \PKP\plugins\importexport\user\UserImportExportPlugin();
+return new \APP\plugins\importexport\users\UserImportExportPlugin();