Ticket #523: bindings.diff

build/manifests/jelix-lib.mn

@@ -265 +265 @@
 cd lib/jelix/utils/
   jAppManager.class.php
   jClasses.class.php
+  jBinding.class.php
   jCmdUtils.class.php
   jCrypt.class.php
   jDatatype.class.php

build/manifests/testapp.mn

@@ -1 +1 @@
 cd testapp
+
   project.xml
   .htaccess
   application.init.php
@@ -81 +82 @@
 cd testapp/modules/jelix_tests/classes/tests
   foo.class.php
   foo.iface.php
+  bind.class.php
 cd testapp/modules/jelix_tests/locales/
   test_A.properties
   test_B.properties
@@ -163 +165 @@
   utils.jlog.html_cli.php
   utils.jdatetime.html_cli.php
   utils.jinifilemodifier.html_cli.php
+  utils.jclasses.html_cli.php
 
 cd testapp/var
   .htaccess

testapp/modules/jelix_tests/classes/tests/foo.iface.php

@@ -1 +1 @@
 <?php
 
 interface foo {
-
+    const JBINDING_BINDED_IMPLEMENTATION = 'jelix_tests~tests/bind';
 }
 
-?>
- Pas de fin de ligne à la fin du fichier
+?>

lib/jelix/core/jSelector.class.php

@@ -34 +34 @@
      * @param string $selstr  the selector. It should be a full selector : "type:module~resource" (not "module~resource")
      * @return jISelector the corresponding selector
      */
-    static public function create ($selstr){
+    static public function create ($selstr, $defaulttype=false){
+        if (is_string($defaulttype) && strpos($selstr, ':') === false) {
+            $selstr = "$defaulttype:$selstr";
+        }
+
         if(preg_match("/^([a-z]{3,5})\:([\w~\/\.]+)$/", $selstr, $m)){
             $cname='jSelector'.$m[1];
             if(class_exists($cname)){
@@ -412 +416 @@
 }
 
 /**
- * selector for business class
+ * selector for interface 
  *
- * business class is a class stored in classname.class.php file in the classes/ module directory
+ * interface is stored in interfacename.iface.php file in the classes/ module directory
  * or one of its subdirectory.
- * syntax : "module~classname" or "module~classname.
+ * syntax : "iface:module~ifacename" or "module~ifacename.
  * @package    jelix
  * @subpackage core_selector
  * @since 1.0b2
  */
-class jSelectorInterface extends jSelectorClass {
+class jSelectorIface extends jSelectorClass {
     protected $type = 'iface';
     protected $_dirname = 'classes/';
     protected $_suffix = '.iface.php';
 }
 
 /**
+ * selector for interface 
+ * @package    jelix
+ * @subpackage core_selector
+ * @since 1.0b2
+ * @deprecated 
+ */
+class jSelectorInterface extends jSelectorIface {}
+
+/**
  * selector for localisation string
  *
  * localisation string are stored in file properties.

lib/jelix/utils/jClasses.class.php

@@ -19 +19 @@
 
     static protected $_instances = array();
 
+    static protected $_bindings = array();
+
     private function __construct(){}
 
     /**
@@ -60 +62 @@
     }
 
     /**
+     * Shortcut to corresponding jBinding::getInstance() 
+     * 
+     * @param string $selector  Selector to a bindable class|interface
+     * @return mixed            Corresponding instance
+     */
+    static public function getBindedService($selector){
+        return self::getBinding($selector)->getInstance();
+    }
+
+    /**
+     * Alias of self::getBinding method. Better for use like this : jClasses::bind('selector').to('classselector')
+     * 
+     * @param  string $selector 
+     * @return jBinding
+     * @see jClasses::bind
+     */
+    static public function bind($selector) {
+        return self::getBinding($selector);
+    }
+
+    /**
+     * Get the binding corresponding to the specified selector.
+     * Better for use like this : jClasses::getBinding($selector)->getClassName()
+     * 
+     * @param string $selector 
+     * @return jBinding
+     * @see jClasses::bind
+     */
+    static public function getBinding($selector) {
+        $osel = jSelectorFactory::create($selector, 'iface');
+        $s    = $osel->toString(true);
+
+        if (!isset(self::$_bindings[$s])) {
+            self::$_bindings[$s] = new jBinding($osel);
+        }
+
+        return self::$_bindings[$s];
+    }
+
+    /**
+     * Reset the defined bindings (should only use it for unit tests)
+     * 
+     * @return void
+     */
+    static public function resetBindings() {
+        self::$_bindings = array();
+    }
+
+    /**
      * only include a class
      * @param string $selector the jelix selector correponding to the class
      */