Merge ee3cd9b into 42f5f52

locomotivemtl · Nov 8, 2019 · 398df86 · 398df86
2 parents 42f5f52 + ee3cd9b
commit 398df86
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/Charcoal/Cms/Route/GenericRoute.php b/src/Charcoal/Cms/Route/GenericRoute.php
@@ -128,7 +128,7 @@ public function pathResolvable(Container $container)
             return false;
         }
 
-        return (!!$contextObject->active() && !!$contextObject->isActiveRoute());
+        return (!!$contextObject['active'] && !!$contextObject->isActiveRoute());
     }
 
     /**
@@ -229,7 +229,7 @@ protected function resolveTemplateContextObject()
 
         $objectRoute   = $this->getObjectRouteFromPath();
         $contextObject = $this->getContextObject();
-        $currentLang   = $objectRoute->lang();
+        $currentLang   = $objectRoute->getLang();
 
         // Set language according to the route's language
         $this->setLocale($currentLang);
@@ -241,14 +241,14 @@ protected function resolveTemplateContextObject()
             $identProperty = $contextObject->property('template_ident');
 
             // Methods from TemplateableInterface / Trait
-            $templateIdent = $contextObject->templateIdent() ?: $objectRoute->routeTemplate();
+            $templateIdent = $contextObject->templateIdent() ?: $objectRoute->getRouteTemplate();
             // Default fallback to routeTemplate
             $controllerIdent = $contextObject->controllerIdent() ?: $templateIdent;
 
             $templateChoice = $identProperty->choice($templateIdent);
         } else {
             // Use global templates to verify for custom paths
-            $templateIdent = $objectRoute->routeTemplate();
+            $templateIdent = $objectRoute->getRouteTemplate();
             $controllerIdent = $templateIdent;
             foreach ($this->availableTemplates as $templateKey => $templateData) {
                 if (!isset($templateData['value'])) {
@@ -300,7 +300,7 @@ protected function resolveTemplateContextObject()
         }
 
         // Merge Route options from object-route
-        $routeOptions = $objectRoute->routeOptions();
+        $routeOptions = $objectRoute->getRouteOptions();
         if ($routeOptions && count($routeOptions)) {
             $config['template_data'] = array_merge($config['template_data'], $routeOptions);
         }
@@ -371,8 +371,8 @@ protected function loadContextObject()
     {
         $route = $this->getObjectRouteFromPath();
 
-        $obj = $this->modelFactory()->create($route->routeObjType());
-        $obj->load($route->routeObjId());
+        $obj = $this->modelFactory()->create($route->getRouteObjType());
+        $obj->load($route->getRouteObjId());
 
         return $obj;
     }
@@ -437,15 +437,15 @@ public function getLatestObjectPathHistory(ObjectRouteInterface $route)
         $loader
             ->setModel($route)
             ->addFilter('active', true)
-            ->addFilter('route_obj_type', $route->routeObjType())
-            ->addFilter('route_obj_id', $route->routeObjId())
-            ->addFilter('lang', $route->lang())
+            ->addFilter('route_obj_type', $route->getRouteObjType())
+            ->addFilter('route_obj_id', $route->getRouteObjId())
+            ->addFilter('lang', $route->getLang())
             ->addOrder('creation_date', 'desc')
             ->setPage(1)
             ->setNumPerPage(1);
 
-        if ($route->routeOptionsIdent()) {
-            $loader->addFilter('route_options_ident', $route->routeOptionsIdent());
+        if ($route->getRouteOptionsIdent()) {
+            $loader->addFilter('route_options_ident', $route->getRouteOptionsIdent());
         } else {
             $loader->addFilter('route_options_ident', '', ['operator' => 'IS NULL']);
         }