Changeset 2512

Timestamp:

03/03/10 13:57:14 (5 months ago)

Author:

mikey

Message:

refactoring #236 remove code deprecated with 1.1.0

Location:

framework/trunk/src

Files:

• main/php/net/stubbles/ipo/interceptors/stubInterceptorXJConfInitializer.php (deleted)
• main/php/net/stubbles/rdbms/ioc/stubDatabaseBindingModule.php (modified) (4 diffs)
• main/php/net/stubbles/rdbms/stubDatabaseXJConfInitializer.php (deleted)
• main/resources/build/initializers.ini (modified) (1 diff)
• test/php/net/stubbles/integration/DatabaseTestCase.php (deleted)
• test/php/net/stubbles/integration/InterceptorTestCase.php (deleted)
• test/php/net/stubbles/ipo/interceptors/stubInterceptorXJConfInitializerTestCase.php (deleted)
• test/php/net/stubbles/rdbms/ioc/stubDatabaseBindingModuleTestCase.php (modified) (2 diffs)
• test/php/net/stubbles/rdbms/stubDatabaseXJConfInitializerTestCase.php (deleted)

framework/trunk/src/main/php/net/stubbles/rdbms/ioc/stubDatabaseBindingModule.php

@@ -28 +28 @@
      */
     protected $descriptor;
