phalcon · s-ohnishi · Jul 14, 2023
diff --git a/hmvc/public/index.php b/hmvc/public/index.php
@@ -1,7 +1,7 @@
 <?php
 
-use Phalcon\Loader;
-use Phalcon\DiInterface;
+use Phalcon\Autoload\Loader;
+use Phalcon\Di\DiInterface;
 use Phalcon\DI\FactoryDefault;
 use Phalcon\Mvc\View;
 use Phalcon\Http\ResponseInterface;
@@ -19,7 +19,7 @@ public function __construct(DiInterface $di)
         $loader = new Loader();
 
         // Application Loader
-        $loader->registerDirs(
+        $loader->setDirectories(
             [
                 "../app/controllers/",
             ]
@@ -100,6 +100,6 @@ public function request(array $location, $data = null)
 
 
 
-$response = $app->handle();
+$response = $app->handle($_SERVER["REQUEST_URI"]);
 
 $response->send();
diff --git a/micro-factory-default/config/config.php b/micro-factory-default/config/config.php
@@ -1,6 +1,6 @@
 <?php
 
-use Phalcon\Config;
+use Phalcon\Config\Config;
 
 return new Config(
     [

diff --git a/micro-factory-default/public/index.php b/micro-factory-default/public/index.php
@@ -2,7 +2,7 @@
 
 error_reporting(E_ALL);
 
-use Phalcon\Loader;
+use Phalcon\Autoload\Loader;
 use Phalcon\Mvc\Micro;
 use Phalcon\DI\FactoryDefault;
 use Phalcon\Db\Adapter\Pdo\Mysql as Database;
@@ -46,7 +46,7 @@
     $loader = new Loader();
 
     $loader
-        ->registerDirs([$config->application->modelsDir])
+        ->setDirectories([$config->application->modelsDir])
         ->register();
 
     /**
@@ -72,7 +72,7 @@
     /**
      * Handle the request
      */
-    $app->handle();
+    $app->handle($_SERVER["REQUEST_URI"]);
 } catch (\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
     echo $e->getTraceAsString();

diff --git a/micro-simple-views/config/config.php b/micro-simple-views/config/config.php
@@ -1,6 +1,6 @@
 <?php
 
-use Phalcon\Config;
+use Phalcon\Config\Config;
 
 $config = new Config(
     [

diff --git a/micro-simple-views/config/services.php b/micro-simple-views/config/services.php
@@ -30,13 +30,13 @@
 
     $view->registerEngines(
         [
-            '.volt' => function ($view, $di) use ($config) {
-                $volt = new VoltEngine($view, $di);
+            '.volt' => function ($view) use ($config) {
+                $volt = new VoltEngine($view);
 
                 $volt->setOptions(
                     [
-                        'compiledPath'      => $config->application->cacheDir,
-                        'compiledSeparator' => '_',
+                        'path'      => $config->application->cacheDir,
+                        'separator' => '_',
                     ]
                 );
 
@@ -47,3 +47,11 @@
 
     return $view;
 });
+
+
+$di->setShared(
+    'tag',
+    function () {
+        return new \Phalcon\Html\TagFactory(new \Phalcon\Html\Escaper());
+    }
+);
diff --git a/micro-simple-views/index.php b/micro-simple-views/index.php
@@ -20,4 +20,4 @@
     echo $app['view']->render('500');
 });
 
-$app->handle();
+$app->handle($_SERVER["REQUEST_URI"]);
diff --git a/micro-simple-views/views/500.volt b/micro-simple-views/views/500.volt
@@ -1,3 +1,3 @@
 <h1>500 Error</h1>
 
-<?php echo $this->tag->linkTo('index', 'Go Home') ?>
+<?php echo $this->tag->a('index', 'Go Home') ?>
diff --git a/micro-simple-views/views/index.volt b/micro-simple-views/views/index.volt
@@ -1,3 +1,3 @@
 <h1>Welcome</h1>
 
-<?php echo $this->tag->linkTo('', 'Go Home') ?>
+<?php echo $this->tag->a('index', 'Go Home') ?>
diff --git a/micro/index.php b/micro/index.php
@@ -39,4 +39,4 @@ function () use ($app) {
     }
 );
 
-$app->handle();
+$app->handle($_SERVER["REQUEST_URI"]);
diff --git a/multiple-factory-default/apps/frontend/Module.php b/multiple-factory-default/apps/frontend/Module.php
@@ -2,9 +2,9 @@
 
 namespace Modules\Frontend;
 
-use Phalcon\Loader;
+use Phalcon\Autoload\Loader;
 use Phalcon\Mvc\View;
-use Phalcon\DiInterface;
+use Phalcon\Di\DiInterface;
 use Phalcon\Mvc\Dispatcher;
 use Phalcon\Mvc\ModuleDefinitionInterface;
 use Phalcon\Db\Adapter\Pdo\Mysql as MySQLAdapter;
@@ -20,7 +20,7 @@ public function registerAutoloaders(DiInterface $di = null)
     {
         $loader = new Loader();
 
-        $loader->registerNamespaces(
+        $loader->setNamespaces(
             [
                 'Modules\Frontend\Controllers' => __DIR__ . '/controllers/',
                 'Modules\Frontend\Models' => __DIR__ . '/models/',

diff --git a/multiple-factory-default/apps/frontend/config/config.php b/multiple-factory-default/apps/frontend/config/config.php
@@ -1,6 +1,6 @@
 <?php
 
-use Phalcon\Config;
+use Phalcon\Config\Config;
 
 return new Config(
     [

diff --git a/multiple-factory-default/public/index.php b/multiple-factory-default/public/index.php
@@ -58,11 +58,11 @@
         ]
     );
 
-    $response = $application->handle();
+    $response = $application->handle($_SERVER["REQUEST_URI"]);
 
     $response->send();
-} catch (Phalcon\Exception $e) {
-    echo $e->getMessage();
 } catch (PDOException $e) {
     echo $e->getMessage();
+} catch (Exception $e) {
+    echo $e->getMessage();
 }
diff --git a/multiple-service-layer-model/apps/config/config.php b/multiple-service-layer-model/apps/config/config.php
@@ -1,15 +1,15 @@
 <?php
 
-use Phalcon\Config;
+use Phalcon\Config\Config;
 
 return new Config(
     [
         'database'    => [
             'adapter'  => 'Mysql',
             'host'     => 'localhost',
-            'username' => 'root',
-            'password' => '',
-            'dbname'   => 'phalcon',
+            'username' => 'phalcon',
+            'password' => 'secret',
+            'dbname'   => 'phalcon_invo',
         ],
         'application' => [
             'controllersDir' => __DIR__ . '/../controllers/',

diff --git a/multiple-service-layer-model/apps/config/services.php b/multiple-service-layer-model/apps/config/services.php
@@ -6,7 +6,8 @@
 use Phalcon\Mvc\Router;
 use Phalcon\Mvc\Url as UrlResolver;
 use Phalcon\DI\FactoryDefault;
-use Phalcon\Session\Adapter\Files as SessionAdapter;
+use Phalcon\Session\Adapter\Stream as SessionFiles;
+use Phalcon\Session\Manager as SessionManager;
 
 /**
  * The FactoryDefault Dependency Injector automatically register the right services providing a full stack framework
@@ -23,8 +24,6 @@
     $router->setDefaultModule("frontend");
     $router->setDefaultNamespace("Modules\Modules\Frontend\Controllers");
 
-    $router->setUriSource(\Phalcon\Mvc\Router::URI_SOURCE_SERVER_REQUEST_URI);
-
     $router->removeExtraSlashes(true);
 
     return $router;
@@ -44,7 +43,12 @@
  * Start the session the first time some component request the session service
  */
 $di['session'] = function () {
-    $session = new SessionAdapter();
+    $session = new SessionManager();
+    $files = new SessionFiles([
+        'savePath' => sys_get_temp_dir(),
+    ]);
+
+    $session->setAdapter($files);
     $session->start();
 
     return $session;

diff --git a/multiple-service-layer-model/apps/models/entities/User.php b/multiple-service-layer-model/apps/models/entities/User.php
@@ -3,8 +3,8 @@
 namespace Modules\Models\Entities;
 
 use Phalcon\Mvc\Model;
-use Phalcon\Validation;
-use Phalcon\Validation\Validator\Email as EmailValidator;
+use Phalcon\Filter\Validation;
+use Phalcon\Filter\Validation\Validator\Email as EmailValidator;
 
 class User extends Model
 {
@@ -200,8 +200,4 @@ public function validation()
         return $this->validate($validator);
     }
 
-    public function getSource()
-    {
-        return 'user';
-    }
 }
diff --git a/multiple-service-layer-model/apps/modules/frontend/Module.php b/multiple-service-layer-model/apps/modules/frontend/Module.php
@@ -2,9 +2,9 @@
 
 namespace Modules\Modules\Frontend;
 
-use Phalcon\Loader;
+use Phalcon\Autoload\Loader;
 use Phalcon\Mvc\View;
-use Phalcon\DiInterface;
+use Phalcon\Di\DiInterface;
 use Phalcon\Mvc\ModuleDefinitionInterface;
 use Phalcon\Db\Adapter\Pdo\Mysql as DbAdapter;
 
@@ -19,7 +19,7 @@ public function registerAutoloaders(DiInterface $di = null)
     {
         $loader = new Loader();
 
-        $loader->registerNamespaces(
+        $loader->setNamespaces(
             [
                 'Modules\Modules\Frontend\Controllers' => __DIR__ . '/controllers/',
                 'Modules\Models\Entities' => __DIR__ . '/../../models/entities/',

diff --git a/multiple-service-layer-model/apps/modules/frontend/views/index/index.phtml b/multiple-service-layer-model/apps/modules/frontend/views/index/index.phtml
@@ -0,0 +1 @@
+<?php echo $users[0]->getName(); ?>
diff --git a/multiple-service-layer-model/public/index.php b/multiple-service-layer-model/public/index.php
@@ -27,11 +27,11 @@
      */
     require __DIR__ . '/../apps/config/modules.php';
 
-    $response = $application->handle();
+    $response = $application->handle($_SERVER["REQUEST_URI"]);
 
     $response->send();
-} catch (Phalcon\Exception $e) {
-    echo $e->getMessage();
 } catch (PDOException $e) {
     echo $e->getMessage();
+} catch (Exception $e) {
+    echo $e->getMessage();
 }
diff --git a/multiple-shared-layouts/apps/backend/Module.php b/multiple-shared-layouts/apps/backend/Module.php
@@ -2,9 +2,9 @@
 
 namespace Modules\Backend;
 
-use Phalcon\Loader;
+use Phalcon\Autoload\Loader;
 use Phalcon\Mvc\View;
-use Phalcon\DiInterface;
+use Phalcon\Di\DiInterface;
 use Phalcon\Mvc\Dispatcher;
 use Phalcon\Mvc\ModuleDefinitionInterface;
 use Phalcon\Db\Adapter\Pdo\Mysql as MySQLAdapter;
@@ -20,7 +20,7 @@ public function registerAutoloaders(DiInterface $di = null)
     {
         $loader = new Loader();
 
-        $loader->registerNamespaces(
+        $loader->setNamespaces(
             [
                 'Modules\Backend\Controllers' => __DIR__ . '/controllers/',
                 'Modules\Backend\Models' => __DIR__ . '/models/',

diff --git a/multiple-shared-layouts/apps/backend/config/config.php b/multiple-shared-layouts/apps/backend/config/config.php
@@ -1,6 +1,6 @@
 <?php
 
-use Phalcon\Config;
+use Phalcon\Config\Config;
 
 return new Config(
     [

diff --git a/multiple-shared-layouts/apps/frontend/Module.php b/multiple-shared-layouts/apps/frontend/Module.php
@@ -2,9 +2,9 @@
 
 namespace Modules\Frontend;
 
-use Phalcon\Loader;
+use Phalcon\Autoload\Loader;
 use Phalcon\Mvc\View;
-use Phalcon\DiInterface;
+use Phalcon\Di\DiInterface;
 use Phalcon\Mvc\Dispatcher;
 use Phalcon\Mvc\ModuleDefinitionInterface;
 use Phalcon\Db\Adapter\Pdo\Mysql as MySQLAdapter;
@@ -20,7 +20,7 @@ public function registerAutoloaders(DiInterface $di = null)
     {
         $loader = new Loader();
 
-        $loader->registerNamespaces(
+        $loader->setNamespaces(
             [
                 'Modules\Frontend\Controllers' => __DIR__ . '/controllers/',
                 'Modules\Frontend\Models' => __DIR__ . '/models/',

diff --git a/multiple-shared-layouts/apps/frontend/config/config.php b/multiple-shared-layouts/apps/frontend/config/config.php
@@ -1,6 +1,6 @@
 <?php
 
-use Phalcon\Config;
+use Phalcon\Config\Config;
 
 return new Config(
     [

diff --git a/multiple-shared-layouts/public/index.php b/multiple-shared-layouts/public/index.php
@@ -80,11 +80,11 @@
         ]
     );
 
-    $response = $application->handle();
+    $response = $application->handle($_SERVER["REQUEST_URI"]);
 
     $response->send();
-} catch (Phalcon\Exception $e) {
-    echo $e->getMessage();
 } catch (PDOException $e) {
     echo $e->getMessage();
+} catch (Exception $e) {
+    echo $e->getMessage();
 }
diff --git a/multiple-shared-views/apps/modules/backend/Module.php b/multiple-shared-views/apps/modules/backend/Module.php
@@ -2,8 +2,8 @@
 
 namespace Multiple\Backend;
 
-use Phalcon\Loader;
-use Phalcon\DiInterface;
+use Phalcon\Autoload\Loader;
+use Phalcon\Di\DiInterface;
 use Phalcon\Mvc\Dispatcher;
 use Phalcon\Db\Adapter\Pdo\Mysql;
 use Phalcon\Mvc\ModuleDefinitionInterface;
@@ -19,7 +19,7 @@ public function registerAutoloaders(DiInterface $di = null)
     {
         $loader = new Loader();
 
-        $loader->registerNamespaces(
+        $loader->setNamespaces(
             [
                 "Multiple\\Backend\\Controllers" => "../apps/modules/backend/controllers/",
                 "Multiple\\Backend\\Models"      => "../apps/modules/backend/models/",
@@ -54,10 +54,10 @@ function () {
             function () {
                 return new Mysql(
                     [
-                        "host"     => "localhost",
-                        "username" => "root",
-                        "password" => "secret",
-                        "dbname"   => "invo",
+                        'host'     => 'localhost',
+                        'username' => 'phalcon',
+                        'password' => 'secret',
+                        'dbname'   => 'phalcon_invo',
                     ]
                 );
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,4 +39,4 @@ function () use ($app) { @@
         }
     );
-    $app->handle();
+    $app->handle($_SERVER["REQUEST_URI"]);