Ajustes no application e call

toninho09 · May 27, 2016 · 23ae9c1 · 23ae9c1
1 parent aee19b5
commit 23ae9c1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/Molecular/Framework/Application.php b/src/Molecular/Framework/Application.php
@@ -24,6 +24,7 @@ class Application
     public $route;
     public $container;
     public $cache;
+    public static $instance;
     /**
      * Application constructor.
      */
@@ -36,6 +37,7 @@ public function __construct()
         $this->container = new ServiceContainer();
         $cache = new CacheControler();
         $this->cache = $cache->getHandle();
+        self::$instance = $this;
     }
 
     public function addMolecule(AbstractMolecule $molecule){

diff --git a/src/Molecular/Helper/Callbacks/Call.php b/src/Molecular/Helper/Callbacks/Call.php
@@ -59,7 +59,7 @@ public function isRunnable($function){
      */
     private function runNameFunction($function, $match)
     {
-        preg_match("/(\w+)@(\w+)/", $function, $funcParams);
+        preg_match("/(.*)@(\w+)/", $function, $funcParams);
         unset($funcParams[0]);
         if (count($funcParams) != 2) {
             throw new \Exception("Method call is not 'CLASS@METHOD' ");

diff --git a/test/Molecular/View/ViewTest.php b/test/Molecular/View/ViewTest.php
@@ -15,6 +15,7 @@ public function testRender(){
         $view->setFile('testeViewRender.php');
 
         $this->assertEquals($view->render(),'ok');
+        $this->assertEquals((string)$view,'ok');
 
     }
 }