+    /**
+     * name of database initializer class to bind
+     *
+     * @var  string
+     */
+    protected $databaseInitializerClassName        = 'net::stubbles::rdbms::stubPropertyBasedDatabaseInitializer';
+    /**
+     * name of database connection provider class to bind
+     *
+     * @var  string
+     */
+    protected $databaseConnectionProviderClassName = 'net::stubbles::rdbms::ioc::stubDatabaseConnectionProvider';
 
     /**
@@ -42 +54 @@
 
     /**
+     * static constructor
+     *
+     * @param   bool                       $fallback    optional  whether to allow fallback to default connection if named connection does not exist
+     * @param   string                     $descriptor  optional  descriptor for database initializer
+     * @return  stubDatabaseBindingModule
+     * @since   1.2.0
+     */
+    public static function create($fallback = true, $descriptor = null)
+    {
+        return new self($fallback, $descriptor);
+    }
+
+    /**
+     * sets name of database initializer class to bind
+     *
+     * @param   string                     $databaseInitializerClassName
+     * @return  stubDatabaseBindingModule
+     * @since   1.2.0
+     */
+    public function setDatabaseInitializerClassName($databaseInitializerClassName)
+    {
+        $this->databaseInitializerClassName = $databaseInitializerClassName;
+        return $this;
+    }
+
+    /**
+     * sets name of database connection provider class to bind
+     *
+     * @param   string                     $databaseConnectionProviderClassName
+     * @return  stubDatabaseBindingModule
+     * @since   1.2.0
+     */
+    public function setDatabaseConnectionProviderClassName($databaseConnectionProviderClassName)
+    {
+        $this->databaseConnectionProviderClassName = $databaseConnectionProviderClassName;
+        return $this;
+    }
+
+    /**
      * configure the binder
      *
@@ -49 +100 @@
     {
         $binder->bind('stubDatabaseInitializer')
-               ->to('net::stubbles::rdbms::stubDatabaseXJConfInitializer');
+               ->to($this->databaseInitializerClassName);
+        $binder->bind('stubDatabaseConnection')
+               ->toProviderClass($this->databaseConnectionProviderClassName);
         $binder->bindConstant()
                ->named('net.stubbles.rdbms.fallback')
@@ -58 +111 @@
                    ->to($this->descriptor);
         }
-        
-        $binder->bind('stubDatabaseConnection')
-               ->toProviderClass('net::stubbles::rdbms::ioc::stubDatabaseConnectionProvider');
     }
 }

framework/trunk/src/main/resources/build/initializers.ini

@@ -1 @@
-interceptors = "net::stubbles::ipo::interceptors::stubInterceptorXJConfInitializer"
-rdbms = "net::stubbles::rdbms::stubDatabaseXJConfInitializer"
 variantmanager = "net::stubbles::websites::variantmanager::stubVariantXJConfFactory"

framework/trunk/src/test/php/net/stubbles/rdbms/ioc/stubDatabaseBindingModuleTestCase.php

@@ -27 +27 @@
         $databaseBindingModule = new stubDatabaseBindingModule();
         $injector              = new stubInjector();
-        $databaseBindingModule->configure(new stubBinder($injector));
+        $binder                = new stubBinder($injector);
+        $binder->bindConstant()
+               ->named('net.stubbles.config.path')
+               ->to(TEST_SRC_PATH);
+        $databaseBindingModule->configure($binder);
         $this->assertTrue($injector->hasBinding('stubDatabaseInitializer'));
-        $this->assertTrue($injector->hasBinding(stubConstantBinding::TYPE, 'net.stubbles.rdbms.fallback'));
-        $this->assertFalse($injector->hasBinding(stubConstantBinding::TYPE, 'net.stubbles.rdbms.descriptor'));
+        $this->assertTrue($injector->hasConstant('net.stubbles.rdbms.fallback'));
+        $this->assertFalse($injector->hasConstant('net.stubbles.rdbms.descriptor'));
         $this->assertTrue($injector->hasBinding('stubDatabaseConnection'));
-        $this->assertType('stubDatabaseXJConfInitializer', $injector->getInstance('stubDatabaseInitializer'));
-        $this->assertTrue($injector->getInstance(stubConstantBinding::TYPE,
-                                                 'net.stubbles.rdbms.fallback'
-                          )
-        );
+        $this->assertType('stubPropertyBasedDatabaseInitializer', $injector->getInstance('stubDatabaseInitializer'));
+        $this->assertTrue($injector->getConstant('net.stubbles.rdbms.fallback'));
     }
-    
+
     /**
      * fallback disabled
@@ -46 +47 @@
     public function fallbackDisabledDescriptorEnabled()
     {
-        $databaseBindingModule = new stubDatabaseBindingModule(false, 'rdbms-prod');
+        $mockDatabaseInitializerClassName        = get_class($this->getMock('stubDatabaseInitializer'));
+        $mockDatabaseConnectionProviderClassName = get_class($this->getMock('stubInjectionProvider'));
+        $databaseBindingModule = stubDatabaseBindingModule::create(false, 'rdbms-prod')
+                                                          ->setDatabaseInitializerClassName($mockDatabaseInitializerClassName)
+                                                          ->setDatabaseConnectionProviderClassName($mockDatabaseConnectionProviderClassName);
         $injector              = new stubInjector();
         $databaseBindingModule->configure(new stubBinder($injector));
         $this->assertTrue($injector->hasBinding('stubDatabaseInitializer'));
-        $this->assertTrue($injector->hasBinding(stubConstantBinding::TYPE, 'net.stubbles.rdbms.fallback'));
-        $this->assertTrue($injector->hasBinding(stubConstantBinding::TYPE, 'net.stubbles.rdbms.descriptor'));
+        $this->assertTrue($injector->hasConstant('net.stubbles.rdbms.fallback'));
+        $this->assertTrue($injector->hasConstant('net.stubbles.rdbms.descriptor'));
         $this->assertTrue($injector->hasBinding('stubDatabaseConnection'));
-        $this->assertType('stubDatabaseXJConfInitializer', $injector->getInstance('stubDatabaseInitializer'));
-        $this->assertFalse($injector->getInstance(stubConstantBinding::TYPE,
-                                                  'net.stubbles.rdbms.fallback'
-                           )
-        );
-        $this->assertEquals('rdbms-prod', $injector->getInstance(stubConstantBinding::TYPE,
-                                                                 'net.stubbles.rdbms.descriptor'
-                                          )
-        );
+        $this->assertType($mockDatabaseInitializerClassName, $injector->getInstance('stubDatabaseInitializer'));
+        $this->assertFalse($injector->getConstant('net.stubbles.rdbms.fallback'));
+        $this->assertEquals('rdbms-prod', $injector->getConstant('net.stubbles.rdbms.descriptor'));
     }
 }