Author: ornicar2
Date: 2010-01-25 01:45:40 +0100 (Mon, 25 Jan 2010)
New Revision: 27149
Removed:
plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmCheckNeedMigration.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmCheckNeedMigrationTask.class.php
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/web/css/main.css
plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmSetupTask.class.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontActionGenerator.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontComponentGenerator.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontModuleGenerator.php
Log:
[Diem]
- removed deprecated tasks
- fixed front action and component generators not to override plugin classes in
some cases
- fixed admin style for webkit based browsers
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/css/main.css
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/css/main.css 2010-01-24
23:20:58 UTC (rev 27148)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/css/main.css 2010-01-25
00:45:40 UTC (rev 27149)
@@ -110,6 +110,7 @@
border: 1px solid #D3D3D3;
color: #444;
-moz-border-radius: 40px;
+ -webkit-border-radius: 40px;
color: #046BCA;
}
Deleted: plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmCheckNeedMigration.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmCheckNeedMigration.php
2010-01-24 23:20:58 UTC (rev 27148)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmCheckNeedMigration.php
2010-01-25 00:45:40 UTC (rev 27149)
@@ -1,48 +0,0 @@
-<?php
-
-class dmCheckNeedMigration extends Doctrine_Task
-{
- public
- $description = 'Generate migration classes from a generated
difference between your models and yaml schema files',
- $requiredArguments = array('migrations_path' => 'Specify the path to
your migration classes folder.',
- 'yaml_schema_path' => 'Specify the
path to your yaml schema files folder.'),
- $optionalArguments = array('models_path' => 'Specify the path to
your doctrine models folder.');
-
- public function execute()
- {
- $migrationsPath = $this->getArgument('migrations_path');
- $modelsPath = $this->getArgument('models_path');
- $yamlSchemaPath = $this->getArgument('yaml_schema_path');
-
- $migration = new Doctrine_Migration($migrationsPath);
- $diff = new Doctrine_Migration_Diff($modelsPath, $yamlSchemaPath,
$migration);
- $changes = $diff->generateChanges();
-
- if ($this->isEmpty($changes))
- {
- $this->notify('The project is up to date, and does NOT require a
doctrine migration');
- }
- else
- {
- throw new dmRequireMigrationException('The project requires a doctrine
migration');
- }
- }
-
- protected function isEmpty(array $changes)
- {
- foreach($changes as $key => $changes)
- {
- if (!empty($changes))
- {
- return false;
- }
- }
-
- return true;
- }
-}
-
-class dmRequireMigrationException extends dmException
-{
-
-}
\ No newline at end of file
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmCheckNeedMigrationTask.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmCheckNeedMigrationTask.class.php
2010-01-24 23:20:58 UTC (rev 27148)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmCheckNeedMigrationTask.class.php
2010-01-25 00:45:40 UTC (rev 27149)
@@ -1,102 +0,0 @@
-<?php
-
-class dmCheckNeedMigrationTask extends sfDoctrineBaseTask
-{
- const
- REQUIRE_MIGRATION_TRUE = 900001,
- REQUIRE_MIGRATION_FALSE = 900002;
-
- /**
- * @see sfTask
- */
- protected function configure()
- {
- $this->addOptions(array(
- new sfCommandOption('application', null,
sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
- new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED,
'The environment', 'dev'),
- ));
-
- $this->namespace = 'dm';
- $this->name = 'check-need-migration';
- $this->briefDescription = 'Check if your project needs a doctrine
migration';
-
- $this->detailedDescription = $this->briefDescription;
- }
-
- /**
- * @see sfTask
- */
- protected function execute($arguments = array(), $options = array())
- {
- $databaseManager = new sfDatabaseManager($this->configuration);
- $config = $this->getCliConfig();
-
- $this->logSection('diem', $this->briefDescription);
-
- if (!is_dir($config['migrations_path']))
- {
- $this->getFilesystem()->mkdirs($config['migrations_path']);
- }
-
- try
- {
- $this->callDoctrineCli('dm-check-need-migration', array(
- 'yaml_schema_path' =>
$this->prepareSchemaFile($config['yaml_schema_path']),
- ));
-
- $requireMigration = false;
- }
- catch(dmRequireMigrationException $e)
- {
- $requireMigration = true;
- }
-
- if ($requireMigration)
- {
- $this->logBlock('The project requires a doctrine migration',
'INFO_LARGE');
- $this->logSection('diem', 'You should run the following tasks:');
- $this->logSection('diem', 'php symfony
doctrine:generate-migrations-diff');
- $this->logSection('diem', 'php symfony doctrine:migrate');
-
- return self::REQUIRE_MIGRATION_TRUE;
- }
- else
- {
- return self::REQUIRE_MIGRATION_FALSE;
- }
- }
-
- /**
- * Calls a Doctrine CLI command.
- *
- * @param string $task Name of the Doctrine task to call
- * @param array $args Arguments for the task
- *
- * @see sfDoctrineCli
- */
- public function callDoctrineCli($task, $args = array())
- {
- $config = $this->getCliConfig();
-
- $arguments = array('./symfony', $task);
-
- foreach ($args as $key => $arg)
- {
- if (isset($config[$key]))
- {
- $config[$key] = $arg;
- }
- else
- {
- $arguments[] = $arg;
- }
- }
-
- $cli = new sfDoctrineCli($config);
- $cli->registerTaskClass('dmCheckNeedMigration');
- $cli->setSymfonyDispatcher($this->dispatcher);
- $cli->setSymfonyFormatter($this->formatter);
- return $cli->run($arguments);
- }
-
-}
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmSetupTask.class.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmSetupTask.class.php
2010-01-24 23:20:58 UTC (rev 27148)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmSetupTask.class.php
2010-01-25 00:45:40 UTC (rev 27149)
@@ -123,7 +123,7 @@
if (!$this->context->get('filesystem')->sf('dmFront:generate'))
{
$this->logBlock(array(
- 'Can\'t run dmFront:generate :
'.$this->context->get('filesystem')->getLastExec('output'),
+ 'Can\'t run dmFront:generate:
'.$this->context->get('filesystem')->getLastExec('output'),
'Please run "php symfony dmFront:generate" manually to generate front
templates'
), 'ERROR');
}
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontActionGenerator.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontActionGenerator.php
2010-01-24 23:20:58 UTC (rev 27148)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontActionGenerator.php
2010-01-25 00:45:40 UTC (rev 27149)
@@ -7,11 +7,11 @@
$indentation = ' ';
public function execute()
- {
+ {
require_once(dmOs::join(sfConfig::get('dm_core_dir'),
'lib/vendor/Zend/Reflection/File.php'));
require_once(dmOs::join(sfConfig::get('dm_core_dir'),
'lib/vendor/Zend/CodeGenerator/Php/File.php'));
require_once(dmOs::join(sfConfig::get('dm_core_dir'),
'lib/vendor/dmZend/CodeGenerator/Php/Class.php'));
-
+
$file = dmOs::join($this->moduleDir, 'actions/actions.class.php');
if (!$this->filesystem->mkdir(dirname($file)))
@@ -23,6 +23,12 @@
if (file_exists($file))
{
+ if($this->shouldSkip($file))
+ {
+ $this->log('skip '.dmProject::unrootify($file));
+ return true;
+ }
+
include_once($file);
$this->class = dmZendCodeGeneratorPhpClass::fromReflection(new
Zend_Reflection_Class($className));
@@ -70,6 +76,13 @@
return $return;
}
+
+ protected function shouldSkip($file)
+ {
+ $code = file_get_contents($file);
+
+ return false !== strpos($code, 'require_once');
+ }
protected function buildClass($className)
{
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontComponentGenerator.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontComponentGenerator.php
2010-01-24 23:20:58 UTC (rev 27148)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontComponentGenerator.php
2010-01-25 00:45:40 UTC (rev 27149)
@@ -23,6 +23,12 @@
if (file_exists($file))
{
+ if($this->shouldSkip($file))
+ {
+ $this->log('skip '.dmProject::unrootify($file));
+ return true;
+ }
+
include_once($file);
$this->class = dmZendCodeGeneratorPhpClass::fromReflection(new
Zend_Reflection_Class($className));
@@ -64,6 +70,13 @@
return $return;
}
+
+ protected function shouldSkip($file)
+ {
+ $code = file_get_contents($file);
+
+ return false !== strpos($code, 'require_once');
+ }
protected function buildClass($className)
{
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontModuleGenerator.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontModuleGenerator.php
2010-01-24 23:20:58 UTC (rev 27148)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/generator/dmFrontModuleGenerator.php
2010-01-25 00:45:40 UTC (rev 27149)
@@ -22,14 +22,24 @@
{
$this->formatter = $formatter;
}
-
+
+ protected function log($message)
+ {
+ if ($this->formatter)
+ {
+ $message = $this->formatter->format(get_class($this).' '.$message);
+ }
+
+ $this->dispatcher->notify(new sfEvent($this, 'command.log',
array($message)));
+ }
+
protected function logError($message)
{
if ($this->formatter)
{
$message = $this->formatter->format(get_class($this).' '.$message,
'ERROR');
}
-
+
$this->dispatcher->notify(new sfEvent($this, 'command.log',
array($message)));
}
--
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.
