lib/addon/propel/database/sfPropelDataRetriever.class.php
@@ -1,12 +1,36 @@
+Version 1.0.0
+-------------
+
+No major changes since 1.0.0-rc2.
+
+* r3502: fixed sfFilter::isFirstCall() method
+* r3493: removed the DATABASE_NAME constants
+
+* fixed typos in the book
+
+Version 1.0.0-rc2
+-----------------
+
+No major changes since 1.0.0-rc1.
+
+* r3385: new propel-dump-data task
+* r3377: fixed PEAR installation problem with PEAR 1.5
+
+* new book is now bundled with symfony under the doc/ directory
+* added some phpdoc comments
+
Version 1.0.0-rc1
-----------------
No major changes since beta4.
+* r3348: added "The Definitive guide to symfony"
+* r3325: better inheritance for admin generator templates
* r3316: updated script.aculo.us to 1.7.0 and prototype to 1.5.0
* r3313: added a new decorate_with() helper
* r3312: added a new isForwardedTo() method to sfTestBrowser
* r3298: fixed tests on windows
+
* updated phpdoc comments
* added more unit tests (> 3800 now)
CHANGELOG
@@ -17,4 +17,4 @@ see LICENSE file
INSTALLATION
------------
-see doc/book/03-Running-Symfony.txt
+see doc/03-Running-Symfony.txt
README
@@ -54,6 +54,10 @@ touch lib/model/.sf plugins/.sf web/js/.sf
touch test/unit/.sf test/functional/.sf test/functional/${APP_NAME}/.sf
touch web/uploads/assets/.sf
+touch data/sandbox.db
+chmod 777 data
+chmod 777 data/sandbox.db
+
echo ">>> create archive"
cd ..
tar zcpf ${SANDBOX_NAME}.tgz ${SANDBOX_NAME}
data/bin/create_sandbox.sh
@@ -77,4 +77,6 @@ default:
path_info_array: SERVER
path_info_key: PATH_INFO
url_format: PATH
-
\ No newline at end of file
+
+ # ORM
+ orm: propel
data/config/settings.yml
@@ -36,6 +36,9 @@ class <?php echo $this->getGeneratedModuleName() ?>Actions extends sfActions
<?php if ($this->getParameterValue('list.peer_method')): ?>
$this->pager->setPeerMethod('<?php echo $this->getParameterValue('list.peer_method') ?>');
<?php endif ?>
+<?php if ($this->getParameterValue('list.peer_count_method')): ?>
+ $this->pager->setPeerCountMethod('<?php echo $this->getParameterValue('list.peer_count_method') ?>');
+<?php endif ?>
$this->pager->init();
}
@@ -392,7 +395,7 @@ $column = sfPropelManyToMany::getColumn($class, $through_class);
<?php else: ?>
else if (isset($this->filters['<?php echo $column->getName() ?>']) && $this->filters['<?php echo $column->getName() ?>'] !== '')
{
-<?php if ($type == CreoleTypes::CHAR || $type == CreoleTypes::VARCHAR): ?>
+<?php if ($type == CreoleTypes::CHAR || $type == CreoleTypes::VARCHAR || $type == CreoleTypes::LONGVARCHAR): ?>
$c->add(<?php echo $this->getPeerClassName() ?>::<?php echo strtoupper($column->getName()) ?>, strtr($this->filters['<?php echo $column->getName() ?>'], '*', '%'), Criteria::LIKE);
<?php else: ?>
$c->add(<?php echo $this->getPeerClassName() ?>::<?php echo strtoupper($column->getName()) ?>, $this->filters['<?php echo $column->getName() ?>']);
data/generator/sfPropelAdmin/default/template/actions/actions.class.php
@@ -1,4 +1,16 @@
-[?php echo form_tag('<?php echo $this->getModuleName() ?>/edit', 'id=sf_admin_edit_form name=sf_admin_edit_form multipart=true onsubmit=double_list_submit(); return true;') ?]
+[?php echo form_tag('<?php echo $this->getModuleName() ?>/edit', array(
+ 'id' => 'sf_admin_edit_form',
+ 'name' => 'sf_admin_edit_form',
+ 'multipart' => true,
+<?php foreach ($this->getColumnCategories('edit.display') as $category): ?>
+<?php foreach ($this->getColumns('edit.display', $category) as $name => $column): ?>
+<?php if ('admin_double_list' == $this->getParameterValue('edit.fields.'.$column->getName().'.type')): ?>
+ 'onsubmit' => 'double_list_submit(); return true;'
+<?php break 2; ?>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php endforeach; ?>
+)) ?]
<?php foreach ($this->getPrimaryKey() as $pk): ?>
[?php echo object_input_hidden_tag($<?php echo $this->getSingularName() ?>, 'get<?php echo $pk->getPhpName() ?>') ?]
data/generator/sfPropelAdmin/default/template/templates/_edit_form.php
@@ -1 +1 @@
-a:3:{s:14:"NumberPatterns";a:4:{i:0;s:20:"#,##0.###;-#,##0.###";i:1;s:24:"#,##0.00 ¤;-#,##0.00 ¤";i:2;s:6:"#,##0%";i:3;s:3:"#E0";}s:7:"Version";a:1:{i:0;s:3:"1.2";}s:8:"calendar";a:1:{s:9:"gregorian";a:2:{s:26:"DateTimeElements:intvector";a:2:{i:0;i:2;i:1;i:4;}s:16:"DateTimePatterns";a:9:{i:0;s:12:"HH.mm' u. 'z";i:1;s:10:"HH:mm:ss z";i:2;s:8:"HH:mm:ss";i:3;s:5:"HH:mm";i:4;s:16:"EEEE d MMMM yyyy";i:5;s:11:"d MMMM yyyy";i:6;s:8:"d-MMM-yy";i:7;s:7:"d/MM/yy";i:8;s:7:"{1} {0}";}}}}
\ No newline at end of file
+a:3:{s:14:"NumberPatterns";a:4:{i:0;s:20:"#,##0.###;-#,##0.###";i:1;s:24:"¤ #,##0.00;¤ -#,##0.00";i:2;s:6:"#,##0%";i:3;s:3:"#E0";}s:7:"Version";a:1:{i:0;s:3:"1.2";}s:8:"calendar";a:1:{s:9:"gregorian";a:2:{s:26:"DateTimeElements:intvector";a:2:{i:0;i:2;i:1;i:4;}s:16:"DateTimePatterns";a:9:{i:0;s:12:"HH.mm' u. 'z";i:1;s:10:"HH:mm:ss z";i:2;s:8:"HH:mm:ss";i:3;s:5:"HH:mm";i:4;s:16:"EEEE d MMMM yyyy";i:5;s:11:"d MMMM yyyy";i:6;s:10:"d-MMM-yyyy";i:7;s:9:"d/MM/yyyy";i:8;s:7:"{1} {0}";}}}}
\ No newline at end of file
data/i18n/nl_BE.dat
@@ -98,3 +98,6 @@ test:
# path_info_array: SERVER
# path_info_key: PATH_INFO
# url_format: PATH
+#
+# # ORM
+# orm: propel
data/skeleton/app/app/config/settings.yml
@@ -44,15 +44,16 @@ function run_fix_perms($task, $args)
pake_chmod(sfConfig::get('sf_cache_dir_name'), $sf_root_dir, 0777);
pake_chmod(sfConfig::get('sf_log_dir_name'), $sf_root_dir, 0777);
+ pake_chmod(sfConfig::get('sf_web_dir_name').DIRECTORY_SEPARATOR.sfConfig::get('sf_upload_dir_name'), $sf_root_dir, 0777);
pake_chmod('symfony', $sf_root_dir, 0777);
- $dirs = array('root_cache', 'upload', 'log');
+ $dirs = array(sfConfig::get('sf_cache_dir_name'), sfConfig::get('sf_web_dir_name').DIRECTORY_SEPARATOR.sfConfig::get('sf_upload_dir_name'), sfConfig::get('sf_log_dir_name'));
$dir_finder = pakeFinder::type('dir')->ignore_version_control();
$file_finder = pakeFinder::type('file')->ignore_version_control();
foreach ($dirs as $dir)
{
- pake_chmod($dir_finder, sfConfig::get('sf_'.$dir.'_dir'), 0777);
- pake_chmod($file_finder, sfConfig::get('sf_'.$dir.'_dir'), 0666);
+ pake_chmod($dir_finder, $dir, 0777);
+ pake_chmod($file_finder, $dir, 0666);
}
}
data/tasks/sfPakeMisc.php
@@ -26,6 +26,9 @@ pake_task('propel-convert-xml-schema', 'project_exists');
pake_desc('load data from fixtures directory');
pake_task('propel-load-data', 'project_exists');
+pake_desc('dump data to fixtures directory');
+pake_task('propel-dump-data', 'project_exists');
+
pake_desc('create database for current model');
pake_task('propel-build-db', 'project_exists');
@@ -217,7 +220,64 @@ function run_propel_build_schema($task, $args)
}
/**
- * loads yml data from fixtures directory and inserts into database
+ * Dumps yml database data to fixtures directory.
+ *
+ * @example symfony dump-data frontend data.yml
+ * @example symfony dump-data frontend data.yml dev
+ *
+ * @param object $task
+ * @param array $args
+ */
+function run_propel_dump_data($task, $args)
+{
+ if (!count($args))
+ {
+ throw new Exception('You must provide the app.');
+ }
+
+ $app = $args[0];
+
+ if (!is_dir(sfConfig::get('sf_app_dir').DIRECTORY_SEPARATOR.$app))
+ {
+ throw new Exception('The app "'.$app.'" does not exist.');
+ }
+
+ if (!isset($args[1]))
+ {
+ throw new Exception('You must provide a filename.');
+ }
+
+ $filename = $args[1];
+
+ $env = empty($args[2]) ? 'dev' : $args[2];
+
+ // define constants
+ define('SF_ROOT_DIR', sfConfig::get('sf_root_dir'));
+ define('SF_APP', $app);
+ define('SF_ENVIRONMENT', $env);
+ define('SF_DEBUG', true);
+
+ // get configuration
+ require_once SF_ROOT_DIR.DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.SF_APP.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php';
+
+ $databaseManager = new sfDatabaseManager();
+ $databaseManager->initialize();
+
+ if (!sfToolkit::isPathAbsolute($filename))
+ {
+ $dir = sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'fixtures';
+ pake_mkdirs($dir);
+ $filename = $dir.DIRECTORY_SEPARATOR.$filename;
+ }
+
+ pake_echo_action('propel', sprintf('dumping data to "%s"', $filename));
+
+ $data = new sfPropelData();
+ $data->dumpData($filename);
+}
+
+/**
+ * Loads yml data from fixtures directory and inserts into database.
*
* @example symfony load-data frontend
* @example symfony load-data frontend dev fixtures append
data/tasks/sfPakePropel.php
@@ -25,7 +25,7 @@ function run_test_all($task, $args)
$h->base_dir = sfConfig::get('sf_test_dir');
// register all tests
- $finder = pakeFinder::type('file')->ignore_version_control()->name('*Test.php');
+ $finder = pakeFinder::type('file')->ignore_version_control()->follow_link()->name('*Test.php');
$h->register($finder->in($h->base_dir));
$h->run();
@@ -49,7 +49,7 @@ function run_test_functional($task, $args)
{
foreach (array_splice($args, 1) as $path)
{
- $files = pakeFinder::type('file')->ignore_version_control()->name(basename($path).'Test.php')->in(sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$app.DIRECTORY_SEPARATOR.dirname($path));
+ $files = pakeFinder::type('file')->ignore_version_control()->follow_link()->name(basename($path).'Test.php')->in(sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$app.DIRECTORY_SEPARATOR.dirname($path));
foreach ($files as $file)
{
include($file);
@@ -64,7 +64,7 @@ function run_test_functional($task, $args)
$h->base_dir = sfConfig::get('sf_test_dir').'/functional/'.$app;
// register functional tests
- $finder = pakeFinder::type('file')->ignore_version_control()->name('*Test.php');
+ $finder = pakeFinder::type('file')->ignore_version_control()->follow_link()->name('*Test.php');
$h->register($finder->in($h->base_dir));
$h->run();
@@ -77,7 +77,7 @@ function run_test_unit($task, $args)
{
foreach ($args as $path)
{
- $files = pakeFinder::type('file')->ignore_version_control()->name(basename($path).'Test.php')->in(sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'unit'.DIRECTORY_SEPARATOR.dirname($path));
+ $files = pakeFinder::type('file')->ignore_version_control()->follow_link()->name(basename($path).'Test.php')->in(sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'unit'.DIRECTORY_SEPARATOR.dirname($path));
foreach ($files as $file)
{
include($file);
@@ -92,7 +92,7 @@ function run_test_unit($task, $args)
$h->base_dir = sfConfig::get('sf_test_dir').'/unit';
// register unit tests
- $finder = pakeFinder::type('file')->ignore_version_control()->name('*Test.php');
+ $finder = pakeFinder::type('file')->ignore_version_control()->follow_link()->name('*Test.php');
$h->register($finder->in($h->base_dir));
$h->run();
data/tasks/sfPakeTest.php
@@ -22,7 +22,7 @@
</head>
<body>
<div class="sfTContainer">
- <a alt="symfony website" href="http://www.symfony-project.com/"><img alt="symfony PHP Framework" class="sfTLogo" src="<?php echo $path ?>/sf/sf_default/images/sfTLogo.png" height="39" width="186" /></a>
+ <a title="symfony website" href="http://www.symfony-project.com/"><img alt="symfony PHP Framework" class="sfTLogo" src="<?php echo $path ?>/sf/sf_default/images/sfTLogo.png" height="39" width="186" /></a>
<div class="sfTMessageContainer sfTAlert">
<img alt="page not found" class="sfTMessageIcon" src="<?php echo $path ?>/sf/sf_default/images/icons/tools48.png" height="48" width="48" />
<div class="sfTMessageWrap">
data/web/errors/error500.php
@@ -22,7 +22,7 @@
</head>
<body>
<div class="sfTContainer">
- <a alt="symfony website" href="http://www.symfony-project.com/"><img alt="symfony PHP Framework" class="sfTLogo" src="<?php echo $path ?>/sf/sf_default/images/sfTLogo.png" height="39" width="186" /></a>
+ <a title="symfony website" href="http://www.symfony-project.com/"><img alt="symfony PHP Framework" class="sfTLogo" src="<?php echo $path ?>/sf/sf_default/images/sfTLogo.png" height="39" width="186" /></a>
<div class="sfTMessageContainer sfTAlert">
<img alt="page not found" class="sfTMessageIcon" src="<?php echo $path ?>/sf/sf_default/images/icons/tools48.png" height="48" width="48" />
<div class="sfTMessageWrap">
data/web/errors/unavailable.php
@@ -1 +1 @@
-1.0.0-rc1
\ No newline at end of file
+1.0.0
\ No newline at end of file
lib/VERSION
@@ -281,7 +281,7 @@ abstract class sfComponent
*
* @see getVar()
*/
- public function __get($key)
+ public function & __get($key)
{
return $this->varHolder->get($key);
}
lib/action/sfComponent.class.php
@@ -286,4 +286,9 @@ class sfDebugConnection implements Connection
self::$logger->log($msg);
}
}
+
+ public function __call($method, $arguments)
+ {
+ return $this->childConnection->$method($arguments);
+ }
}
lib/addon/creole/drivers/sfDebugConnection.php
@@ -76,7 +76,7 @@ require_once \''.$this->getFilePath($this->getStubObjectBuilder()->getPackage().
{
$script .= "
- public function __call(\$method, \$parameters)
+ public function __call(\$method, \$arguments)
{
if (!\$callable = sfMixer::getCallable('{$this->getClassname()}:'.\$method))
{
@@ -90,15 +90,6 @@ require_once \''.$this->getFilePath($this->getStubObjectBuilder()->getPackage().
";
}
-
- protected function addConstants(&$script)
- {
- parent::addConstants($script);
- $script .= "
- /** the default database name for this class */
- const DATABASE_NAME = '{$this->getDatabase()->getName()}';
-";
- }
protected function addAttributes(&$script)
{
lib/addon/propel/builder/SfObjectBuilder.php
@@ -111,30 +111,4 @@ class sfPropelDatabase extends sfCreoleDatabase
self::$config['propel']['datasources'][$this->getParameter('datasource')]['connection'][$key] = $value;
$this->setParameter($key, $value);
}
-
- public function retrieveObjects($class, $peerMethod = null)
- {
- if (!$classPath = sfCore::getClassPath($class.'Peer'))
- {
- throw new sfException(sprintf('Unable to find path for class "%s".', $class.'Peer'));
- }
-
- require_once($classPath);
-
- if (!$peerMethod)
- {
- $peerMethod = 'doSelect';
- }
-
- $classPeer = $class.'Peer';
-
- if (!is_callable(array($classPeer, $peerMethod)))
- {
- throw new sfException(sprintf('Peer method "%s" not found for class "%s"', $peerMethod, $classPeer));
- }
-
- $objects = call_user_func(array($classPeer, $peerMethod), new Criteria());
-
- return $objects;
- }
}
lib/addon/propel/database/sfPropelDatabase.class.php
@@ -9,6 +9,8 @@
*/
/**
+ * This class is the Propel implementation of sfData. It interacts with the data source
+ * and loads data.
*
* @package symfony
* @subpackage addon
@@ -21,6 +23,14 @@ class sfPropelData extends sfData
$maps = array();
// symfony load-data (file|dir)
+ /**
+ * Loads data from a file or directory into a Propel data source
+ *
+ * @param mixed A file or directory path
+ * @param string The Propel connection name, default 'propel'
+ *
+ * @throws Exception If the database throws an error, rollback transaction and rethrows exception
+ */
public function loadData($directory_or_file = null, $connectionName = 'propel')
{
$fixture_files = $this->getFiles($directory_or_file);
@@ -44,6 +54,15 @@ class sfPropelData extends sfData
}
}
+ /**
+ * Implements the abstract loadDataFromArray method and loads the data using the generated data model.
+ *
+ * @param array The data to be loaded into the data source
+ *
+ * @throws Exception If data is unnamed.
+ * @throws sfException If an object defined in the model does not exist in the data
+ * @throws sfException If a column that does not exist is referenced
+ */
public function loadDataFromArray($data)
{
if ($data === null)
@@ -132,6 +151,15 @@ class sfPropelData extends sfData
}
}
+ /**
+ * Clears existing data from the data source by reading the fixture files
+ * and deleting the existing data for only those classes that are mentioned
+ * in the fixtures.
+ *
+ * @param array The list of YAML files.
+ *
+ * @throws sfException If a class mentioned in a fixture can not be found
+ */
protected function doDeleteCurrentData($fixture_files)
{
// delete all current datas in database
@@ -169,6 +197,13 @@ class sfPropelData extends sfData
}
}
+ /**
+ * Loads the mappings for the classes
+ *
+ * @param string The name of a data object
+ *
+ * @throws sfException If the class cannot be found
+ */
protected function loadMapBuilder($class)
{
$class_map_builder = $class.'MapBuilder';
@@ -227,37 +262,66 @@ class sfPropelData extends sfData
// load map classes
array_walk($tables, array($this, 'loadMapBuilder'));
- foreach ($tables as $table)
+ // reordering tables to take foreign keys into account
+ $move = true;
+ while ($move)
{
- $tableMap = $this->maps[$table]->getDatabaseMap()->getTable(constant($table.'Peer::TABLE_NAME'));
+ foreach ($tables as $i => $tableName)
+ {
+ $tableMap = $this->maps[$tableName]->getDatabaseMap()->getTable(constant($tableName.'Peer::TABLE_NAME'));
+
+ foreach ($tableMap->getColumns() as $column)
+ {
+ if ($column->isForeignKey())
+ {
+ $relatedTable = $this->maps[$tableName]->getDatabaseMap()->getTable($column->getRelatedTableName());
+ if (array_search($relatedTable->getPhpName(), $tables) > $i)
+ {
+ unset($tables[$i]);
+ $tables[] = $tableName;
+ $move = true;
+ continue 2;
+ }
+ }
+ }
+
+ $move = false;
+ }
+ }
+
+ foreach ($tables as $tableName)
+ {
+ $tableMap = $this->maps[$tableName]->getDatabaseMap()->getTable(constant($tableName.'Peer::TABLE_NAME'));
// get db info
- $rs = $con->executeQuery('SELECT * FROM '.constant($table.'Peer::TABLE_NAME'));
+ $rs = $con->executeQuery('SELECT * FROM '.constant($tableName.'Peer::TABLE_NAME'));
- $dumpData[$table] = array();
+ $dumpData[$tableName] = array();
- while ($rs->next()) {
- $pk = '';
+ while ($rs->next())
+ {
+ $pk = $tableName;
+ $values = array();
foreach ($tableMap->getColumns() as $column)
{
$col = strtolower($column->getColumnName());
-
if ($column->isPrimaryKey())
{
- $pk .= '_' .$rs->get($col);
- continue;
+ $pk .= '_'.$rs->get($col);
}
else if ($column->isForeignKey())
{
- $relatedTable = $this->maps[$table]->getDatabaseMap()->getTable($column->getRelatedTableName());
+ $relatedTable = $this->maps[$tableName]->getDatabaseMap()->getTable($column->getRelatedTableName());
- $dumpData[$table][$table.$pk][$col] = $relatedTable->getPhpName().'_'.$rs->get($col);
+ $values[$col] = $relatedTable->getPhpName().'_'.$rs->get($col);
}
else
{
- $dumpData[$table][$table.$pk][$col] = $rs->get($col);
+ $values[$col] = $rs->get($col);
}
}
+
+ $dumpData[$tableName][$pk] = $values;
}
}
lib/addon/propel/sfPropelData.class.php
@@ -93,11 +93,11 @@ class sfPropelDatabaseSchema
}
// foreign-keys
- if (isset($table['_foreign_keys']))
+ if (isset($table['_foreignKeys']))
{
- foreach ($table['_foreign_keys'] as $fkey_name => $fkey)
+ foreach ($table['_foreignKeys'] as $fkey_name => $fkey)
{
- $xml .= " <foreign-key foreignTable=\"$fkey[foreign_table]\"";
+ $xml .= " <foreign-key foreignTable=\"$fkey[foreignTable]\"";
// foreign key name
if (!is_numeric($fkey_name))
@@ -106,15 +106,15 @@ class sfPropelDatabaseSchema
}
// onDelete
- if (isset($fkey['on_delete']))
+ if (isset($fkey['onDelete']))
{
- $xml .= " onDelete=\"$fkey[on_delete]\"";
+ $xml .= " onDelete=\"$fkey[onDelete]\"";
}
// onUpdate
- if (isset($fkey['on_update']))
+ if (isset($fkey['onUpdate']))
{
- $xml .= " onUpdate=\"$fkey[on_update]\"";
+ $xml .= " onUpdate=\"$fkey[onUpdate]\"";
}
$xml .= ">\n";
@@ -405,11 +405,11 @@ class sfPropelDatabaseSchema
$booleans = array('required', 'primaryKey', 'autoincrement', 'autoIncrement', 'noXsd', 'isI18N', 'isCulture');
if (in_array($key, $booleans))
{
- return ($value == 1) ? 'true' : 'false';
+ return $value == 1 ? 'true' : 'false';
}
else
{
- return $value;
+ return is_null($value) ? 'null' : $value;
}
}
lib/addon/propel/sfPropelDatabaseSchema.class.php
@@ -9,6 +9,8 @@
*/
/**
+ * This class defines the interface for interacting with data, as well
+ * as default implementations.
*
* @package symfony
* @subpackage addon
@@ -22,16 +24,33 @@ abstract class sfData
$deleteCurrentData = true,
$object_references = array();
+ /**
+ * Sets a flag to indicate if the current data in the database
+ * should be deleted before new data is loaded.
+ *
+ * @param boolean The flag value
+ */
public function setDeleteCurrentData($boolean)
{
$this->deleteCurrentData = $boolean;
}
+ /**
+ * Gets the current value of the flag that indicates whether
+ * current data is to be deleted or not.
+ *
+ * @returns boolean
+ */
public function getDeleteCurrentData()
{
return $this->deleteCurrentData;
}
+ /**
+ * Loads data for the database from a YAML file
+ *
+ * @param string The path to the YAML file.
+ */
protected function doLoadDataFromFile($fixture_file)
{
// import new datas
@@ -40,8 +59,19 @@ abstract class sfData
$this->loadDataFromArray($data);
}
+ /**
+ * Manages the insertion of data into the data source
+ *
+ * @param array The data to be inserted into the data source
+ */
abstract public function loadDataFromArray($data);
+ /**
+ * Manages reading all of the fixture data files and
+ * loading them into the data source
+ *
+ * @param array The path names of the YAML data files
+ */
protected function doLoadData($fixture_files)
{
$this->object_references = array();
@@ -54,6 +84,15 @@ abstract class sfData
}
}
+ /**
+ * Gets a list of one or more *.yml files and returns the list in an array
+ *
+ * @param string A directory or file name; if null, then defaults to 'sf_data_dir'/fixtures
+ *
+ * @returns array A list of *.yml files.
+ *
+ * @throws sfInitializationException If the directory or file does not exist.
+ */
protected function getFiles($directory_or_file = null)
{
// directory or file?
lib/addon/sfData.class.php
@@ -51,7 +51,7 @@ class sfFunctionCache extends sfFileCache
$target = array_shift($arguments);
ob_start();
ob_implicit_flush(false);
- if (strstr($target, '::'))
+ if (is_string($target) && strstr($target, '::'))
{
// classname::staticMethod
list($class, $method) = explode('::', $target);
@@ -65,7 +65,7 @@ class sfFunctionCache extends sfFileCache
throw $e;
}
}
- else if (strstr($target, '->'))
+ else if (is_string($target) && strstr($target, '->'))
{
// object->method
// use a stupid name ($objet_123456789 because) of problems when the object
lib/cache/sfFunctionCache.class.php
@@ -63,6 +63,8 @@ class sfConfigCache
// handler to call for this configuration file
$handlerToCall = null;
+ $handler = str_replace(DIRECTORY_SEPARATOR, '/', $handler);
+
// grab the base name of the handler
$basename = basename($handler);
if (isset($this->handlers[$handler]))
@@ -130,6 +132,8 @@ class sfConfigCache
*/
public function checkConfig($configPath, $optional = false)
{
+ static $process_cache_cleared = false;
+
if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))
{
$timer = sfTimerManager::getTimer('Configuration');
@@ -186,9 +190,10 @@ class sfConfigCache
$this->callHandler($configPath, $files, $cache);
// clear process cache
- if ('config/config_handlers.yml' != $configPath)
+ if ('config/config_handlers.yml' != $configPath && sfConfig::has('sf_use_process_cache') && !$process_cache_cleared)
{
sfProcessCache::clear();
+ $process_cache_cleared = true;
}
}
lib/config/sfConfigCache.class.php
@@ -69,7 +69,7 @@ class sfValidatorConfigHandler extends sfYamlConfigHandler
// unsupported request method
$error = sprintf('Configuration file "%s" specifies unsupported request method "%s"', $configFiles[0], $method);
- throw new sfParseException($method);
+ throw new sfParseException($error);
}
// create our method
lib/config/sfValidatorConfigHandler.class.php
@@ -36,6 +36,9 @@ class sfFrontWebController extends sfWebController
$this->getContext()->getLogger()->info('{sfController} dispatch request');
}
+ // reinitialize filters (needed for unit and functional tests)
+ sfFilter::$filterCalled = array();
+
// determine our module and action
$request = $this->getContext()->getRequest();
$moduleName = $request->getParameter('module');
lib/controller/sfFrontWebController.class.php
@@ -116,9 +116,12 @@ class sfDebug
'httpHeaders' => array(),
'parameterHolder' => self::flattenParameterHolder($response->getParameterHolder()),
);
- foreach ($response->getHttpHeaders() as $key => $value)
+ if (method_exists($response, 'getHttpHeaders'))
{
- $values['httpHeaders'][$key] = $value;
+ foreach ($response->getHttpHeaders() as $key => $value)
+ {
+ $values['httpHeaders'][$key] = $value;
+ }
}
$cookies = array();
lib/debug/sfDebug.class.php
@@ -45,11 +45,16 @@ class sfTimer
/**
* Stops the timer and add the amount of time since the start to the total time.
+ *
+ * @return integer Time spend for the last call
*/
public function addTime()
{
- $this->totalTime += microtime(true) - $this->startTime;
+ $spend = microtime(true) - $this->startTime;
+ $this->totalTime += $spend;
++$this->calls;
+
+ return $spend;
}
/**
lib/debug/sfTimer.class.php
@@ -51,7 +51,7 @@ class sfCacheFilter extends sfFilter
public function execute($filterChain)
{
// execute this filter only once, if cache is set and no GET or POST parameters
- if (!$this->isFirstCall() || !sfConfig::get('sf_cache') || count($_GET) || count($_POST))
+ if (!sfConfig::get('sf_cache') || count($_GET) || count($_POST))
{
$filterChain->execute();
lib/filter/sfCacheFilter.class.php
@@ -22,9 +22,11 @@ abstract class sfFilter
{
protected
$parameterHolder = null,
- $filterCalled = array(),
$context = null;
+ public static
+ $filterCalled = array();
+
/**
* Returns true if this is the first call to the sfFilter instance.
*
@@ -33,13 +35,13 @@ abstract class sfFilter
protected function isFirstCall()
{
$class = get_class($this);
- if (isset($this->filterCalled[$class]))
+ if (isset(self::$filterCalled[$class]))
{
return false;
}
else
{
- $this->filterCalled[$class] = true;
+ self::$filterCalled[$class] = true;
return true;
}
lib/filter/sfFilter.class.php
@@ -124,13 +124,16 @@ abstract class sfAdminGenerator extends sfCrudGenerator
$action = isset($params['action']) ? $params['action'] : $default_action;
$url_params = $pk_link ? '?'.$this->getPrimaryKeyUrlParams() : '\'';
- if (!isset($options['class']) && $default_class)
+ if (!isset($options['class']))
{
- $options['class'] = $default_class;
- }
- else
- {
- $options['style'] = 'background: #ffc url('.$icon.') no-repeat 3px 2px';
+ if ($default_class)
+ {
+ $options['class'] = $default_class;
+ }
+ else
+ {
+ $options['style'] = 'background: #ffc url('.$icon.') no-repeat 3px 2px';
+ }
}
$li_class = $li_class ? ' class="'.$li_class.'"' : '';
lib/generator/sfAdminGenerator.class.php
@@ -86,16 +86,8 @@ abstract class sfCrudGenerator extends sfGenerator
}
$this->setTheme($theme);
-
- $templateFiles = array_merge(
- sfFinder::type('file')->name('*.php')->relative()->in(sfLoader::getGeneratorTemplate($this->getGeneratorClass(), 'default', '').'/templates'),
- sfFinder::type('file')->name('*.php')->relative()->in($themeDir.'/templates')
- );
-
- $configFiles = array_merge(
- sfFinder::type('file')->name('*.yml')->relative()->in(sfLoader::getGeneratorTemplate($this->getGeneratorClass(), 'default', '').'/config'),
- sfFinder::type('file')->name('*.yml')->relative()->in($themeDir.'/config')
- );
+ $templateFiles = sfFinder::type('file')->name('*.php')->relative()->in($themeDir.'/templates');
+ $configFiles = sfFinder::type('file')->name('*.yml')->relative()->in($themeDir.'/config');
$this->generatePhpFiles($this->generatedModuleName, $templateFiles, $configFiles);
lib/generator/sfCrudGenerator.class.php
@@ -68,7 +68,7 @@ abstract class sfGenerator
// save template file
$this->getGeneratorManager()->getCache()->set($template, $generatedModuleName.DIRECTORY_SEPARATOR.'templates', $retval);
}
-
+
// generate config files
foreach ($configFiles as $config)
{
lib/generator/sfGenerator.class.php
@@ -37,6 +37,11 @@ function format_date($date, $format = 'd', $culture = null, $charset = null)
{
static $dateFormats = array();
+ if (is_null($date))
+ {
+ return null;
+ }
+
if (!$culture)
{
$culture = sfContext::getInstance()->getUser()->getCulture();
lib/helper/DateHelper.php
@@ -458,7 +458,7 @@ function textarea_tag($name, $content = null, $options = array())
return $sfEditor->toHTML();
}
- return content_tag('textarea', (is_object($content)) ? $content->__toString() : $content, array_merge(array('name' => $name, 'id' => get_id_from_name(_get_option($options, 'id', $name), null)), _convert_options($options)));
+ return content_tag('textarea', escape_once((is_object($content)) ? $content->__toString() : $content), array_merge(array('name' => $name, 'id' => get_id_from_name(_get_option($options, 'id', $name), null)), _convert_options($options)));
}
/**
lib/helper/FormHelper.php
@@ -1000,7 +1000,7 @@
$callback = remote_function($options);
$javascript = 'new '.$klass.'("'.$name.'", ';
- if (isset($options['frequency']))
+ if (isset($options['frequency']) && $options['frequency'] > 0)
{
$javascript .= $options['frequency'].", ";
}
lib/helper/JavascriptHelper.php
@@ -19,6 +19,11 @@
function format_number($number, $culture = null)
{
+ if (is_null($number))
+ {
+ return null;
+ }
+
$numberFormat = new sfNumberFormat(_current_language($culture));
return $numberFormat->format($number);
@@ -26,6 +31,11 @@ function format_number($number, $culture = null)
function format_currency($amount, $currency = null, $culture = null)
{
+ if (is_null($amount))
+ {
+ return null;
+ }
+
$numberFormat = new sfNumberFormat(_current_language($culture));
return $numberFormat->format($amount, 'c', $currency);
lib/helper/NumberHelper.php
@@ -155,23 +155,26 @@ function strip_links_text($text)
if (!defined('SF_AUTO_LINK_RE'))
{
- define('SF_AUTO_LINK_RE', '/
+ define('SF_AUTO_LINK_RE', '~
( # leading text
<\w+.*?>| # leading HTML tag, or
- [^=!:\'"\/]| # leading punctuation, or
+ [^=!:\'"/]| # leading punctuation, or
^ # beginning of line
)
(
- (?:http[s]?:\/\/)| # protocol spec, or
+ (?:https?://)| # protocol spec, or
(?:www\.) # www.*
- )
+ )
(
- ([\w]+:?[=?&\/.-]?)* # url segment
- \w+[\/]? # url tail
- (?:\#\w*)? # trailing anchor
+ [-\w]+ # subdomain or domain
+ (?:\.[-\w]+)* # remaining subdomains or domain
+ (?::\d+)? # port
+ (?:/(?:(?:[\~\w\+%-]|(?:[,.;:][^\s$]))+)?)* # path
+ (?:\?[\w\+%&=.;-]+)? # query string
+ (?:\#[\w\-]*)? # trailing anchor
)
([[:punct:]]|\s|<|$) # trailing text
- /x');
+ ~x');
}
/**
@@ -189,7 +192,7 @@ function _auto_link_urls($text, $href_options = array())
}
else
{
- return $matches[1].\'<a href="\'.($matches[2] == "www." ? "http://www." : $matches[2]).$matches[3].\'"'.$href_options.'>\'.$matches[2].$matches[3].\'</a>\'.$matches[5];
+ return $matches[1].\'<a href="\'.($matches[2] == "www." ? "http://www." : $matches[2]).$matches[3].\'"'.$href_options.'>\'.$matches[2].$matches[3].\'</a>\'.$matches[4];
}
')
, $text);
lib/helper/TextHelper.php
@@ -292,16 +292,24 @@ function button_to($name, $internal_uri, $options = array())
* @return string XHTML compliant <a href> tag
* @see link_to
*/
-function mail_to($email, $name = '', $options = array())
+function mail_to($email, $name = '', $options = array(), $default_value = array())
{
$html_options = _parse_attributes($options);
$html_options = _convert_options_to_javascript($html_options);
+ $default_tmp = _parse_attributes($default_value);
+ $default = array();
+ foreach ($default_tmp as $key => $value)
+ {
+ $default[] = urlencode($key).'='.urlencode($value);
+ }
+ $options = count($default) ? '?'.implode('&', $default) : '';
+
if (isset($html_options['encode']) && $html_options['encode'])
{
unset($html_options['encode']);
- $html_options['href'] = _encodeText('mailto:'.$email);
+ $html_options['href'] = _encodeText('mailto:'.$email.$options);
if (!$name)
{
$name = _encodeText($email);
@@ -309,7 +317,7 @@ function mail_to($email, $name = '', $options = array())
}
else
{
- $html_options['href'] = 'mailto:'.$email;
+ $html_options['href'] = 'mailto:'.$email.$options;
if (!$name)
{
$name = $email;
lib/helper/UrlHelper.php
@@ -117,6 +117,11 @@ class sfDateFormat
*/
public function getDate($time, $pattern = null)
{
+ if (is_null($time))
+ {
+ return null;
+ }
+
// if the type is not a php timestamp
$isString = (string) $time !== (string) (int) $time;
lib/i18n/sfDateFormat.class.php
@@ -162,7 +162,9 @@ class sfContext
public function retrieveObjects($class, $peerMethod)
{
- return $this->databaseManager->getDatabase(constant("$class::DATABASE_NAME"))->retrieveObjects($class, $peerMethod);
+ $retrievingClass = 'sf'.ucfirst(sfConfig::get('sf_orm', 'propel')).'DataRetriever';
+
+ return call_user_func(array($retrievingClass, 'retrieveObjects'), $class, $peerMethod);
}
/**
lib/util/sfContext.class.php
@@ -48,7 +48,7 @@ class sfYaml
{
$retval = syck_load($input);
- return (is_array($retval)) ? $retval : array();
+ return is_array($retval) ? $retval : array();
}
else
{
@@ -71,6 +71,8 @@ class sfYaml
*/
public static function dump($array)
{
+ require_once(dirname(__FILE__).'/Spyc.class.php');
+
$spyc = new Spyc();
return $spyc->dump($array);
lib/util/sfYaml.class.php
@@ -42,26 +42,26 @@
<file role="php" baseinstalldir="symfony" install-as="VERSION" name="lib/VERSION" />
- <file role="doc" baseinstalldir="symfony" install-as="LICENSE" name="doc/LICENSE" />
- <file role="doc" baseinstalldir="symfony" install-as="01-Introducing-Symfony.txt" name="doc/01-Introducing-Symfony.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="02-Exploring-Symfony-s-Code.txt" name="doc/02-Exploring-Symfony-s-Code.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="03-Running-Symfony.txt" name="doc/03-Running-Symfony.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="04-The-Basics-of-Page-Creation.txt" name="doc/04-The-Basics-of-Page-Creation.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="05-Configuring-Symfony.txt" name="doc/05-Configuring-Symfony.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="06-Inside-the-Controller-Layer.txt" name="doc/06-Inside-the-Controller-Layer.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="07-Inside-the-View-Layer.txt" name="doc/07-Inside-the-View-Layer.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="08-Inside-the-Model-Layer.txt" name="doc/08-Inside-the-Model-Layer.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="09-Links-and-the-Routing-System.txt" name="doc/09-Links-and-the-Routing-System.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="10-Forms.txt" name="doc/10-Forms.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="11-Ajax-Integration.txt" name="doc/11-Ajax-Integration.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="12-Caching.txt" name="doc/12-Caching.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="13-I18n-and-L10n.txt" name="doc/13-I18n-and-L10n.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="14-Generators.txt" name="doc/14-Generators.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="15-Unit-and-Functional-Testing.txt" name="doc/15-Unit-and-Functional-Testing.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="16-Application-Management-Tools.txt" name="doc/16-Application-Management-Tools.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="17-Extending-Symfony.txt" name="doc/17-Extending-Symfony.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="18-Performance.txt" name="doc/18-Performance.txt" />
- <file role="doc" baseinstalldir="symfony" install-as="19-Mastering-Symfony-s-Configuration-Files.txt" name="doc/19-Mastering-Symfony-s-Configuration-Files.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/LICENSE" name="doc/LICENSE" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/01-Introducing-Symfony.txt" name="doc/01-Introducing-Symfony.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/02-Exploring-Symfony-s-Code.txt" name="doc/02-Exploring-Symfony-s-Code.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/03-Running-Symfony.txt" name="doc/03-Running-Symfony.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/04-The-Basics-of-Page-Creation.txt" name="doc/04-The-Basics-of-Page-Creation.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/05-Configuring-Symfony.txt" name="doc/05-Configuring-Symfony.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/06-Inside-the-Controller-Layer.txt" name="doc/06-Inside-the-Controller-Layer.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/07-Inside-the-View-Layer.txt" name="doc/07-Inside-the-View-Layer.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/08-Inside-the-Model-Layer.txt" name="doc/08-Inside-the-Model-Layer.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/09-Links-and-the-Routing-System.txt" name="doc/09-Links-and-the-Routing-System.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/10-Forms.txt" name="doc/10-Forms.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/11-Ajax-Integration.txt" name="doc/11-Ajax-Integration.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/12-Caching.txt" name="doc/12-Caching.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/13-I18n-and-L10n.txt" name="doc/13-I18n-and-L10n.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/14-Generators.txt" name="doc/14-Generators.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/15-Unit-and-Functional-Testing.txt" name="doc/15-Unit-and-Functional-Testing.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/16-Application-Management-Tools.txt" name="doc/16-Application-Management-Tools.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/17-Extending-Symfony.txt" name="doc/17-Extending-Symfony.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/18-Performance.txt" name="doc/18-Performance.txt" />
+ <file role="doc" baseinstalldir="symfony" install-as="book/19-Mastering-Symfony-s-Configuration-Files.txt" name="doc/19-Mastering-Symfony-s-Configuration-Files.txt" />
<file role="doc" baseinstalldir="symfony" name="README" />
<file role="doc" baseinstalldir="symfony" name="COPYRIGHT" />
package.xml.tmpl
@@ -4,8 +4,6 @@
abstract class BaseArticle extends BaseObject implements Persistent {
-
- const DATABASE_NAME = 'propel';
protected static $peer;
test/functional/fixtures/project/lib/model/om/BaseArticle.php
@@ -4,8 +4,6 @@
abstract class BaseAuthor extends BaseObject implements Persistent {
-
- const DATABASE_NAME = 'propel';
protected static $peer;
test/functional/fixtures/project/lib/model/om/BaseAuthor.php
@@ -4,8 +4,6 @@
abstract class BaseAuthorArticle extends BaseObject implements Persistent {
-
- const DATABASE_NAME = 'propel';
protected static $peer;
test/functional/fixtures/project/lib/model/om/BaseAuthorArticle.php
@@ -4,8 +4,6 @@
abstract class BaseBook extends BaseObject implements Persistent {
-
- const DATABASE_NAME = 'propel';
protected static $peer;
test/functional/fixtures/project/lib/model/om/BaseBook.php
@@ -5,9 +5,6 @@ abstract class BaseCategory extends BaseObject implements Persistent {
- const DATABASE_NAME = 'propel';
-
-
protected static $peer;
test/functional/fixtures/project/lib/model/om/BaseCategory.php
@@ -11,7 +11,7 @@
require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
require_once($_test_dir.'/unit/sfContextMock.class.php');
-$t = new lime_test(16, new lime_output_color());
+$t = new lime_test(17, new lime_output_color());
sfConfig::set('sf_max_forwards', 10);
$context = new sfContext();
@@ -152,3 +152,11 @@ $controller->redirect('/module/action/id/1#photos');
$content = ob_get_clean();
$t->like($content, '~/module/action/id/1#photos~', '->redirect() adds a refresh meta in the content');
$t->like($context->getResponse()->getHttpHeader('Location'), '~/module/action/id/1#photos~', '->redirect() adds a Location HTTP header');
+
+// ->genUrl()
+$t->diag('->genUrl()');
+
+$r = sfRouting::getInstance();
+$r->clearRoutes();
+$r->connect('test1', '/:module/:action/:id', array('module' => 'default', 'action' => 'index'));
+$t->is($controller->genUrl('module/action?id=4'), $controller->genUrl(array('module' => 'module', 'action' => 'action', 'id' => 4)), '->genUrl() accepts a string or an array as its first argument');
test/unit/controller/sfWebControllerTest.php
@@ -11,23 +11,13 @@
require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
require_once($_test_dir.'/unit/sfContextMock.class.php');
-$t = new lime_test(19, new lime_output_color());
+$t = new lime_test(20, new lime_output_color());
class myFilter extends sfFilter
{
- public function isFirstCallBeforeExecution()
+ public function isFirstCall()
{
- return parent::isFirstCallBeforeExecution();
- }
-
- public function isFirstCallBeforeRendering()
- {
- return parent::isFirstCallBeforeRendering();
- }
-
- public function isFirstCall($type = 'beforeExecution')
- {
- return parent::isFirstCall($type);
+ return parent::isFirstCall();
}
}
@@ -52,6 +42,10 @@ $t->is($filter->isFirstCall('beforeExecution'), true, '->isFirstCall() returns t
$t->is($filter->isFirstCall('beforeExecution'), false, '->isFirstCall() returns false if this is not the first call with this argument');
$t->is($filter->isFirstCall('beforeExecution'), false, '->isFirstCall() returns false if this is not the first call with this argument');
+$filter = new myFilter();
+$filter->initialize($context);
+$t->is($filter->isFirstCall('beforeExecution'), false, '->isFirstCall() returns false if this is not the first call with this argument');
+
// parameter holder proxy
require_once($_test_dir.'/unit/sfParameterHolderTest.class.php');
$pht = new sfParameterHolderProxyTest($t);
test/unit/filter/sfFilterTest.php
@@ -93,7 +93,7 @@ class sfContext
}
}
-$t = new lime_test(83, new lime_output_color());
+$t = new lime_test(85, new lime_output_color());
$context = sfContext::getInstance();
$context->controller = new myController();
@@ -188,6 +188,8 @@ $t->is(input_password_tag('name', null, array('class' => 'foo')), '<input type="
$t->diag('textarea_tag()');
$t->is(textarea_tag('name'), '<textarea name="name" id="name"></textarea>', 'textarea_tag() takes a name as its first argument');
$t->is(textarea_tag('name', 'content'), '<textarea name="name" id="name">content</textarea>', 'textarea_tag() takes a value as its second argument');
+$t->is(textarea_tag('name', '<p>foo</p>'), '<textarea name="name" id="name"><p>foo</p></textarea>', 'textarea_tag() escapes the content');
+$t->is(textarea_tag('name', '<p>foo</p>'), '<textarea name="name" id="name"><p>foo</p></textarea>', 'textarea_tag() does not escape an already escaped content');
// options
$t->is(textarea_tag('name', null, array('class' => 'foo')), '<textarea name="name" id="name" class="foo"></textarea>', 'textarea_tag() takes an array of attribute options as its third argument');
@@ -196,7 +198,8 @@ $t->is(textarea_tag('name', null, array('size' => '5x20')), '<textarea name="nam
require_once(sfConfig::get('sf_symfony_lib_dir').'/helper/sfRichTextEditor.class.php');
require_once(sfConfig::get('sf_symfony_lib_dir').'/helper/sfRichTextEditorTinyMCE.class.php');
-sfConfig::set('sf_rich_text_js_dir', dirname(__FILE__).'/fixtures');
+sfConfig::set('sf_web_dir', dirname(__FILE__));
+sfConfig::set('sf_rich_text_js_dir', 'fixtures');
$t->like(textarea_tag('name', 'content', array('rich' => 'TinyMCE')), '/tinyMCE\.init/', 'textarea_tag() can create a rich textarea tag based on tinyMCE');
$t->like(textarea_tag('name', 'content', array('rich' => true)), '/tinyMCE\.init/', 'textarea_tag() can create a rich textarea tag based on tinyMCE');
test/unit/helper/FormHelperTest.php
@@ -12,7 +12,7 @@ require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
sfLoader::loadHelpers(array('Helper', 'Tag', 'Text'));
-$t = new lime_test(41, new lime_output_color());
+$t = new lime_test(42, new lime_output_color());
// truncate_text()
$t->diag('truncate_text()');
@@ -110,3 +110,4 @@ $t->is(auto_link_text('Go to '.$link2_raw, 'urls'), 'Go to '.$link2_result, 'aut
$t->is(auto_link_text('Go to '.$link2_raw, 'email_addresses'), 'Go to '.$link2_raw, 'auto_linking() converts URLs to links');
$t->is(auto_link_text('<p>Link '.$link2_raw.'</p>'), '<p>Link '.$link2_result.'</p>', 'auto_linking() converts URLs to links');
$t->is(auto_link_text('<p>'.$link2_raw.' Link</p>'), '<p>'.$link2_result.' Link</p>', 'auto_linking() converts URLs to links');
+$t->is(auto_link_text('<p>http://www.google.com/?q=symfony Link</p>'), '<p><a href="http://www.google.com/?q=symfony">http://www.google.com/?q=symfony</a> Link</p>', 'auto_linking() converts URLs to links');
test/unit/helper/TextHelperTest.php
@@ -42,7 +42,7 @@ class sfContext
}
}
-$t = new lime_test(18, new lime_output_color());
+$t = new lime_test(23, new lime_output_color());
$context = sfContext::getInstance();
$context->controller = new myController();
@@ -101,3 +101,11 @@ $t->is(mail_to('fabien.potencier@symfony-project.com'), '<a href="mailto:fabien.
$t->is(mail_to('fabien.potencier@symfony-project.com', 'fabien'), '<a href="mailto:fabien.potencier@symfony-project.com">fabien</a>', 'mail_to() creates a mailto a tag');
preg_match('/href="(.+?)"/', mail_to('fabien.potencier@symfony-project.com', 'fabien', array('encode' => true)), $matches);
$t->is(html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8'), 'mailto:fabien.potencier@symfony-project.com', 'mail_to() can encode the email address');
+
+$t->diag('mail_to test');
+$t->is(mail_to('webmaster@example.com'),'<a href="mailto:webmaster@example.com">webmaster@example.com</a>','mail_to with only given email works');
+$t->is(mail_to('webmaster@example.com', 'send us an email'),'<a href="mailto:webmaster@example.com">send us an email</a>','mail_to with given email and title works');
+
+$t->is(mail_to('webmaster@example.com', '', array(), array('subject' => 'test subject', 'body' => 'test body')),'<a href="mailto:webmaster@example.com?subject=test+subject&body=test+body">webmaster@example.com</a>', 'mail_to() works with given default values in array form');
+$t->is(mail_to('webmaster@example.com', '', array(), 'subject=test subject body=test body'),'<a href="mailto:webmaster@example.com?subject=test+subject&body=test+body">webmaster@example.com</a>', 'mail_to() works with given default values in string form');
+$t->is(mail_to('webmaster@example.com', '', array(), 'subject=Hello World and more'),'<a href="mailto:webmaster@example.com?subject=Hello+World+and+more">webmaster@example.com</a>', 'mail_to() works with given default value with spaces');
test/unit/helper/UrlHelperTest.php
0d5f41e3d0eebcdfec805e484eed4ef5a3251b9e
fabien
fabien@ee427ae8-e902-0410-961c-c3ed070cd9f9
http://github.com/WIZARDISHUNGRY/symfony/commit/f824b47a83d60e0813408306d5a5241c533562ef
f824b47a83d60e0813408306d5a5241c533562ef
2007-02-21T06:44:06-08:00
2007-02-21T06:44:06-08:00
merged 1.0 into trunk (3350:3513)
git-svn-id: http://svn.symfony-project.com/trunk@3525 ee427ae8-e902-0410-961c-c3ed070cd9f9
c537aeabd4ec7a578ce941294a09cc0d195b3ea5
fabien
fabien@ee427ae8-e902-0410-961c-c3ed070cd9f9