Author: hartym
Date: 2010-01-13 10:55:35 +0100 (Wed, 13 Jan 2010)
New Revision: 26558
Added:
plugins/sfDynamicsPlugin/trunk/.gitignore
plugins/sfDynamicsPlugin/trunk/test/fixtures/project/cache/
plugins/sfDynamicsPlugin/trunk/test/fixtures/project/cache/.sf
plugins/sfDynamicsPlugin/trunk/test/fixtures/project/log/
plugins/sfDynamicsPlugin/trunk/test/fixtures/project/log/.sf
plugins/sfDynamicsPlugin/trunk/test/unit/sfDynamicsTest.php
Modified:
plugins/sfDynamicsPlugin/trunk/lib/sfDynamics.class.php
plugins/sfDynamicsPlugin/trunk/test/fixtures/project/apps/frontend/config/settings.yml
Log:
[sfDynamicsPlugin] git/svn management: Merge branch 'master' into svn
Added: plugins/sfDynamicsPlugin/trunk/.gitignore
===================================================================
--- plugins/sfDynamicsPlugin/trunk/.gitignore (rev 0)
+++ plugins/sfDynamicsPlugin/trunk/.gitignore 2010-01-13 09:55:35 UTC (rev
26558)
@@ -0,0 +1,3 @@
+*.swp
+/test/fixtures/project/cache/*
+/test/fixtures/project/log/*
Modified: plugins/sfDynamicsPlugin/trunk/lib/sfDynamics.class.php
===================================================================
--- plugins/sfDynamicsPlugin/trunk/lib/sfDynamics.class.php 2010-01-13
09:52:30 UTC (rev 26557)
+++ plugins/sfDynamicsPlugin/trunk/lib/sfDynamics.class.php 2010-01-13
09:55:35 UTC (rev 26558)
@@ -32,7 +32,8 @@
self::checkConfiguration($context);
- self::$manager = new sfDynamicsManager($context);
+ $managerClass = sfConfig::get('app_sfDynamicsPlugin_manager',
'sfDynamicsManager');
+ self::$manager = new $managerClass($context);
}
return self::$manager;
Modified:
plugins/sfDynamicsPlugin/trunk/test/fixtures/project/apps/frontend/config/settings.yml
===================================================================
---
plugins/sfDynamicsPlugin/trunk/test/fixtures/project/apps/frontend/config/settings.yml
2010-01-13 09:52:30 UTC (rev 26557)
+++
plugins/sfDynamicsPlugin/trunk/test/fixtures/project/apps/frontend/config/settings.yml
2010-01-13 09:55:35 UTC (rev 26558)
@@ -28,6 +28,9 @@
escaping_strategy: on # Determines how variables are made
available to templates. Accepted values: on, off.
escaping_method: ESC_SPECIALCHARS # Function or helper used for
escaping. Accepted values: ESC_RAW, ESC_ENTITIES, ESC_JS, ESC_JS_NO_ENTITIES,
and ESC_SPECIALCHARS.
+ # External modules activated for this application
+ enabled_modules: [default, sfDynamics]
+
#all:
# .actions:
# error_404_module: default # To be called when a 404 error is
raised
Added: plugins/sfDynamicsPlugin/trunk/test/unit/sfDynamicsTest.php
===================================================================
--- plugins/sfDynamicsPlugin/trunk/test/unit/sfDynamicsTest.php
(rev 0)
+++ plugins/sfDynamicsPlugin/trunk/test/unit/sfDynamicsTest.php 2010-01-13
09:55:35 UTC (rev 26558)
@@ -0,0 +1,28 @@
+<?php
+require_once(dirname(__FILE__).'/../bootstrap/unit.php');
+require_once(dirname(__FILE__).'/../../lib/sfDynamics.class.php');
+
+$testCount = 1;
+
+class ManagerMock extends sfDynamicsManager
+{
+}
+
+$t = new lime_test($testCount, new lime_output_color());
+
+$t->comment('::getManager()');
+if (!sfContext::hasInstance())
+{
+ require_once $_SERVER['SYMFONY'].'/autoload/sfCoreAutoload.class.php';
+ sfCoreAutoload::register();
+ require_once
dirname(__FILE__).'/../fixtures/project/config/ProjectConfiguration.class.php';
+
sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration('frontend',
'test', isset($debug) ? $debug : true));
+ if (!sfContext::hasInstance())
+ {
+ $t->error('A context instance is required');
+ die();
+ }
+ $t->info('A frontend context has been initialized for tests');
+}
+sfConfig::set('app_sfDynamicsPlugin_manager', 'ManagerMock');
+$t->isa_ok(sfDynamics::getManager(), 'ManagerMock', '::getManager() the
manager class can be customized in app.yml');
\ No newline at end of file
Property changes on: plugins/sfDynamicsPlugin/trunk/test/unit/sfDynamicsTest.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Added: svn:keywords
+ Id Rev Date
Added: svn:eol-style
+ LF
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
