diff --git a/.editorconfig b/.editorconfig index 779f99a12..92af3f94c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,3 +10,7 @@ insert_final_newline = true [*.md] trim_trailing_whitespace = false + +[.github/**.yml] +indent_size = 2 +indent_style = space diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index b27f75493..08fc2566c 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,49 +1,60 @@ name: "Continuous Integration" on: - push: - branches: - - master - pull_request: + push: + branches: + - master + pull_request: env: - fail-fast: true + fail-fast: true jobs: - tests: - name: "Symfony1 Tests" - runs-on: "ubuntu-22.04" - - strategy: - matrix: - php-version: - - "7.4" - - "8.0" - - "8.1" - - "8.2" - memcached-version: - - "1.6" - - services: - memcached: - image: "memcached:${{ matrix.memcached-version }}" - - steps: - - name: "Checkout" - uses: "actions/checkout@v3" - with: - submodules: "true" - - - name: "Install PHP" - uses: "shivammathur/setup-php@v2" - with: - php-version: "${{ matrix.php-version }}" - - - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v2" - - - name: "Run Check configuration" - run: "php data/bin/check_configuration.php" - - - name: "Run Tests" - run: "php data/bin/symfony symfony:test --trace" + tests: + name: "Symfony1 Tests" + runs-on: "ubuntu-latest" + + strategy: + matrix: + php-version: + - "7.4" + - "8.0" + - "8.1" + - "8.2" + memcached-version: + - "1.6" + + services: + memcached: + image: "memcached:${{ matrix.memcached-version }}" + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + submodules: "true" + + - name: Install PHP + uses: shivammathur/setup-php@v2 + with: + php-version: "${{ matrix.php-version }}" + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer- + + - name: Install dependencies + run: composer install --prefer-dist + + - name: Run Check configuration + run: php data/bin/check_configuration.php + + - name: Run Tests + run: php data/bin/symfony symfony:test --trace diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3f797cef8..2c31663d6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,22 +10,22 @@ jobs: name: 'PHP-CS-Fixer' runs-on: 'ubuntu-latest' steps: - - uses: 'actions/checkout@v3' + - uses: actions/checkout@v3 - - name: 'Setup PHP' - uses: 'shivammathur/setup-php@v2' + - name: Setup PHP + uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: 8.2 tools: php-cs-fixer, cs2pr - - uses: 'actions/cache@v3' + - uses: actions/cache@v3 with: path: '.php-cs-fixer.cache' - key: '${{ github.repository }}-8.1-phpcsfixer-${{ github.ref_name }}' + key: ${{ github.repository }}-8.2-phpcsfixer-${{ github.ref_name }} restore-keys: | - ${{ github.repository }}-8.1-phpcsfixer-main - ${{ github.repository }}-8.1-phpcsfixer- + ${{ github.repository }}-8.2-phpcsfixer-master + ${{ github.repository }}-8.2-phpcsfixer- - - name: 'Run PHP-CS-Fixer' + - name: Run PHP-CS-Fixer # Using cs2pr settings, see: https://github.com/shivammathur/setup-php#tools-with-checkstyle-support run: 'php-cs-fixer fix --dry-run --format checkstyle | cs2pr' diff --git a/data/bin/check_configuration.php b/data/bin/check_configuration.php index 10b10adc8..cdb3276e5 100644 --- a/data/bin/check_configuration.php +++ b/data/bin/check_configuration.php @@ -7,11 +7,6 @@ function is_cli() /** * Checks a configuration. - * - * @param mixed $boolean - * @param mixed $message - * @param mixed $help - * @param mixed $fatal */ function check($boolean, $message, $help = '', $fatal = false) { @@ -84,8 +79,7 @@ function get_ini_path() $accelerator = (function_exists('apc_store') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') - || function_exists('xcache_set') -; + || function_exists('xcache_set'); check($accelerator, 'A PHP accelerator is installed', 'Install a PHP accelerator like APC (highly recommended)', false); check(!ini_get('short_open_tag'), 'php.ini has short_open_tag set to off', 'Set it to off in php.ini', false); diff --git a/lib/action/sfAction.class.php b/lib/action/sfAction.class.php index 5fdcc49c9..4753c3c6a 100644 --- a/lib/action/sfAction.class.php +++ b/lib/action/sfAction.class.php @@ -46,18 +46,14 @@ public function initialize($context, $moduleName, $actionName) * * By default, this method is empty. */ - public function preExecute() - { - } + public function preExecute() {} /** * Execute an application defined process immediately after execution of this sfAction object. * * By default, this method is empty. */ - public function postExecute() - { - } + public function postExecute() {} /** * Forwards current action to the default 404 error action. @@ -385,8 +381,6 @@ public function setSecurityConfiguration($security) * * @param string $name The name of the value to pull from security.yml * @param mixed $default The default value to return if none is found in security.yml - * - * @return mixed */ public function getSecurityValue($name, $default = null) { diff --git a/lib/action/sfComponents.class.php b/lib/action/sfComponents.class.php index 967d7cbff..ce96e70e5 100644 --- a/lib/action/sfComponents.class.php +++ b/lib/action/sfComponents.class.php @@ -20,8 +20,6 @@ abstract class sfComponents extends sfComponent /** * @param sfRequest $request * - * @return mixed - * * @throws sfInitializationException * * @see sfComponent diff --git a/lib/addon/sfPager.class.php b/lib/addon/sfPager.class.php index 9709060d7..1800e3fc3 100644 --- a/lib/addon/sfPager.class.php +++ b/lib/addon/sfPager.class.php @@ -155,8 +155,6 @@ public function setCursor($pos) * Returns an object by cursor position. * * @param int $pos - * - * @return mixed */ public function getObjectByCursor($pos) { @@ -167,8 +165,6 @@ public function getObjectByCursor($pos) /** * Returns the current object. - * - * @return mixed */ public function getCurrent() { @@ -396,10 +392,8 @@ public function getParameterHolder() /** * Returns a parameter. * - * @param string $name - * @param mixed $default - * - * @return mixed + * @param string $name + * @param mixed|null $default */ public function getParameter($name, $default = null) { @@ -422,7 +416,6 @@ public function hasParameter($name) * Sets a parameter. * * @param string $name - * @param mixed $value */ public function setParameter($name, $value) { @@ -525,8 +518,6 @@ public function count() * Used internally by {@link getCurrent()}. * * @param int $offset - * - * @return mixed */ abstract protected function retrieveObject($offset); diff --git a/lib/autoload/sfAutoload.class.php b/lib/autoload/sfAutoload.class.php index f3e238e27..8e3ddc439 100644 --- a/lib/autoload/sfAutoload.class.php +++ b/lib/autoload/sfAutoload.class.php @@ -26,9 +26,7 @@ class sfAutoload protected $overriden = array(); protected $classes = array(); - protected function __construct() - { - } + protected function __construct() {} /** * Retrieves the singleton instance of this class. diff --git a/lib/autoload/sfAutoloadAgain.class.php b/lib/autoload/sfAutoloadAgain.class.php index edf0c9461..d44d70ed3 100644 --- a/lib/autoload/sfAutoloadAgain.class.php +++ b/lib/autoload/sfAutoloadAgain.class.php @@ -25,9 +25,7 @@ class sfAutoloadAgain /** * Constructor. */ - protected function __construct() - { - } + protected function __construct() {} /** * Returns the singleton autoloader. diff --git a/lib/cache/sfAPCCache.class.php b/lib/cache/sfAPCCache.class.php index 41b65505c..721bea021 100644 --- a/lib/cache/sfAPCCache.class.php +++ b/lib/cache/sfAPCCache.class.php @@ -27,7 +27,6 @@ class sfAPCCache extends sfCache * * see sfCache for options available for all drivers * * @see sfCache - * {@inheritdoc} */ public function initialize($options = array()) { @@ -38,7 +37,8 @@ public function initialize($options = array()) /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $default */ public function get($key, $default = null) { @@ -53,7 +53,6 @@ public function get($key, $default = null) /** * @see sfCache - * {@inheritdoc} */ public function has($key) { @@ -68,7 +67,8 @@ public function has($key) /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $lifetime */ public function set($key, $data, $lifetime = null) { @@ -81,7 +81,6 @@ public function set($key, $data, $lifetime = null) /** * @see sfCache - * {@inheritdoc} */ public function remove($key) { @@ -94,7 +93,6 @@ public function remove($key) /** * @see sfCache - * {@inheritdoc} */ public function clean($mode = sfCache::ALL) { @@ -109,7 +107,6 @@ public function clean($mode = sfCache::ALL) /** * @see sfCache - * {@inheritdoc} */ public function getLastModified($key) { @@ -122,7 +119,6 @@ public function getLastModified($key) /** * @see sfCache - * {@inheritdoc} */ public function getTimeout($key) { @@ -135,7 +131,6 @@ public function getTimeout($key) /** * @see sfCache - * {@inheritdoc} */ public function removePattern($pattern) { diff --git a/lib/cache/sfCache.class.php b/lib/cache/sfCache.class.php index 4668af3b5..656e3fc71 100644 --- a/lib/cache/sfCache.class.php +++ b/lib/cache/sfCache.class.php @@ -201,8 +201,6 @@ public function getOption($name, $default = null) * * @param string $name The option name * @param mixed $value The option value - * - * @return mixed */ public function setOption($name, $value) { diff --git a/lib/cache/sfEAcceleratorCache.class.php b/lib/cache/sfEAcceleratorCache.class.php index 88342cdbc..c97092456 100644 --- a/lib/cache/sfEAcceleratorCache.class.php +++ b/lib/cache/sfEAcceleratorCache.class.php @@ -42,8 +42,8 @@ public function initialize($options = array()) /** * @see sfCache * - * @param string $key - * @param mixed $default + * @param string $key + * @param mixed|null $default * * @return string|null */ @@ -82,7 +82,6 @@ public function set($key, $data, $lifetime = null) /** * @see sfCache - * {@inheritdoc} */ public function remove($key) { @@ -91,7 +90,6 @@ public function remove($key) /** * @see sfCache - * {@inheritdoc} */ public function removePattern($pattern) { @@ -110,7 +108,6 @@ public function removePattern($pattern) /** * @see sfCache - * {@inheritdoc} */ public function clean($mode = sfCache::ALL) { @@ -136,7 +133,6 @@ public function clean($mode = sfCache::ALL) /** * @see sfCache - * {@inheritdoc} */ public function getLastModified($key) { @@ -149,7 +145,6 @@ public function getLastModified($key) /** * @see sfCache - * {@inheritdoc} */ public function getTimeout($key) { diff --git a/lib/cache/sfFileCache.class.php b/lib/cache/sfFileCache.class.php index 9be20aadc..11d2d3c84 100644 --- a/lib/cache/sfFileCache.class.php +++ b/lib/cache/sfFileCache.class.php @@ -33,7 +33,6 @@ class sfFileCache extends sfCache * * see sfCache for options available for all drivers * * @see sfCache - * {@inheritdoc} */ public function initialize($options = array()) { @@ -48,7 +47,8 @@ public function initialize($options = array()) /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $default */ public function get($key, $default = null) { @@ -68,7 +68,6 @@ public function get($key, $default = null) /** * @see sfCache - * {@inheritdoc} */ public function has($key) { @@ -79,7 +78,8 @@ public function has($key) /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $lifetime */ public function set($key, $data, $lifetime = null) { @@ -92,7 +92,6 @@ public function set($key, $data, $lifetime = null) /** * @see sfCache - * {@inheritdoc} */ public function remove($key) { @@ -101,7 +100,6 @@ public function remove($key) /** * @see sfCache - * {@inheritdoc} */ public function removePattern($pattern) { @@ -130,7 +128,6 @@ public function removePattern($pattern) /** * @see sfCache - * {@inheritdoc} */ public function clean($mode = sfCache::ALL) { @@ -150,7 +147,6 @@ public function clean($mode = sfCache::ALL) /** * @see sfCache - * {@inheritdoc} */ public function getTimeout($key) { @@ -167,7 +163,6 @@ public function getTimeout($key) /** * @see sfCache - * {@inheritdoc} */ public function getLastModified($key) { diff --git a/lib/cache/sfMemcacheCache.class.php b/lib/cache/sfMemcacheCache.class.php index be29229d9..7d69a6336 100644 --- a/lib/cache/sfMemcacheCache.class.php +++ b/lib/cache/sfMemcacheCache.class.php @@ -36,7 +36,6 @@ class sfMemcacheCache extends sfCache * * see sfCache for options available for all drivers * * @see sfCache - * {@inheritdoc} */ public function initialize($options = array()) { @@ -79,7 +78,8 @@ public function getBackend() /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $default */ public function get($key, $default = null) { @@ -90,7 +90,6 @@ public function get($key, $default = null) /** * @see sfCache - * {@inheritdoc} */ public function has($key) { @@ -104,7 +103,8 @@ public function has($key) /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $lifetime */ public function set($key, $data, $lifetime = null) { @@ -127,7 +127,6 @@ public function set($key, $data, $lifetime = null) /** * @see sfCache - * {@inheritdoc} */ public function remove($key) { @@ -142,7 +141,6 @@ public function remove($key) /** * @see sfCache - * {@inheritdoc} */ public function clean($mode = sfCache::ALL) { @@ -153,7 +151,6 @@ public function clean($mode = sfCache::ALL) /** * @see sfCache - * {@inheritdoc} */ public function getLastModified($key) { @@ -166,7 +163,6 @@ public function getLastModified($key) /** * @see sfCache - * {@inheritdoc} */ public function getTimeout($key) { @@ -179,7 +175,6 @@ public function getTimeout($key) /** * @see sfCache - * {@inheritdoc} * * @throws sfCacheException */ @@ -199,7 +194,6 @@ public function removePattern($pattern) /** * @see sfCache - * {@inheritdoc} */ public function getMany($keys) { diff --git a/lib/cache/sfNoCache.class.php b/lib/cache/sfNoCache.class.php index 8b08e5eba..10d62b188 100644 --- a/lib/cache/sfNoCache.class.php +++ b/lib/cache/sfNoCache.class.php @@ -19,7 +19,8 @@ class sfNoCache extends sfCache { /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $default */ public function get($key, $default = null) { @@ -28,7 +29,6 @@ public function get($key, $default = null) /** * @see sfCache - * {@inheritdoc} */ public function has($key) { @@ -37,7 +37,8 @@ public function has($key) /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $lifetime */ public function set($key, $data, $lifetime = null) { @@ -46,7 +47,6 @@ public function set($key, $data, $lifetime = null) /** * @see sfCache - * {@inheritdoc} */ public function remove($key) { @@ -55,7 +55,6 @@ public function remove($key) /** * @see sfCache - * {@inheritdoc} */ public function removePattern($pattern) { @@ -64,7 +63,6 @@ public function removePattern($pattern) /** * @see sfCache - * {@inheritdoc} */ public function clean($mode = self::ALL) { @@ -73,7 +71,6 @@ public function clean($mode = self::ALL) /** * @see sfCache - * {@inheritdoc} */ public function getLastModified($key) { @@ -82,7 +79,6 @@ public function getLastModified($key) /** * @see sfCache - * {@inheritdoc} */ public function getTimeout($key) { diff --git a/lib/cache/sfSQLiteCache.class.php b/lib/cache/sfSQLiteCache.class.php index fb81e4a4b..5200cb60d 100644 --- a/lib/cache/sfSQLiteCache.class.php +++ b/lib/cache/sfSQLiteCache.class.php @@ -31,7 +31,6 @@ class sfSQLiteCache extends sfCache * * see sfCache for options available for all drivers * * @see sfCache - * {@inheritdoc} */ public function initialize($options = array()) { @@ -62,7 +61,8 @@ public function getBackend() /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $default */ public function get($key, $default = null) { @@ -77,7 +77,6 @@ public function get($key, $default = null) /** * @see sfCache - * {@inheritdoc} */ public function has($key) { @@ -90,7 +89,8 @@ public function has($key) /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $lifetime */ public function set($key, $data, $lifetime = null) { @@ -107,7 +107,6 @@ public function set($key, $data, $lifetime = null) /** * @see sfCache - * {@inheritdoc} */ public function remove($key) { @@ -120,7 +119,6 @@ public function remove($key) /** * @see sfCache - * {@inheritdoc} */ public function removePattern($pattern) { @@ -133,7 +131,6 @@ public function removePattern($pattern) /** * @see sfCache - * {@inheritdoc} */ public function clean($mode = sfCache::ALL) { @@ -152,7 +149,6 @@ public function clean($mode = sfCache::ALL) /** * @see sfCache - * {@inheritdoc} */ public function getTimeout($key) { @@ -169,7 +165,6 @@ public function getTimeout($key) /** * @see sfCache - * {@inheritdoc} */ public function getLastModified($key) { @@ -199,7 +194,6 @@ public function removePatternRegexpCallback($regexp, $key) /** * @see sfCache - * {@inheritdoc} */ public function getMany($keys) { diff --git a/lib/cache/sfXCacheCache.class.php b/lib/cache/sfXCacheCache.class.php index 9e8427364..8c5c53e5e 100644 --- a/lib/cache/sfXCacheCache.class.php +++ b/lib/cache/sfXCacheCache.class.php @@ -25,7 +25,6 @@ class sfXCacheCache extends sfCache * * see sfCache for options available for all drivers * * @see sfCache - * {@inheritdoc} */ public function initialize($options = array()) { @@ -42,7 +41,8 @@ public function initialize($options = array()) /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $default */ public function get($key, $default = null) { @@ -57,7 +57,6 @@ public function get($key, $default = null) /** * @see sfCache - * {@inheritdoc} */ public function has($key) { @@ -66,7 +65,8 @@ public function has($key) /** * @see sfCache - * {@inheritdoc} + * + * @param mixed|null $lifetime */ public function set($key, $data, $lifetime = null) { @@ -83,7 +83,6 @@ public function set($key, $data, $lifetime = null) /** * @see sfCache - * {@inheritdoc} */ public function remove($key) { @@ -92,7 +91,6 @@ public function remove($key) /** * @see sfCache - * {@inheritdoc} */ public function clean($mode = sfCache::ALL) { @@ -113,7 +111,6 @@ public function clean($mode = sfCache::ALL) /** * @see sfCache - * {@inheritdoc} */ public function getLastModified($key) { @@ -128,7 +125,6 @@ public function getLastModified($key) /** * @see sfCache - * {@inheritdoc} */ public function getTimeout($key) { @@ -153,7 +149,6 @@ public function getBaseValue($key) /** * @see sfCache - * {@inheritdoc} */ public function removePattern($pattern) { diff --git a/lib/command/sfCommandApplication.class.php b/lib/command/sfCommandApplication.class.php index 7d05b0eec..c232f2ae5 100644 --- a/lib/command/sfCommandApplication.class.php +++ b/lib/command/sfCommandApplication.class.php @@ -53,7 +53,6 @@ abstract class sfCommandApplication /** @var sfFormatter */ protected $formatter; - /** @var mixed */ protected $commandOptions; /** diff --git a/lib/command/sfCommandArgumentsException.class.php b/lib/command/sfCommandArgumentsException.class.php index 0dff151aa..e489fa311 100644 --- a/lib/command/sfCommandArgumentsException.class.php +++ b/lib/command/sfCommandArgumentsException.class.php @@ -15,6 +15,4 @@ * * @version SVN: $Id$ */ -class sfCommandArgumentsException extends sfCommandException -{ -} +class sfCommandArgumentsException extends sfCommandException {} diff --git a/lib/command/sfCommandException.class.php b/lib/command/sfCommandException.class.php index 5b7627482..3a680ad9d 100644 --- a/lib/command/sfCommandException.class.php +++ b/lib/command/sfCommandException.class.php @@ -15,6 +15,4 @@ * * @version SVN: $Id$ */ -class sfCommandException extends sfException -{ -} +class sfCommandException extends sfException {} diff --git a/lib/command/sfFormatter.class.php b/lib/command/sfFormatter.class.php index c5b776ff0..a73feedc1 100644 --- a/lib/command/sfFormatter.class.php +++ b/lib/command/sfFormatter.class.php @@ -39,9 +39,7 @@ public function __construct($maxLineSize = null) * @param string $name The style name * @param array $options An array of options */ - public function setStyle($name, $options = array()) - { - } + public function setStyle($name, $options = array()) {} /** * Formats a text according to the given parameters. diff --git a/lib/config/sfApplicationConfiguration.class.php b/lib/config/sfApplicationConfiguration.class.php index f89b42735..298d34550 100644 --- a/lib/config/sfApplicationConfiguration.class.php +++ b/lib/config/sfApplicationConfiguration.class.php @@ -66,18 +66,14 @@ public function __construct($environment, $debug, $rootDir = null, sfEventDispat * * Override this method if you want to customize your application configuration. */ - public function configure() - { - } + public function configure() {} /** * Initialized the current configuration. * * Override this method if you want to customize your application initialization. */ - public function initialize() - { - } + public function initialize() {} public function activate() { @@ -244,8 +240,6 @@ public function setAppDir($appDir) /** * @see sfProjectConfiguration - * - * @param mixed $cacheDir */ public function setCacheDir($cacheDir) { diff --git a/lib/config/sfAutoloadConfigHandler.class.php b/lib/config/sfAutoloadConfigHandler.class.php index ece3fea65..09faea48e 100755 --- a/lib/config/sfAutoloadConfigHandler.class.php +++ b/lib/config/sfAutoloadConfigHandler.class.php @@ -85,7 +85,6 @@ public static function parseFile($path, $file, $prefix) /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/config/sfCacheConfigHandler.class.php b/lib/config/sfCacheConfigHandler.class.php index 4e64bf451..45b87138f 100644 --- a/lib/config/sfCacheConfigHandler.class.php +++ b/lib/config/sfCacheConfigHandler.class.php @@ -65,7 +65,6 @@ public function execute($configFiles) /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/config/sfCompileConfigHandler.class.php b/lib/config/sfCompileConfigHandler.class.php index 149156991..70f29f2be 100644 --- a/lib/config/sfCompileConfigHandler.class.php +++ b/lib/config/sfCompileConfigHandler.class.php @@ -78,7 +78,6 @@ public function execute($configFiles) /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/config/sfDatabaseConfigHandler.class.php b/lib/config/sfDatabaseConfigHandler.class.php index 027d861d4..8113693f7 100644 --- a/lib/config/sfDatabaseConfigHandler.class.php +++ b/lib/config/sfDatabaseConfigHandler.class.php @@ -72,7 +72,6 @@ public function evaluate($configFiles) /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/config/sfDefineEnvironmentConfigHandler.class.php b/lib/config/sfDefineEnvironmentConfigHandler.class.php index 9fe7c7e19..979817859 100644 --- a/lib/config/sfDefineEnvironmentConfigHandler.class.php +++ b/lib/config/sfDefineEnvironmentConfigHandler.class.php @@ -65,7 +65,6 @@ public function execute($configFiles) /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/config/sfFactoryConfigHandler.class.php b/lib/config/sfFactoryConfigHandler.class.php index 8e0ddc3c6..eb61473ca 100644 --- a/lib/config/sfFactoryConfigHandler.class.php +++ b/lib/config/sfFactoryConfigHandler.class.php @@ -260,7 +260,6 @@ public function execute($configFiles) /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/config/sfFilterConfigHandler.class.php b/lib/config/sfFilterConfigHandler.class.php index 2eccac23b..076c2af9e 100644 --- a/lib/config/sfFilterConfigHandler.class.php +++ b/lib/config/sfFilterConfigHandler.class.php @@ -117,7 +117,6 @@ public function execute($configFiles) /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/config/sfGeneratorConfigHandler.class.php b/lib/config/sfGeneratorConfigHandler.class.php index e79827ff9..adcf8700c 100644 --- a/lib/config/sfGeneratorConfigHandler.class.php +++ b/lib/config/sfGeneratorConfigHandler.class.php @@ -78,7 +78,6 @@ public static function getContent(sfGeneratorManager $generatorManager, $class, /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/config/sfPluginConfiguration.class.php b/lib/config/sfPluginConfiguration.class.php index babc1c5f1..e5caac9b6 100644 --- a/lib/config/sfPluginConfiguration.class.php +++ b/lib/config/sfPluginConfiguration.class.php @@ -50,18 +50,14 @@ public function __construct(sfProjectConfiguration $configuration, $rootDir = nu * * This method can be used when creating a base plugin configuration class for other plugins to extend. */ - public function setup() - { - } + public function setup() {} /** * Configures the plugin. * * This method is called before the plugin's classes have been added to sfAutoload. */ - public function configure() - { - } + public function configure() {} /** * Initializes the plugin. @@ -70,9 +66,7 @@ public function configure() * * @return bool|null If false sfApplicationConfiguration will look for a config.php (maintains BC with symfony < 1.2) */ - public function initialize() - { - } + public function initialize() {} /** * Returns the plugin root directory. diff --git a/lib/config/sfProjectConfiguration.class.php b/lib/config/sfProjectConfiguration.class.php index 0f8c12fed..a733381ad 100644 --- a/lib/config/sfProjectConfiguration.class.php +++ b/lib/config/sfProjectConfiguration.class.php @@ -100,9 +100,7 @@ public function __call($method, $arguments) * * Override this method if you want to customize your project configuration. */ - public function setup() - { - } + public function setup() {} /** * Loads the project's plugin configurations. @@ -133,9 +131,7 @@ public function loadPlugins() * * Override this method if you want to customize plugin configurations. */ - public function setupPlugins() - { - } + public function setupPlugins() {} /** * Sets the project root directory. diff --git a/lib/config/sfSecurityConfigHandler.class.php b/lib/config/sfSecurityConfigHandler.class.php index 6c4dccb01..092f8e267 100644 --- a/lib/config/sfSecurityConfigHandler.class.php +++ b/lib/config/sfSecurityConfigHandler.class.php @@ -47,7 +47,6 @@ public function execute($configFiles) /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/config/sfServiceConfigHandler.class.php b/lib/config/sfServiceConfigHandler.class.php index 55e3935bb..2bc86f8d0 100644 --- a/lib/config/sfServiceConfigHandler.class.php +++ b/lib/config/sfServiceConfigHandler.class.php @@ -59,7 +59,6 @@ public function execute($configFiles) /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/config/sfSimpleYamlConfigHandler.class.php b/lib/config/sfSimpleYamlConfigHandler.class.php index 56e8d336e..827f77e24 100644 --- a/lib/config/sfSimpleYamlConfigHandler.class.php +++ b/lib/config/sfSimpleYamlConfigHandler.class.php @@ -39,7 +39,6 @@ public function execute($configFiles) /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/config/sfViewConfigHandler.class.php b/lib/config/sfViewConfigHandler.class.php index af565b723..c34d6d539 100644 --- a/lib/config/sfViewConfigHandler.class.php +++ b/lib/config/sfViewConfigHandler.class.php @@ -105,7 +105,6 @@ public function execute($configFiles) /** * @see sfConfigHandler - * {@inheritdoc} */ public static function getConfiguration(array $configFiles) { diff --git a/lib/controller/default/actions/actions.class.php b/lib/controller/default/actions/actions.class.php index 5dfa30554..65a7626b7 100644 --- a/lib/controller/default/actions/actions.class.php +++ b/lib/controller/default/actions/actions.class.php @@ -20,42 +20,30 @@ class defaultActions extends sfActions /** * Congratulations page for creating an application. */ - public function executeIndex() - { - } + public function executeIndex() {} /** * Congratulations page for creating a module. */ - public function executeModule() - { - } + public function executeModule() {} /** * Error page for page not found (404) error. */ - public function executeError404() - { - } + public function executeError404() {} /** * Warning page for restricted area - requires login. */ - public function executeSecure() - { - } + public function executeSecure() {} /** * Warning page for restricted area - requires credentials. */ - public function executeLogin() - { - } + public function executeLogin() {} /** * Module disabled in settings.yml. */ - public function executeDisabled() - { - } + public function executeDisabled() {} } diff --git a/lib/database/sfPDODatabase.class.php b/lib/database/sfPDODatabase.class.php index b648a6ee2..591f09119 100644 --- a/lib/database/sfPDODatabase.class.php +++ b/lib/database/sfPDODatabase.class.php @@ -26,8 +26,6 @@ class sfPDODatabase extends sfDatabase * * @param string $method * @param array $arguments - * - * @return mixed */ public function __call($method, $arguments) { diff --git a/lib/debug/sfWebDebug.class.php b/lib/debug/sfWebDebug.class.php index 5f6a71508..c7dd17415 100644 --- a/lib/debug/sfWebDebug.class.php +++ b/lib/debug/sfWebDebug.class.php @@ -129,8 +129,8 @@ public function removePanel($name) /** * Gets an option value by name. * - * @param string $name The option name - * @param mixed $default + * @param string $name The option name + * @param mixed|null $default * * @return mixed The option value */ diff --git a/lib/debug/sfWebDebugPanel.class.php b/lib/debug/sfWebDebugPanel.class.php index 61a8495e0..a6b3dc3b8 100644 --- a/lib/debug/sfWebDebugPanel.class.php +++ b/lib/debug/sfWebDebugPanel.class.php @@ -35,9 +35,7 @@ public function __construct(sfWebDebug $webDebug) * * @return string The URL link */ - public function getTitleUrl() - { - } + public function getTitleUrl() {} /** * Gets the text for the link. diff --git a/lib/debug/sfWebDebugPanelCache.class.php b/lib/debug/sfWebDebugPanelCache.class.php index ba8fb9805..ca98cee95 100644 --- a/lib/debug/sfWebDebugPanelCache.class.php +++ b/lib/debug/sfWebDebugPanelCache.class.php @@ -39,7 +39,5 @@ public function getPanelTitle() return 'reload and ignore cache'; } - public function getPanelContent() - { - } + public function getPanelContent() {} } diff --git a/lib/debug/sfWebDebugPanelMemory.class.php b/lib/debug/sfWebDebugPanelMemory.class.php index dc1ffe2b9..c24d2f209 100644 --- a/lib/debug/sfWebDebugPanelMemory.class.php +++ b/lib/debug/sfWebDebugPanelMemory.class.php @@ -24,11 +24,7 @@ public function getTitle() return 'Memory '.$totalMemory.' KB'; } - public function getPanelTitle() - { - } + public function getPanelTitle() {} - public function getPanelContent() - { - } + public function getPanelContent() {} } diff --git a/lib/debug/sfWebDebugPanelSymfonyVersion.class.php b/lib/debug/sfWebDebugPanelSymfonyVersion.class.php index e97bbd8ee..38fe66566 100644 --- a/lib/debug/sfWebDebugPanelSymfonyVersion.class.php +++ b/lib/debug/sfWebDebugPanelSymfonyVersion.class.php @@ -22,11 +22,7 @@ public function getTitle() return ''.SYMFONY_VERSION.''; } - public function getPanelTitle() - { - } + public function getPanelTitle() {} - public function getPanelContent() - { - } + public function getPanelContent() {} } diff --git a/lib/debug/sfWebDebugPanelView.class.php b/lib/debug/sfWebDebugPanelView.class.php index 3ff51c3a6..7072ea25a 100644 --- a/lib/debug/sfWebDebugPanelView.class.php +++ b/lib/debug/sfWebDebugPanelView.class.php @@ -158,7 +158,6 @@ protected function renderTemplateInformation($file, $parameters, $label = 'Templ * Formats information about a parameter as HTML. * * @param string $name - * @param mixed $parameter * * @return string */ @@ -254,7 +253,6 @@ protected function formatFormFieldSchemaAsHtml(sfFormFieldSchema $fieldSchema, $ * Formats information about a parameter as HTML. * * @param string $name - * @param mixed $parameter * @param mixed|null $nameFormat * @param mixed|null $typeFormat * diff --git a/lib/escaper/sfOutputEscaper.class.php b/lib/escaper/sfOutputEscaper.class.php index 4ff181c4a..58711724c 100644 --- a/lib/escaper/sfOutputEscaper.class.php +++ b/lib/escaper/sfOutputEscaper.class.php @@ -19,8 +19,6 @@ abstract class sfOutputEscaper { /** * The value that is to be escaped. - * - * @var mixed */ protected $value; diff --git a/lib/escaper/sfOutputEscaperArrayDecorator.class.php b/lib/escaper/sfOutputEscaperArrayDecorator.class.php index d4d483b98..59f58c489 100644 --- a/lib/escaper/sfOutputEscaperArrayDecorator.class.php +++ b/lib/escaper/sfOutputEscaperArrayDecorator.class.php @@ -30,7 +30,6 @@ class sfOutputEscaperArrayDecorator extends sfOutputEscaperGetterDecorator imple * Constructor. * * @see sfOutputEscaper - * {@inheritdoc} */ public function __construct($escapingMethod, $value) { diff --git a/lib/escaper/sfOutputEscaperObjectDecorator.class.php b/lib/escaper/sfOutputEscaperObjectDecorator.class.php index c063a4dbc..5183dd31a 100644 --- a/lib/escaper/sfOutputEscaperObjectDecorator.class.php +++ b/lib/escaper/sfOutputEscaperObjectDecorator.class.php @@ -73,8 +73,6 @@ public function __toString() /** * Asks the wrapped object whether a property is set. * - * @param mixed $key - * * @return bool */ public function __isset($key) diff --git a/lib/exception/sfCacheException.class.php b/lib/exception/sfCacheException.class.php index 3080e585d..bc3d9f281 100644 --- a/lib/exception/sfCacheException.class.php +++ b/lib/exception/sfCacheException.class.php @@ -17,6 +17,4 @@ * * @version SVN: $Id$ */ -class sfCacheException extends sfException -{ -} +class sfCacheException extends sfException {} diff --git a/lib/exception/sfConfigurationException.class.php b/lib/exception/sfConfigurationException.class.php index d8dc79ef8..39e48d3c6 100644 --- a/lib/exception/sfConfigurationException.class.php +++ b/lib/exception/sfConfigurationException.class.php @@ -18,6 +18,4 @@ * * @version SVN: $Id$ */ -class sfConfigurationException extends sfException -{ -} +class sfConfigurationException extends sfException {} diff --git a/lib/exception/sfControllerException.class.php b/lib/exception/sfControllerException.class.php index 2c1d92e65..de8bd9c6d 100644 --- a/lib/exception/sfControllerException.class.php +++ b/lib/exception/sfControllerException.class.php @@ -18,6 +18,4 @@ * * @version SVN: $Id$ */ -class sfControllerException extends sfException -{ -} +class sfControllerException extends sfException {} diff --git a/lib/exception/sfDatabaseException.class.php b/lib/exception/sfDatabaseException.class.php index c428803b9..1310bad20 100644 --- a/lib/exception/sfDatabaseException.class.php +++ b/lib/exception/sfDatabaseException.class.php @@ -17,6 +17,4 @@ * * @version SVN: $Id$ */ -class sfDatabaseException extends sfException -{ -} +class sfDatabaseException extends sfException {} diff --git a/lib/exception/sfFactoryException.class.php b/lib/exception/sfFactoryException.class.php index 09ace8583..affd12ab2 100644 --- a/lib/exception/sfFactoryException.class.php +++ b/lib/exception/sfFactoryException.class.php @@ -18,6 +18,4 @@ * * @version SVN: $Id$ */ -class sfFactoryException extends sfException -{ -} +class sfFactoryException extends sfException {} diff --git a/lib/exception/sfFileException.class.php b/lib/exception/sfFileException.class.php index 6d208aa90..fcae38c5a 100644 --- a/lib/exception/sfFileException.class.php +++ b/lib/exception/sfFileException.class.php @@ -17,6 +17,4 @@ * * @version SVN: $Id$ */ -class sfFileException extends sfException -{ -} +class sfFileException extends sfException {} diff --git a/lib/exception/sfFilterException.class.php b/lib/exception/sfFilterException.class.php index 57205203f..9b7b70047 100644 --- a/lib/exception/sfFilterException.class.php +++ b/lib/exception/sfFilterException.class.php @@ -18,6 +18,4 @@ * * @version SVN: $Id$ */ -class sfFilterException extends sfException -{ -} +class sfFilterException extends sfException {} diff --git a/lib/exception/sfForwardException.class.php b/lib/exception/sfForwardException.class.php index 55daadb99..085ab5021 100644 --- a/lib/exception/sfForwardException.class.php +++ b/lib/exception/sfForwardException.class.php @@ -18,6 +18,4 @@ * * @version SVN: $Id$ */ -class sfForwardException extends sfException -{ -} +class sfForwardException extends sfException {} diff --git a/lib/exception/sfInitializationException.class.php b/lib/exception/sfInitializationException.class.php index 72ffedc22..2eb54db5d 100644 --- a/lib/exception/sfInitializationException.class.php +++ b/lib/exception/sfInitializationException.class.php @@ -17,6 +17,4 @@ * * @version SVN: $Id$ */ -class sfInitializationException extends sfException -{ -} +class sfInitializationException extends sfException {} diff --git a/lib/exception/sfParseException.class.php b/lib/exception/sfParseException.class.php index 2ac7cccd6..7e286e729 100644 --- a/lib/exception/sfParseException.class.php +++ b/lib/exception/sfParseException.class.php @@ -18,6 +18,4 @@ * * @version SVN: $Id$ */ -class sfParseException extends sfException -{ -} +class sfParseException extends sfException {} diff --git a/lib/exception/sfRenderException.class.php b/lib/exception/sfRenderException.class.php index d37d578a3..fd0ab73f2 100644 --- a/lib/exception/sfRenderException.class.php +++ b/lib/exception/sfRenderException.class.php @@ -17,6 +17,4 @@ * * @version SVN: $Id$ */ -class sfRenderException extends sfException -{ -} +class sfRenderException extends sfException {} diff --git a/lib/exception/sfSecurityException.class.php b/lib/exception/sfSecurityException.class.php index 65de552a5..a12a587c3 100644 --- a/lib/exception/sfSecurityException.class.php +++ b/lib/exception/sfSecurityException.class.php @@ -17,6 +17,4 @@ * * @version SVN: $Id$ */ -class sfSecurityException extends sfException -{ -} +class sfSecurityException extends sfException {} diff --git a/lib/exception/sfStopException.class.php b/lib/exception/sfStopException.class.php index 2a93e279f..ebf92f655 100644 --- a/lib/exception/sfStopException.class.php +++ b/lib/exception/sfStopException.class.php @@ -20,7 +20,5 @@ class sfStopException extends sfException /** * Stops the current action. */ - public function printStackTrace() - { - } + public function printStackTrace() {} } diff --git a/lib/exception/sfStorageException.class.php b/lib/exception/sfStorageException.class.php index 7bf258518..4b7ba1653 100644 --- a/lib/exception/sfStorageException.class.php +++ b/lib/exception/sfStorageException.class.php @@ -18,6 +18,4 @@ * * @version SVN: $Id$ */ -class sfStorageException extends sfException -{ -} +class sfStorageException extends sfException {} diff --git a/lib/exception/sfViewException.class.php b/lib/exception/sfViewException.class.php index 4715fd95d..a576bd7d0 100644 --- a/lib/exception/sfViewException.class.php +++ b/lib/exception/sfViewException.class.php @@ -17,6 +17,4 @@ * * @version SVN: $Id$ */ -class sfViewException extends sfException -{ -} +class sfViewException extends sfException {} diff --git a/lib/filter/sfBasicSecurityFilter.class.php b/lib/filter/sfBasicSecurityFilter.class.php index 98de43078..edffbcda1 100644 --- a/lib/filter/sfBasicSecurityFilter.class.php +++ b/lib/filter/sfBasicSecurityFilter.class.php @@ -39,8 +39,8 @@ public function execute($filterChain) } // NOTE: the nice thing about the Action class is that getCredential() - // is vague enough to describe any level of security and can be - // used to retrieve such data and should never have to be altered + // is vague enough to describe any level of security and can be + // used to retrieve such data and should never have to be altered if (!$this->context->getUser()->isAuthenticated()) { if (sfConfig::get('sf_logging_enabled')) { $this->context->getEventDispatcher()->notify(new sfEvent($this, 'application.log', array(sprintf('Action "%s/%s" requires authentication, forwarding to "%s/%s"', $this->context->getModuleName(), $this->context->getActionName(), sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'))))); diff --git a/lib/form/addon/sfFormFilter.class.php b/lib/form/addon/sfFormFilter.class.php index 24be7b5bf..376994537 100644 --- a/lib/form/addon/sfFormFilter.class.php +++ b/lib/form/addon/sfFormFilter.class.php @@ -17,6 +17,4 @@ * * @version SVN: $Id$ */ -class sfFormFilter extends BaseForm -{ -} +class sfFormFilter extends BaseForm {} diff --git a/lib/form/addon/sfFormSymfony.class.php b/lib/form/addon/sfFormSymfony.class.php index 31efc2e54..b352fa672 100644 --- a/lib/form/addon/sfFormSymfony.class.php +++ b/lib/form/addon/sfFormSymfony.class.php @@ -26,7 +26,8 @@ class sfFormSymfony extends sfForm * Notifies the 'form.post_configure' event. * * @see sfForm - * {@inheritdoc} + * + * @param mixed|null $CSRFSecret */ public function __construct($defaults = array(), $options = array(), $CSRFSecret = null) { @@ -61,8 +62,6 @@ public function __call($method, $arguments) /** * Sets the event dispatcher to be used by all forms. - * - * @param sfEventDispatcher $dispatcher */ public static function setEventDispatcher(sfEventDispatcher $dispatcher = null) { @@ -83,7 +82,6 @@ public static function getEventDispatcher() * Notifies the 'form.filter_values' and 'form.validation_error' events. * * @see sfForm - * {@inheritdoc} */ protected function doBind(array $values) { diff --git a/lib/form/sfForm.class.php b/lib/form/sfForm.class.php index 89b21de26..4852027bf 100644 --- a/lib/form/sfForm.class.php +++ b/lib/form/sfForm.class.php @@ -120,16 +120,12 @@ public function __clone() * * @see configure() */ - public function setup() - { - } + public function setup() {} /** * Configures the current form. */ - public function configure() - { - } + public function configure() {} /** * Renders the widget schema associated with this form. @@ -255,9 +251,6 @@ public function bind(array $taintedValues = null, array $taintedFiles = null) /** * Bind embedded forms (recursivly). - * - * @param array $taintedValues - * @param array $taintedFiles */ public function bindEmbeddedForms(array $taintedValues = null, array $taintedFiles = null) { @@ -765,8 +758,6 @@ public function setOption($name, $value) * * @param string $name The option name * @param mixed $default The default value (null by default) - * - * @return mixed */ public function getOption($name, $default = null) { diff --git a/lib/generator/sfModelGeneratorConfiguration.class.php b/lib/generator/sfModelGeneratorConfiguration.class.php index b9bc723e8..af957893a 100644 --- a/lib/generator/sfModelGeneratorConfiguration.class.php +++ b/lib/generator/sfModelGeneratorConfiguration.class.php @@ -296,8 +296,8 @@ public function getPager($model) /** * Gets a new form object. * - * @param mixed $object - * @param array $options An array of options to merge with the options returned by getFormOptions() + * @param array $options An array of options to merge with the options returned by getFormOptions() + * @param mixed|null $object * * @return sfForm */ diff --git a/lib/helper/AssetHelper.php b/lib/helper/AssetHelper.php index 57fe9b612..d4effc844 100644 --- a/lib/helper/AssetHelper.php +++ b/lib/helper/AssetHelper.php @@ -16,10 +16,6 @@ * @author David Heinemeier Hansson * * @version SVN: $Id$ - * - * @param mixed $type - * @param mixed $url - * @param mixed $tag_options */ /** @@ -236,10 +232,6 @@ function stylesheet_tag() * Adds a stylesheet to the response object. * * @see sfResponse->addStylesheet() - * - * @param mixed $css - * @param mixed $position - * @param mixed $options */ function use_stylesheet($css, $position = '', $options = array()) { @@ -250,10 +242,6 @@ function use_stylesheet($css, $position = '', $options = array()) * Adds a javascript to the response object. * * @see sfResponse->addJavascript() - * - * @param mixed $js - * @param mixed $position - * @param mixed $options */ function use_javascript($js, $position = '', $options = array()) { @@ -577,10 +565,6 @@ function dynamic_javascript_include_tag($uri, $absolute = false, $options = arra * The helper automatically adds the sf_format to the internal URI, so you don't have to. * * @see sfResponse->addJavascript() - * - * @param mixed $js - * @param mixed $position - * @param mixed $options */ function use_dynamic_javascript($js, $position = '', $options = array()) { @@ -596,10 +580,6 @@ function use_dynamic_javascript($js, $position = '', $options = array()) * The helper automatically adds the sf_format to the internal URI, so you don't have to. * * @see sfResponse->addStylesheet() - * - * @param mixed $css - * @param mixed $position - * @param mixed $options */ function use_dynamic_stylesheet($css, $position = '', $options = array()) { diff --git a/lib/helper/CacheHelper.php b/lib/helper/CacheHelper.php index 08a6ba5a3..0f75e3bf1 100644 --- a/lib/helper/CacheHelper.php +++ b/lib/helper/CacheHelper.php @@ -14,9 +14,6 @@ * @author Fabien Potencier * * @version SVN: $Id$ - * - * @param mixed $name - * @param mixed $lifeTime */ /* Usage diff --git a/lib/helper/DateHelper.php b/lib/helper/DateHelper.php index 75ec5cb53..c8e6e0973 100644 --- a/lib/helper/DateHelper.php +++ b/lib/helper/DateHelper.php @@ -15,12 +15,6 @@ * * @version SVN: $Id$ * - * @param mixed $start_date - * @param mixed $end_date - * @param mixed $format - * @param mixed $full_text - * @param mixed $start_text - * @param mixed $end_text * @param mixed|null $culture * @param mixed|null $charset */ diff --git a/lib/helper/EscapingHelper.php b/lib/helper/EscapingHelper.php index bb57f79d8..b72f27ad0 100644 --- a/lib/helper/EscapingHelper.php +++ b/lib/helper/EscapingHelper.php @@ -28,8 +28,6 @@ * @author Mike Squire * * @version SVN: $Id$ - * - * @param mixed $value */ /** diff --git a/lib/helper/I18NHelper.php b/lib/helper/I18NHelper.php index e3768f7b7..5f981b5d9 100644 --- a/lib/helper/I18NHelper.php +++ b/lib/helper/I18NHelper.php @@ -14,10 +14,6 @@ * @author Fabien Potencier * * @version SVN: $Id$ - * - * @param mixed $text - * @param mixed $args - * @param mixed $catalogue */ function __($text, $args = array(), $catalogue = 'messages') { diff --git a/lib/helper/JavascriptBaseHelper.php b/lib/helper/JavascriptBaseHelper.php index 003fd877f..233b3a564 100644 --- a/lib/helper/JavascriptBaseHelper.php +++ b/lib/helper/JavascriptBaseHelper.php @@ -18,10 +18,6 @@ * @author Fabian Lange * * @version SVN: $Id$ - * - * @param mixed $name - * @param mixed $function - * @param mixed $html_options */ // Provides a set basic of helpers for calling JavaScript functions. @@ -55,10 +51,6 @@ function link_to_function($name, $function, $html_options = array()) * * Examples: * - * - * @param mixed $name - * @param mixed $function - * @param mixed $html_options */ function button_to_function($name, $function, $html_options = array()) { @@ -128,7 +120,6 @@ function end_if_javascript() * javascript strings need to be single quoted. * * @param option (typically from option array) - * @param mixed $option * * @return string javascript string or array equivalent */ @@ -148,7 +139,6 @@ function array_or_string_for_javascript($option) * converts the the PHP options array into a javscript array. * * @param array - * @param mixed $options * * @return string javascript arry equivalent */ @@ -171,7 +161,6 @@ function options_for_javascript($options) * booleans need to be true or false (php would print 1 or nothing). * * @param bool (typically from option array) - * @param mixed $bool * * @return string javascript boolean equivalent */ diff --git a/lib/helper/NumberHelper.php b/lib/helper/NumberHelper.php index 8d49784c0..6ae599b28 100644 --- a/lib/helper/NumberHelper.php +++ b/lib/helper/NumberHelper.php @@ -15,7 +15,6 @@ * * @version SVN: $Id$ * - * @param mixed $number * @param mixed|null $culture */ function format_number($number, $culture = null) diff --git a/lib/helper/PartialHelper.php b/lib/helper/PartialHelper.php index e3d687eda..feeb897dd 100644 --- a/lib/helper/PartialHelper.php +++ b/lib/helper/PartialHelper.php @@ -14,9 +14,6 @@ * @author Fabien Potencier * * @version SVN: $Id$ - * - * @param mixed $name - * @param mixed $vars */ /** @@ -74,7 +71,6 @@ function get_component_slot($name, $vars = array()) * Returns true if component slot exists. * * @param string slot name - * @param mixed $name * * @return bool true if component slot exists, false otherwise */ diff --git a/lib/helper/TagHelper.php b/lib/helper/TagHelper.php index 0e0769ac6..35b7578a7 100644 --- a/lib/helper/TagHelper.php +++ b/lib/helper/TagHelper.php @@ -16,10 +16,6 @@ * @author David Heinemeier Hansson * * @version SVN: $Id$ - * - * @param mixed $name - * @param mixed $options - * @param mixed $open */ /** @@ -71,8 +67,6 @@ function comment_as_conditional($condition, $content) /** * Escape carrier returns and single and double quotes for Javascript segments. - * - * @param mixed $javascript */ function escape_javascript($javascript = '') { diff --git a/lib/helper/TextHelper.php b/lib/helper/TextHelper.php index 6ea35986e..b518fcf0c 100644 --- a/lib/helper/TextHelper.php +++ b/lib/helper/TextHelper.php @@ -17,10 +17,6 @@ * * @version SVN: $Id$ * - * @param mixed $text - * @param mixed $length - * @param mixed $truncate_string - * @param mixed $truncate_lastspace * @param mixed|null $truncate_pattern * @param mixed|null $length_max */ @@ -126,12 +122,6 @@ function highlight_text($text, $phrase, $highlighter = ' "... my ...". - * - * @param mixed $text - * @param mixed $phrase - * @param mixed $radius - * @param mixed $excerpt_string - * @param mixed $excerpt_space */ function excerpt_text($text, $phrase, $radius = 100, $excerpt_string = '...', $excerpt_space = false) { @@ -180,9 +170,6 @@ function excerpt_text($text, $phrase, $radius = 100, $excerpt_string = '...', $e /** * Word wrap long lines to line_width. - * - * @param mixed $text - * @param mixed $line_width */ function wrap_text($text, $line_width = 80) { @@ -194,9 +181,6 @@ function wrap_text($text, $line_width = 80) * Surrounds paragraphs with <p> tags, and converts line breaks into <br /> * Two consecutive newlines(\n\n) are considered as a paragraph, one newline (\n) is * considered a linebreak, three or more consecutive newlines are turned into two newlines. - * - * @param mixed $text - * @param mixed $options */ function simple_format_text($text, $options = array()) { @@ -219,13 +203,6 @@ function simple_format_text($text, $options = array()) * auto_link("Go to http://www.symfony-project.com and say hello to fabien.potencier@example.com") => * Go to http://www.symfony-project.com and * say hello to fabien.potencier@example.com - * - * @param mixed $text - * @param mixed $link - * @param mixed $href_options - * @param mixed $truncate - * @param mixed $truncate_len - * @param mixed $pad */ function auto_link_text($text, $link = 'all', $href_options = array(), $truncate = false, $truncate_len = 35, $pad = '...') { @@ -242,8 +219,6 @@ function auto_link_text($text, $link = 'all', $href_options = array(), $truncate /** * Turns all links into words, like "else" to "else". - * - * @param mixed $text */ function strip_links_text($text) { @@ -275,12 +250,6 @@ function strip_links_text($text) /** * Turns all urls into clickable links. - * - * @param mixed $text - * @param mixed $href_options - * @param mixed $truncate - * @param mixed $truncate_len - * @param mixed $pad */ function _auto_link_urls($text, $href_options = array(), $truncate = false, $truncate_len = 40, $pad = '...') { @@ -310,8 +279,6 @@ function _auto_link_urls($text, $href_options = array(), $truncate = false, $tru /** * Turns all email addresses into clickable links. - * - * @param mixed $text */ function _auto_link_email_addresses($text) { diff --git a/lib/helper/UrlHelper.php b/lib/helper/UrlHelper.php index c30195b29..7f30dc77d 100644 --- a/lib/helper/UrlHelper.php +++ b/lib/helper/UrlHelper.php @@ -14,11 +14,6 @@ * @author Fabien Potencier * * @version SVN: $Id$ - * - * @param mixed $name - * @param mixed $routeName - * @param mixed $params - * @param mixed $options */ /** @@ -33,10 +28,6 @@ function link_to2($name, $routeName, $params, $options = array()) /** * @ignore - * - * @param mixed $name - * @param mixed $internal_uri - * @param mixed $options */ function link_to1($name, $internal_uri, $options = array()) { @@ -83,10 +74,6 @@ function link_to1($name, $internal_uri, $options = array()) /** * @ignore - * - * @param mixed $routeName - * @param mixed $params - * @param mixed $absolute */ function url_for2($routeName, $params = array(), $absolute = false) { @@ -97,9 +84,6 @@ function url_for2($routeName, $params = array(), $absolute = false) /** * @ignore - * - * @param mixed $internal_uri - * @param mixed $absolute */ function url_for1($internal_uri, $absolute = false) { @@ -120,9 +104,6 @@ function url_for1($internal_uri, $absolute = false) * => http://myapp.example.com/path/to/my/action * * - * @param string $internal_uri 'module/action' or '@rule' of the action - * @param bool $absolute return absolute path? - * * @return string routed URL */ function url_for() @@ -169,10 +150,6 @@ function url_for() * => Delete this page * * - * @param string $name name of the link, i.e. string to appear between the tags - * @param string $internal_uri 'module/action' or '@rule' of the action - * @param array $options additional HTML compliant tag parameters - * * @return string XHTML compliant tag * * @see url_for @@ -233,11 +210,6 @@ function form_tag_for(sfForm $form, $routePrefix, $attributes = array()) * => Delete this page * * - * @param bool $condition condition - * @param string $name name of the link, i.e. string to appear between the tags - * @param string $internal_uri 'module/action' or '@rule' of the action - * @param array $options additional HTML compliant tag parameters - * * @return string XHTML compliant tag or name * * @see link_to @@ -289,11 +261,6 @@ function link_to_if() * => Delete this page * * - * @param bool $condition condition - * @param string $name name of the link, i.e. string to appear between the tags - * @param string $internal_uri 'module/action' or '@rule' of the action - * @param array $options additional HTML compliant tag parameters - * * @return string XHTML compliant tag or name * * @see link_to diff --git a/lib/i18n/Gettext/MO.php b/lib/i18n/Gettext/MO.php index 900fdde60..3c43306e4 100644 --- a/lib/i18n/Gettext/MO.php +++ b/lib/i18n/Gettext/MO.php @@ -65,8 +65,6 @@ public function __construct($file = '') * _read. * * @param int $bytes - * - * @return mixed */ public function _read($bytes = 1) { diff --git a/lib/i18n/Gettext/PO.php b/lib/i18n/Gettext/PO.php index fda62f5b7..ff4c1eec8 100644 --- a/lib/i18n/Gettext/PO.php +++ b/lib/i18n/Gettext/PO.php @@ -37,7 +37,6 @@ class TGettext_PO extends TGettext * Constructor. * * @param string path to GNU PO file - * @param mixed $file * * @return object File_Gettext_PO */ diff --git a/lib/i18n/extract/sfI18nExtract.class.php b/lib/i18n/extract/sfI18nExtract.class.php index 69f2469cb..969409bc7 100644 --- a/lib/i18n/extract/sfI18nExtract.class.php +++ b/lib/i18n/extract/sfI18nExtract.class.php @@ -26,9 +26,6 @@ abstract class sfI18nExtract * Class constructor. * * @see initialize() - * - * @param mixed $culture - * @param mixed $parameters */ public function __construct(sfI18N $i18n, $culture, $parameters = array()) { @@ -62,9 +59,7 @@ public function initialize(sfI18N $i18n, $culture, $parameters = array()) /** * Configures the current extract object. */ - public function configure() - { - } + public function configure() {} /** * Extracts i18n strings. diff --git a/lib/i18n/extract/sfI18nYamlExtractor.class.php b/lib/i18n/extract/sfI18nYamlExtractor.class.php index c11f3b48c..7b13b8348 100644 --- a/lib/i18n/extract/sfI18nYamlExtractor.class.php +++ b/lib/i18n/extract/sfI18nYamlExtractor.class.php @@ -13,6 +13,4 @@ * * @version SVN: $Id$ */ -abstract class sfI18nYamlExtractor implements sfI18nExtractorInterface -{ -} +abstract class sfI18nYamlExtractor implements sfI18nExtractorInterface {} diff --git a/lib/i18n/sfCultureInfo.class.php b/lib/i18n/sfCultureInfo.class.php index f8c980c16..da0a30c23 100644 --- a/lib/i18n/sfCultureInfo.class.php +++ b/lib/i18n/sfCultureInfo.class.php @@ -176,8 +176,6 @@ public function __toString() * as an attribute/property to retrieve the value. * * @param string $name The property to get - * - * @return mixed */ public function __get($name) { @@ -644,7 +642,6 @@ public function getTimeZones() * sorts the passed array according to the locale of this sfCultureInfo class. * * @param array the array to be sorted with "asort" and this locale - * @param mixed $array */ public function sortArray(&$array) { @@ -816,9 +813,6 @@ protected function searchArray($info, $path = '/') * Adds an array to an already existing array. * If an element is already existing in array1 it is not overwritten. * If this element is an array this logic will be applied recursively. - * - * @param mixed $array1 - * @param mixed $array2 */ private function array_add($array1, $array2) { diff --git a/lib/i18n/sfDateTimeFormatInfo.class.php b/lib/i18n/sfDateTimeFormatInfo.class.php index 874faaede..ec8574f0c 100644 --- a/lib/i18n/sfDateTimeFormatInfo.class.php +++ b/lib/i18n/sfDateTimeFormatInfo.class.php @@ -106,10 +106,6 @@ public function __construct($data = array()) /** * Allows functions that begins with 'set' to be called directly * as an attribute/property to retrieve the value. - * - * @param mixed $name - * - * @return mixed */ public function __get($name) { @@ -124,9 +120,6 @@ public function __get($name) /** * Allows functions that begins with 'set' to be called directly * as an attribute/property to set the value. - * - * @param mixed $name - * @param mixed $value */ public function __set($name, $value) { @@ -527,9 +520,6 @@ public function getDateTimeOrderPattern() * Formats the date and time in a culture sensitive paterrn. * The default is "Date Time". * - * @param mixed $date - * @param mixed $time - * * @return string date and time formated */ public function formatDateTime($date, $time) diff --git a/lib/i18n/sfI18N.class.php b/lib/i18n/sfI18N.class.php index 0a9803db3..9c0332558 100644 --- a/lib/i18n/sfI18N.class.php +++ b/lib/i18n/sfI18N.class.php @@ -29,8 +29,6 @@ class sfI18N * Class constructor. * * @see initialize() - * - * @param mixed $options */ public function __construct(sfApplicationConfiguration $configuration, sfCache $cache = null, $options = array()) { diff --git a/lib/i18n/sfMessageSource_Aggregate.class.php b/lib/i18n/sfMessageSource_Aggregate.class.php index c8d64141d..d0d336683 100644 --- a/lib/i18n/sfMessageSource_Aggregate.class.php +++ b/lib/i18n/sfMessageSource_Aggregate.class.php @@ -46,9 +46,6 @@ public function setCulture($culture) /** * Determines if the source is valid. * - * @param string $source catalogue+variant - * @param mixed $sources - * * @return bool true if valid, false otherwise */ public function isValidSource($sources) @@ -85,8 +82,6 @@ public function getSource($variant) * Loads the message for a particular catalogue+variant. * This methods needs to implemented by subclasses. * - * @param mixed $sources - * * @return array of translation messages */ public function &loadData($sources) @@ -226,9 +221,6 @@ public function catalogues() /** * Gets the last modified unix-time for this particular catalogue+variant. * - * @param string $source catalogue+variant - * @param mixed $sources - * * @return int last modified in unix-time format */ protected function getLastModified($sources) diff --git a/lib/i18n/sfMessageSource_MySQL.class.php b/lib/i18n/sfMessageSource_MySQL.class.php index 381808c8e..8e18a0426 100644 --- a/lib/i18n/sfMessageSource_MySQL.class.php +++ b/lib/i18n/sfMessageSource_MySQL.class.php @@ -437,9 +437,6 @@ protected function getCatalogueDetails($catalogue = 'messages') /** * Updates the catalogue last modified time. * - * @param mixed $cat_id - * @param mixed $variant - * * @return bool true if updated, false otherwise */ protected function updateCatalogueTime($cat_id, $variant) diff --git a/lib/i18n/sfMessageSource_SQLite.class.php b/lib/i18n/sfMessageSource_SQLite.class.php index c6b268f8e..58515889e 100644 --- a/lib/i18n/sfMessageSource_SQLite.class.php +++ b/lib/i18n/sfMessageSource_SQLite.class.php @@ -370,10 +370,6 @@ protected function getCatalogueDetails($catalogue = 'messages') /** * Updates the catalogue last modified time. * - * @param mixed $cat_id - * @param mixed $variant - * @param mixed $db - * * @return bool true if updated, false otherwise */ protected function updateCatalogueTime($cat_id, $variant, $db) diff --git a/lib/i18n/sfMessageSource_SQLite3.class.php b/lib/i18n/sfMessageSource_SQLite3.class.php index 270781321..6485ee7df 100644 --- a/lib/i18n/sfMessageSource_SQLite3.class.php +++ b/lib/i18n/sfMessageSource_SQLite3.class.php @@ -380,9 +380,6 @@ protected function getCatalogueDetails($catalogue = 'messages') /** * Updates the catalogue last modified time. * - * @param mixed $cat_id - * @param mixed $variant - * * @return bool true if updated, false otherwise */ protected function updateCatalogueTime($cat_id, $variant) diff --git a/lib/i18n/sfNumberFormatInfo.class.php b/lib/i18n/sfNumberFormatInfo.class.php index 85dd16761..e047be56f 100644 --- a/lib/i18n/sfNumberFormatInfo.class.php +++ b/lib/i18n/sfNumberFormatInfo.class.php @@ -95,10 +95,6 @@ public function __construct($data = array(), $type = sfNumberFormatInfo::DECIMAL /** * Allows functions that begins with 'set' to be called directly * as an attribute/property to retrieve the value. - * - * @param mixed $name - * - * @return mixed */ public function __get($name) { @@ -113,9 +109,6 @@ public function __get($name) /** * Allows functions that begins with 'set' to be called directly * as an attribute/property to set the value. - * - * @param mixed $name - * @param mixed $value */ public function __set($name, $value) { @@ -155,8 +148,6 @@ public function getPattern() /** * Gets the default sfNumberFormatInfo that is culture-independent (invariant). * - * @param mixed $type - * * @return sfNumberFormatInfo default sfNumberFormatInfo */ public static function getInvariantInfo($type = sfNumberFormatInfo::DECIMAL) @@ -414,8 +405,6 @@ public function setPositivePattern($pattern) /** * Gets the string to use as the currency symbol. * - * @param mixed $currency - * * @return string $currency currency symbol */ public function getCurrencySymbol($currency = 'USD') diff --git a/lib/log/sfEventLogger.class.php b/lib/log/sfEventLogger.class.php index 26ddf9f92..dc90a06e8 100644 --- a/lib/log/sfEventLogger.class.php +++ b/lib/log/sfEventLogger.class.php @@ -8,9 +8,6 @@ */ class sfEventLogger extends sfLogger { - /** - * {@inheritDoc} - */ public function initialize(sfEventDispatcher $dispatcher, $options = array()) { $this->dispatcher = $dispatcher; @@ -26,9 +23,6 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array()) } } - /** - * {@inheritDoc} - */ protected function doLog($message, $priority) { $this->dispatcher->notify(new sfEvent($this, $this->options['event_name'], array($message, 'priority' => $priority))); diff --git a/lib/log/sfFileLogger.class.php b/lib/log/sfFileLogger.class.php index 87d98b698..1c6c357e3 100644 --- a/lib/log/sfFileLogger.class.php +++ b/lib/log/sfFileLogger.class.php @@ -88,8 +88,6 @@ public function shutdown() } /** - * @param mixed $format - * * @return false|string */ public static function strftime($format) @@ -148,8 +146,6 @@ protected function getPriority($priority) * * A better solution is to use : IntlDateFormatter, but it will require to load a new php extension, which could break some setup. * - * @param mixed $strftimeFormat - * * @return array|string|string[] */ private static function _strftimeFormatToDateFormat($strftimeFormat) diff --git a/lib/log/sfLogger.class.php b/lib/log/sfLogger.class.php index 72fb1681a..faaa70a24 100644 --- a/lib/log/sfLogger.class.php +++ b/lib/log/sfLogger.class.php @@ -100,7 +100,6 @@ public function getOptions() * Returns the options for the logger instance. * * @param string $name - * @param mixed $value */ public function setOption($name, $value) { @@ -253,9 +252,7 @@ public function listenToLogEvent(sfEvent $event) * * Cleans up the current logger instance. */ - public function shutdown() - { - } + public function shutdown() {} /** * Returns the priority name given a priority class constant. diff --git a/lib/log/sfNoLogger.class.php b/lib/log/sfNoLogger.class.php index e307cdf9d..ab123f88a 100644 --- a/lib/log/sfNoLogger.class.php +++ b/lib/log/sfNoLogger.class.php @@ -23,9 +23,7 @@ class sfNoLogger extends sfLogger * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance * @param array $options an array of options */ - public function initialize(sfEventDispatcher $dispatcher, $options = array()) - { - } + public function initialize(sfEventDispatcher $dispatcher, $options = array()) {} /** * Logs a message. @@ -33,7 +31,5 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array()) * @param string $message Message * @param int $priority Message priority */ - protected function doLog($message, $priority) - { - } + protected function doLog($message, $priority) {} } diff --git a/lib/log/sfPsrLoggerAdapter.class.php b/lib/log/sfPsrLoggerAdapter.class.php index 286965d12..412f01366 100644 --- a/lib/log/sfPsrLoggerAdapter.class.php +++ b/lib/log/sfPsrLoggerAdapter.class.php @@ -73,8 +73,6 @@ public function listenContextLoadFactoriesEvent(sfEvent $event) /** * Set the logger. - * - * @param \Psr\Log\LoggerInterface $logger */ public function setLogger(Psr\Log\LoggerInterface $logger) { diff --git a/lib/mailer/sfMailerMessageLoggerPlugin.class.php b/lib/mailer/sfMailerMessageLoggerPlugin.class.php index 0f552beb4..1fc49b1fb 100644 --- a/lib/mailer/sfMailerMessageLoggerPlugin.class.php +++ b/lib/mailer/sfMailerMessageLoggerPlugin.class.php @@ -73,7 +73,5 @@ public function beforeSendPerformed(Swift_Events_SendEvent $evt) /** * Invoked immediately after the Message is sent. */ - public function sendPerformed(Swift_Events_SendEvent $evt) - { - } + public function sendPerformed(Swift_Events_SendEvent $evt) {} } diff --git a/lib/mailer/sfNoMailer.class.php b/lib/mailer/sfNoMailer.class.php index 08165a518..2b7650c15 100644 --- a/lib/mailer/sfNoMailer.class.php +++ b/lib/mailer/sfNoMailer.class.php @@ -5,27 +5,21 @@ */ class sfNoMailer { - public function __construct(sfEventDispatcher $dispatcher, $options) - { - } + public function __construct(sfEventDispatcher $dispatcher, $options) {} public function getRealtimeTransport() { return null; } - public function setRealtimeTransport(Swift_Transport $transport) - { - } + public function setRealtimeTransport(Swift_Transport $transport) {} public function getLogger() { return null; } - public function setLogger($logger) - { - } + public function setLogger($logger) {} public function getDeliveryStrategy() { @@ -37,9 +31,7 @@ public function getDeliveryAddress() return null; } - public function setDeliveryAddress($address) - { - } + public function setDeliveryAddress($address) {} public function compose($from = null, $to = null, $subject = null, $body = null) { diff --git a/lib/plugin/sfPearDownloader.class.php b/lib/plugin/sfPearDownloader.class.php index c820f82e5..00d3be637 100644 --- a/lib/plugin/sfPearDownloader.class.php +++ b/lib/plugin/sfPearDownloader.class.php @@ -22,13 +22,8 @@ class sfPearDownloader extends PEAR_Downloader /** * @see PEAR_REST::downloadHttp() * - * @param mixed $url - * @param mixed $ui - * @param mixed $save_dir * @param mixed|null $callback * @param mixed|null $lastmodified - * @param mixed $accept - * @param mixed $channel */ public function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null, $accept = false, $channel = false) { diff --git a/lib/plugin/sfPearRest.class.php b/lib/plugin/sfPearRest.class.php index c27bfd34c..d8cd6e6ad 100644 --- a/lib/plugin/sfPearRest.class.php +++ b/lib/plugin/sfPearRest.class.php @@ -22,10 +22,7 @@ class sfPearRest extends PEAR_REST /** * @see PEAR_REST::downloadHttp() * - * @param mixed $url * @param mixed|null $lastmodified - * @param mixed $accept - * @param mixed $channel */ public function downloadHttp($url, $lastmodified = null, $accept = false, $channel = false) { diff --git a/lib/plugin/sfPearRest10.class.php b/lib/plugin/sfPearRest10.class.php index 2fc3f6412..007c15202 100644 --- a/lib/plugin/sfPearRest10.class.php +++ b/lib/plugin/sfPearRest10.class.php @@ -21,9 +21,6 @@ class sfPearRest10 extends PEAR_REST_10 { /** * @see PEAR_REST_10 - * - * @param mixed $config - * @param mixed $options */ public function __construct($config, $options = array()) { diff --git a/lib/plugin/sfPearRest11.class.php b/lib/plugin/sfPearRest11.class.php index cd9538c95..239df17f5 100644 --- a/lib/plugin/sfPearRest11.class.php +++ b/lib/plugin/sfPearRest11.class.php @@ -21,9 +21,6 @@ class sfPearRest11 extends PEAR_REST_11 { /** * @see PEAR_REST_11 - * - * @param mixed $config - * @param mixed $options */ public function __construct($config, $options = array()) { diff --git a/lib/plugin/sfPluginDependencyException.class.php b/lib/plugin/sfPluginDependencyException.class.php index 67ede6c99..11e684c92 100644 --- a/lib/plugin/sfPluginDependencyException.class.php +++ b/lib/plugin/sfPluginDependencyException.class.php @@ -15,6 +15,4 @@ * * @version SVN: $Id$ */ -class sfPluginDependencyException extends sfPluginException -{ -} +class sfPluginDependencyException extends sfPluginException {} diff --git a/lib/plugin/sfPluginException.class.php b/lib/plugin/sfPluginException.class.php index 6b5a7ae97..f77721df6 100644 --- a/lib/plugin/sfPluginException.class.php +++ b/lib/plugin/sfPluginException.class.php @@ -15,6 +15,4 @@ * * @version SVN: $Id$ */ -class sfPluginException extends sfException -{ -} +class sfPluginException extends sfException {} diff --git a/lib/plugin/sfPluginManager.class.php b/lib/plugin/sfPluginManager.class.php index ed522d1d2..0b23c29ba 100644 --- a/lib/plugin/sfPluginManager.class.php +++ b/lib/plugin/sfPluginManager.class.php @@ -52,9 +52,7 @@ public function initialize(sfEventDispatcher $dispatcher, sfPearEnvironment $env /** * Configures this plugin manager. */ - public function configure() - { - } + public function configure() {} /** * Returns the sfPearEnvironment instance. @@ -287,9 +285,6 @@ public function getPluginLicense($plugin, $options = array()) * Installs a plugin. * * @see installPlugin() - * - * @param mixed $plugin - * @param mixed $options */ protected function doInstallPlugin($plugin, $options = array()) { diff --git a/lib/plugin/sfPluginRecursiveDependencyException.class.php b/lib/plugin/sfPluginRecursiveDependencyException.class.php index b4171d0ff..ce83a61fd 100644 --- a/lib/plugin/sfPluginRecursiveDependencyException.class.php +++ b/lib/plugin/sfPluginRecursiveDependencyException.class.php @@ -15,6 +15,4 @@ * * @version SVN: $Id$ */ -class sfPluginRecursiveDependencyException extends sfPluginException -{ -} +class sfPluginRecursiveDependencyException extends sfPluginException {} diff --git a/lib/plugin/sfPluginRestException.class.php b/lib/plugin/sfPluginRestException.class.php index 92d9dcdc7..b4aba88a3 100644 --- a/lib/plugin/sfPluginRestException.class.php +++ b/lib/plugin/sfPluginRestException.class.php @@ -15,6 +15,4 @@ * * @version SVN: $Id$ */ -class sfPluginRestException extends sfPluginException -{ -} +class sfPluginRestException extends sfPluginException {} diff --git a/lib/plugin/sfSymfonyPluginManager.class.php b/lib/plugin/sfSymfonyPluginManager.class.php index 2e37ea6d3..c8cfcf0ec 100644 --- a/lib/plugin/sfSymfonyPluginManager.class.php +++ b/lib/plugin/sfSymfonyPluginManager.class.php @@ -60,8 +60,7 @@ public function configure() /** * Installs web content for a plugin. * - * @param string $plugin The plugin name - * @param mixed $sourceDirectory + * @param string $plugin The plugin name */ public function installWebContent($plugin, $sourceDirectory) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php index 1202199bc..d70e7b559 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php @@ -35,8 +35,6 @@ public function __construct(sfEventDispatcher $dispatcher, $options = array()) * Returns an option value. * * @param string $name - * - * @return mixed */ public function getOption($name) { @@ -47,7 +45,6 @@ public function getOption($name) * Sets an option value. * * @param string $name - * @param mixed $value */ public function setOption($name, $value) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php index 550ffcd55..c3ae68a81 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php @@ -232,8 +232,6 @@ public function getI18nModelI18nField() /** * @see sfFormObject - * - * @param mixed $values */ protected function doUpdateObject($values) { @@ -372,9 +370,7 @@ protected function saveFile($field, $filename = null, sfValidatedFile $file = nu /** * Used in generated forms when models use inheritance. */ - protected function setupInheritance() - { - } + protected function setupInheritance() {} /** * Returns the name of the related model. diff --git a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php index 07234f7a6..be77d8b30 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php @@ -251,9 +251,7 @@ protected function addDateQuery(Doctrine_Query $query, $field, $values) /** * Used in generated forms when models use inheritance. */ - protected function setupInheritance() - { - } + protected function setupInheritance() {} /** * Returns the name of the related model. diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php index 61d752dc6..3f296dac2 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php @@ -355,8 +355,6 @@ protected function arrayExport($values) /** * Filter out models that have disabled generation of form classes. * - * @param mixed $models - * * @return array $models Array of models to generate forms for */ protected function filterModels($models) diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php index ac3ad2185..1729370bc 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php @@ -52,7 +52,6 @@ public function initialize(sfGeneratorManager $generatorManager) * Generates classes and templates in cache. * * @param array The parameters - * @param mixed $params * * @return string The data to put in configuration cache */ @@ -651,8 +650,6 @@ protected function loadModels() /** * Filter out models that have disabled generation of form classes. * - * @param mixed $models - * * @return array $models Array of models to generate forms for */ protected function filterModels($models) diff --git a/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php b/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php index 060a336f0..eb424b15a 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php @@ -34,9 +34,6 @@ class Swift_DoctrineSpool extends Swift_ConfigurableSpool * @param string The Doctrine model to use to store the messages (MailMessage by default) * @param string The column name to use for message storage (message by default) * @param string The method to call to retrieve the query to execute (optional) - * @param mixed $model - * @param mixed $column - * @param mixed $method */ public function __construct($model = 'MailMessage', $column = 'message', $method = 'createQuery') { @@ -58,16 +55,12 @@ public function isStarted() /** * Starts this Transport mechanism. */ - public function start() - { - } + public function start() {} /** * Stops this Transport mechanism. */ - public function stop() - { - } + public function stop() {} /** * Stores a message in the queue. diff --git a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php index 43e82ce65..8e9b11cc3 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php @@ -21,9 +21,7 @@ class sfDoctrineRecordI18nFilter extends Doctrine_Record_Filter /** * @see Doctrine_Table::unshiftFilter() */ - public function init() - { - } + public function init() {} /** * Calls set on Translation relationship. diff --git a/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php b/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php index d42b25720..8a21b0351 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php @@ -17,6 +17,4 @@ * * @version SVN: $Id$ */ -class sfDoctrineException extends sfException -{ -} +class sfDoctrineException extends sfException {} diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php index 3fc6d2b8f..8df114ab7 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php @@ -113,8 +113,6 @@ protected function getDoctrineDatabases(sfDatabaseManager $databaseManager, arra * A schema file is any file saved in a plugin or project's config/doctrine/ * directory that matches the "*.yml" glob. * - * @param mixed $yamlSchemaPath - * * @return string Absolute path to the consolidated schema file */ protected function prepareSchemaFile($yamlSchemaPath) diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php index 950c024dd..d6224071f 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php @@ -54,9 +54,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php index c4241c5a6..0ea03d7a7 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php @@ -51,9 +51,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php index 3a572fa0f..91f277c38 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php @@ -51,9 +51,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php index 0f21b9059..53e4873a4 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php @@ -52,9 +52,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php index 122d35e7a..0d9c602a0 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php @@ -46,9 +46,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php index 04281ccf9..37ccd13f5 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php @@ -48,9 +48,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php index cb7f61e43..618d353ae 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php @@ -117,9 +117,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php index eb69d4c6d..9632a5e71 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php @@ -40,9 +40,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { @@ -84,8 +81,6 @@ protected function execute($arguments = array(), $options = array()) /** * Returns models defined in YAML. * - * @param mixed $yamlSchemaPath - * * @return array */ protected function getYamlModels($yamlSchemaPath) @@ -96,8 +91,6 @@ protected function getYamlModels($yamlSchemaPath) /** * Returns the schema as defined in YAML. * - * @param mixed $yamlSchemaPath - * * @return array */ protected function getYamlSchema($yamlSchemaPath) @@ -108,8 +101,6 @@ protected function getYamlSchema($yamlSchemaPath) /** * Returns models that have class files. * - * @param mixed $modelsPath - * * @return array */ protected function getFileModels($modelsPath) diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php index 27537733d..ebfed326f 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php @@ -48,9 +48,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php index a32859f57..d6cd89407 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php @@ -63,9 +63,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php index 8593eeddb..55d7bdfc7 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php @@ -55,9 +55,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php index a4a4e8853..8ef11f564 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php @@ -62,9 +62,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php index 51c84c5d9..ba683c6b9 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php @@ -46,9 +46,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php index 57d0ede3d..b2760dadc 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php @@ -60,9 +60,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php index 970f86d8e..be555f57e 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php @@ -59,9 +59,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php index 77d805245..591acdcd5 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php @@ -72,9 +72,6 @@ class: sfDoctrineRouteCollection /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php index 8cef5a32d..17ae5faaa 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php @@ -54,9 +54,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php index d07d4e11b..3b4bce034 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php @@ -45,9 +45,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php index 5c521d7bb..43178c255 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php @@ -45,9 +45,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php index 970010747..a7caaf768 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php @@ -45,9 +45,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php index 3b931cb46..5599f5105 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php @@ -54,9 +54,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php index ef7c22ca5..3402cbbd9 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php @@ -76,9 +76,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php index 37cd7efff..1cefab957 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php @@ -47,9 +47,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php index ed4692229..526a541ef 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php @@ -64,9 +64,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php index 187326f08..8aaf9fdc5 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php @@ -20,16 +20,12 @@ class sfTesterDoctrine extends sfTester /** * Prepares the tester. */ - public function prepare() - { - } + public function prepare() {} /** * Initializes the tester. */ - public function initialize() - { - } + public function initialize() {} /** * Tests a model. diff --git a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php index e4148d260..da720236b 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php @@ -33,9 +33,6 @@ class sfValidatorDoctrineChoice extends sfValidatorBase * * max: The maximum number of values that need to be selected (this option is only active if multiple is true) * * @see sfValidatorBase - * - * @param mixed $options - * @param mixed $messages */ protected function configure($options = array(), $messages = array()) { @@ -52,8 +49,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php index f709867b9..08e24c8ab 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php @@ -28,8 +28,6 @@ class sfValidatorDoctrineUnique extends sfValidatorSchema * * @param array An array of options * @param array An array of error messages - * @param mixed $options - * @param mixed $messages * * @see sfValidatorSchema */ @@ -52,9 +50,6 @@ public function __construct($options = array(), $messages = array()) * * throw_global_error: Whether to throw a global error (false by default) or an error tied to the first field related to the column option array * * @see sfValidatorBase - * - * @param mixed $options - * @param mixed $messages */ protected function configure($options = array(), $messages = array()) { @@ -69,8 +64,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $values */ protected function doClean($values) { @@ -125,7 +118,6 @@ protected function doClean($values) * @param BaseObject A Doctrine object * @param array An array of values * @param bool true if the object is being updated, false otherwise - * @param mixed $values */ protected function isUpdate(Doctrine_Record $object, $values) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php index 8157cfa73..0c14c9bd0 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php @@ -21,9 +21,6 @@ class sfWidgetFormDoctrineArrayChoice extends sfWidgetFormChoice { /** * @see sfWidget - * - * @param mixed $options - * @param mixed $attributes */ public function __construct($options = array(), $attributes = array()) { @@ -69,9 +66,6 @@ public function getChoices() * * multiple: true if the select tag must allow multiple selections (false by default) * * @see sfWidgetFormChoice - * - * @param mixed $options - * @param mixed $attributes */ protected function configure($options = array(), $attributes = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php index c95252e45..5bf5e9354 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php @@ -21,9 +21,6 @@ class sfWidgetFormDoctrineChoice extends sfWidgetFormChoice { /** * @see sfWidget - * - * @param mixed $options - * @param mixed $attributes */ public function __construct($options = array(), $attributes = array()) { @@ -94,9 +91,6 @@ public function getChoices() * * table_method: A method to return either a query, collection or single object * * @see sfWidgetFormSelect - * - * @param mixed $options - * @param mixed $attributes */ protected function configure($options = array(), $attributes = array()) { diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php index bf778c6bd..c33a0ee82 100644 --- a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php +++ b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php @@ -103,8 +103,7 @@ protected function _testAdminGenTableMethod() { $this-> get('/my_articles')-> - with('response')->isStatusCode('200') - ; + with('response')->isStatusCode('200'); } protected function _testArticleI18nEmbedded() @@ -137,8 +136,7 @@ protected function _testArticleI18nEmbedded() check('Article', array('is_on_homepage' => $info['is_on_homepage']))-> check('ArticleTranslation', array('lang' => 'fr', 'title' => 'Test French title'))-> check('ArticleTranslation', array('lang' => 'en', 'title' => 'Test English title'))-> - end() - ; + end(); } protected function _testEnumDropdown() @@ -149,8 +147,7 @@ protected function _testEnumDropdown() get('/subscriptions/new')-> with('response')->begin()-> checkElement('select', '/^New\R?Active\R?Pending\R?Expired\R?$/m')-> - end() - ; + end(); } protected function _testUserEmbedsProfileForm() @@ -163,8 +160,7 @@ protected function _testUserEmbedsProfileForm() matches('/Profile/')-> matches('/First name/')-> matches('/Last name/')-> - end() - ; + end(); $this->info('Test the Profile form saves and attached to user properly'); @@ -198,8 +194,7 @@ protected function _testUserEmbedsProfileForm() check('UserGroup', array('user_id' => $user->id, 'group_id' => $user->Groups[1]->id))-> check('UserPermission', array('user_id' => $user->id, 'permission_id' => $user->Permissions[0]->id))-> check('UserPermission', array('user_id' => $user->id, 'permission_id' => $user->Permissions[1]->id))-> - end() - ; + end(); unset($userInfo['user']['Profile']['user_id']); $tester = $this->get('/users/new')-> diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php index 34be2c712..b4bf2d60f 100644 --- a/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php +++ b/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php @@ -32,8 +32,7 @@ with('response')->begin()-> isStatusCode('200')-> matches($check)-> - end() - ; + end(); } $article = Doctrine_Core::getTable('Article')->find(1); diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/backendConfiguration.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/backendConfiguration.class.php index 36be3be8f..2218be6cd 100644 --- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/backendConfiguration.class.php +++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/backendConfiguration.class.php @@ -2,7 +2,5 @@ class backendConfiguration extends sfApplicationConfiguration { - public function configure() - { - } + public function configure() {} } diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/lib/myUser.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/lib/myUser.class.php index 4c793028e..ad920b971 100644 --- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/lib/myUser.class.php +++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/lib/myUser.class.php @@ -1,5 +1,3 @@ embedRelation() $t->diag('->embedRelation()'); -class myArticleForm extends ArticleForm -{ -} +class myArticleForm extends ArticleForm {} $table = Doctrine_Core::getTable('Author'); $form = new AuthorForm($table->create(array( diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php index c6e2be61a..489212aea 100644 --- a/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php +++ b/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php @@ -12,9 +12,7 @@ $t = new lime_test(4); -class ProjectConfiguration extends sfProjectConfiguration -{ -} +class ProjectConfiguration extends sfProjectConfiguration {} $configuration = new ProjectConfiguration(dirname(__FILE__).'/../../lib', new sfEventDispatcher()); diff --git a/lib/request/sfRequest.class.php b/lib/request/sfRequest.class.php index 4e42fc5d5..354c3f430 100644 --- a/lib/request/sfRequest.class.php +++ b/lib/request/sfRequest.class.php @@ -298,8 +298,6 @@ public function setAttribute($name, $value) * * @param string $name Parameter name * @param string $default Parameter default value - * - * @return mixed */ public function getParameter($name, $default = null) { diff --git a/lib/request/sfWebRequest.class.php b/lib/request/sfWebRequest.class.php index 61c9fefa7..554c04c54 100644 --- a/lib/request/sfWebRequest.class.php +++ b/lib/request/sfWebRequest.class.php @@ -577,8 +577,7 @@ public function isSecure() return (isset($pathArray['HTTPS']) && ('on' == strtolower($pathArray['HTTPS']) || 1 == $pathArray['HTTPS'])) || ($this->getOption('trust_proxy') && isset($pathArray['HTTP_SSL_HTTPS']) && ('on' == strtolower($pathArray['HTTP_SSL_HTTPS']) || 1 == $pathArray['HTTP_SSL_HTTPS'])) - || ($this->getOption('trust_proxy') && $this->isForwardedSecure()) - ; + || ($this->getOption('trust_proxy') && $this->isForwardedSecure()); } /** diff --git a/lib/response/sfWebResponse.class.php b/lib/response/sfWebResponse.class.php index a6126730d..e1a78c9a3 100644 --- a/lib/response/sfWebResponse.class.php +++ b/lib/response/sfWebResponse.class.php @@ -827,7 +827,6 @@ public function serialize() /** * @see sfResponse - * {@inheritdoc} */ public function unserialize($serialized) { diff --git a/lib/routing/sfPatternRouting.class.php b/lib/routing/sfPatternRouting.class.php index 753413c83..7b5b145bc 100644 --- a/lib/routing/sfPatternRouting.class.php +++ b/lib/routing/sfPatternRouting.class.php @@ -44,7 +44,6 @@ class sfPatternRouting extends sfRouting * cache backend (like sfAPCCache). * * @see sfRouting - * {@inheritdoc} */ public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array()) { @@ -73,7 +72,6 @@ public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, /** * @see sfRouting - * {@inheritdoc} */ public function loadConfiguration() { @@ -86,7 +84,6 @@ public function loadConfiguration() /** * @see sfRouting - * {@inheritdoc} */ public function setDefaultParameter($key, $value) { @@ -101,7 +98,6 @@ public function setDefaultParameter($key, $value) /** * @see sfRouting - * {@inheritdoc} */ public function setDefaultParameters($parameters) { @@ -116,7 +112,6 @@ public function setDefaultParameters($parameters) /** * @see sfRouting - * {@inheritdoc} */ public function getCurrentInternalUri($withRouteName = false) { @@ -135,7 +130,6 @@ public function getCurrentRouteName() /** * @see sfRouting - * {@inheritdoc} */ public function getRoutes() { @@ -144,7 +138,6 @@ public function getRoutes() /** * @see sfRouting - * {@inheritdoc} */ public function getRoute($name) { @@ -164,7 +157,6 @@ public function getRoute($name) /** * @see sfRouting - * {@inheritdoc} */ public function setRoutes($routes) { @@ -175,7 +167,6 @@ public function setRoutes($routes) /** * @see sfRouting - * {@inheritdoc} */ public function hasRoutes() { @@ -184,7 +175,6 @@ public function hasRoutes() /** * @see sfRouting - * {@inheritdoc} */ public function clearRoutes() { @@ -310,7 +300,6 @@ public function configureRoute(sfRoute $route) /** * @see sfRouting - * {@inheritdoc} */ public function generate($name, $params = array(), $absolute = false) { @@ -351,7 +340,6 @@ public function generate($name, $params = array(), $absolute = false) /** * @see sfRouting - * {@inheritdoc} */ public function parse($url) { diff --git a/lib/routing/sfRequestRoute.class.php b/lib/routing/sfRequestRoute.class.php index 3e1c08bbb..8933bbf96 100644 --- a/lib/routing/sfRequestRoute.class.php +++ b/lib/routing/sfRequestRoute.class.php @@ -25,11 +25,6 @@ class sfRequestRoute extends sfRoute * Applies a default sf_method requirements of GET or HEAD. * * @see sfRoute - * - * @param mixed $pattern - * @param mixed $defaults - * @param mixed $requirements - * @param mixed $options */ public function __construct($pattern, $defaults = array(), $requirements = array(), $options = array()) { diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php index 399c9186a..5fd858b78 100644 --- a/lib/routing/sfRoute.class.php +++ b/lib/routing/sfRoute.class.php @@ -69,6 +69,7 @@ public function __serialize() { // always serialize compiled routes $this->compile(); + // sfPatternRouting will always re-set defaultParameters, so no need to serialize them return array($this->tokens, $this->defaultOptions, $this->options, $this->pattern, $this->staticPrefix, $this->regex, $this->variables, $this->defaults, $this->requirements, $this->suffix, $this->customToken); } @@ -653,9 +654,7 @@ protected function compileForVariable($separator, $name, $variable) } } - protected function compileForSeparator($separator, $regexSeparator) - { - } + protected function compileForSeparator($separator, $regexSeparator) {} protected function initializeOptions() { diff --git a/lib/routing/sfRouting.class.php b/lib/routing/sfRouting.class.php index d94dfa30b..cc2d90311 100644 --- a/lib/routing/sfRouting.class.php +++ b/lib/routing/sfRouting.class.php @@ -30,8 +30,7 @@ abstract class sfRouting * * @see initialize() * - * @param sfCache $cache - * @param array $options + * @param array $options */ public function __construct(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array()) { @@ -262,9 +261,7 @@ public function filterParametersEvent(sfEvent $event, $parameters) /** * Execute the shutdown procedure. */ - public function shutdown() - { - } + public function shutdown() {} protected function fixGeneratedUrl($url, $absolute = false) { diff --git a/lib/service/sfServiceContainerDumperPhp.class.php b/lib/service/sfServiceContainerDumperPhp.class.php index 5edc36516..b356006b5 100644 --- a/lib/service/sfServiceContainerDumperPhp.class.php +++ b/lib/service/sfServiceContainerDumperPhp.class.php @@ -41,8 +41,7 @@ public function dump(array $options = array()) $this->addConstructor(). $this->addServices(). $this->addDefaultParametersMethod(). - $this->endClass() - ; + $this->endClass(); } public function replaceParameter($match) @@ -192,8 +191,7 @@ protected function get{$name}Service() $this->addServiceInstance($id, $definition). $this->addServiceMethodCalls($id, $definition). $this->addServiceConfigurator($id, $definition). - $this->addServiceReturn($id, $definition) - ; + $this->addServiceReturn($id, $definition); return $code; } diff --git a/lib/storage/sfMySQLSessionStorage.class.php b/lib/storage/sfMySQLSessionStorage.class.php index 029a4adcd..9ce5c1cf8 100644 --- a/lib/storage/sfMySQLSessionStorage.class.php +++ b/lib/storage/sfMySQLSessionStorage.class.php @@ -66,7 +66,7 @@ public function sessionGC($lifetime) $db_table = $this->options['db_table']; $db_time_col = $this->options['db_time_col']; - // delete the record older than the authorised session life time + // delete the record older than the authorised session life time $lifetime = $this->db_escape($lifetime); // We never know... $sql = "DELETE FROM {$db_table} WHERE {$db_time_col} + {$lifetime} < UNIX_TIMESTAMP()"; diff --git a/lib/storage/sfNoStorage.class.php b/lib/storage/sfNoStorage.class.php index 81906e3bb..a98ae86c4 100644 --- a/lib/storage/sfNoStorage.class.php +++ b/lib/storage/sfNoStorage.class.php @@ -64,9 +64,7 @@ public function remove($key) * * @throws sfStorageException If an error occurs while writing to this storage */ - public function write($key, $data) - { - } + public function write($key, $data) {} /** * Regenerates id that represents this storage. @@ -85,7 +83,5 @@ public function regenerate($destroy = false) * * @throws sfStorageException If an error occurs while shutting down this storage */ - public function shutdown() - { - } + public function shutdown() {} } diff --git a/lib/task/app/sfAppRoutesTask.class.php b/lib/task/app/sfAppRoutesTask.class.php index 53375c4c6..af7113fae 100644 --- a/lib/task/app/sfAppRoutesTask.class.php +++ b/lib/task/app/sfAppRoutesTask.class.php @@ -42,9 +42,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/cache/sfCacheClearTask.class.php b/lib/task/cache/sfCacheClearTask.class.php index 447867d23..af975e83a 100644 --- a/lib/task/cache/sfCacheClearTask.class.php +++ b/lib/task/cache/sfCacheClearTask.class.php @@ -106,9 +106,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/configure/sfConfigureAuthorTask.class.php b/lib/task/configure/sfConfigureAuthorTask.class.php index 23e461260..fc239867c 100644 --- a/lib/task/configure/sfConfigureAuthorTask.class.php +++ b/lib/task/configure/sfConfigureAuthorTask.class.php @@ -44,9 +44,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/generator/sfGenerateAppTask.class.php b/lib/task/generator/sfGenerateAppTask.class.php index aeaa610fb..68e5eee89 100644 --- a/lib/task/generator/sfGenerateAppTask.class.php +++ b/lib/task/generator/sfGenerateAppTask.class.php @@ -76,9 +76,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/generator/sfGenerateModuleTask.class.php b/lib/task/generator/sfGenerateModuleTask.class.php index aa47cb0bd..c40899f15 100644 --- a/lib/task/generator/sfGenerateModuleTask.class.php +++ b/lib/task/generator/sfGenerateModuleTask.class.php @@ -61,9 +61,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/generator/sfGenerateProjectTask.class.php b/lib/task/generator/sfGenerateProjectTask.class.php index 281123a84..28d2eeeb5 100755 --- a/lib/task/generator/sfGenerateProjectTask.class.php +++ b/lib/task/generator/sfGenerateProjectTask.class.php @@ -21,8 +21,6 @@ class sfGenerateProjectTask extends sfGeneratorBaseTask { /** * @see sfTask - * - * @param mixed $options */ protected function doRun(sfCommandManager $commandManager, $options) { @@ -80,9 +78,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/generator/sfGenerateTaskTask.class.php b/lib/task/generator/sfGenerateTaskTask.class.php index f6d17ed8b..030c53fd1 100644 --- a/lib/task/generator/sfGenerateTaskTask.class.php +++ b/lib/task/generator/sfGenerateTaskTask.class.php @@ -67,9 +67,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/generator/sfGeneratorBaseTask.class.php b/lib/task/generator/sfGeneratorBaseTask.class.php index 6324a094b..8444862fb 100644 --- a/lib/task/generator/sfGeneratorBaseTask.class.php +++ b/lib/task/generator/sfGeneratorBaseTask.class.php @@ -15,6 +15,4 @@ * * @version SVN: $Id$ */ -abstract class sfGeneratorBaseTask extends sfBaseTask -{ -} +abstract class sfGeneratorBaseTask extends sfBaseTask {} diff --git a/lib/task/help/sfHelpTask.class.php b/lib/task/help/sfHelpTask.class.php index abdf8a9f3..e04b3d878 100644 --- a/lib/task/help/sfHelpTask.class.php +++ b/lib/task/help/sfHelpTask.class.php @@ -45,9 +45,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/help/sfListTask.class.php b/lib/task/help/sfListTask.class.php index 0d08f34cf..132a7d696 100644 --- a/lib/task/help/sfListTask.class.php +++ b/lib/task/help/sfListTask.class.php @@ -49,9 +49,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/i18n/sfI18nExtractTask.class.php b/lib/task/i18n/sfI18nExtractTask.class.php index a45952586..388ed14ed 100644 --- a/lib/task/i18n/sfI18nExtractTask.class.php +++ b/lib/task/i18n/sfI18nExtractTask.class.php @@ -25,9 +25,6 @@ class sfI18nExtractTask extends sfBaseTask { /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ public function execute($arguments = array(), $options = array()) { diff --git a/lib/task/i18n/sfI18nFindTask.class.php b/lib/task/i18n/sfI18nFindTask.class.php index bcea6f1a4..9209799db 100644 --- a/lib/task/i18n/sfI18nFindTask.class.php +++ b/lib/task/i18n/sfI18nFindTask.class.php @@ -19,9 +19,6 @@ class sfI18nFindTask extends sfBaseTask { /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ public function execute($arguments = array(), $options = array()) { diff --git a/lib/task/log/sfLogClearTask.class.php b/lib/task/log/sfLogClearTask.class.php index 5aa7f9c52..63913680f 100644 --- a/lib/task/log/sfLogClearTask.class.php +++ b/lib/task/log/sfLogClearTask.class.php @@ -35,9 +35,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/log/sfLogRotateTask.class.php b/lib/task/log/sfLogRotateTask.class.php index 1f2623bb4..db8edd525 100644 --- a/lib/task/log/sfLogRotateTask.class.php +++ b/lib/task/log/sfLogRotateTask.class.php @@ -141,9 +141,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/plugin/sfPluginAddChannelTask.class.php b/lib/task/plugin/sfPluginAddChannelTask.class.php index a1fd40672..c5889327d 100644 --- a/lib/task/plugin/sfPluginAddChannelTask.class.php +++ b/lib/task/plugin/sfPluginAddChannelTask.class.php @@ -42,9 +42,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/plugin/sfPluginBaseTask.class.php b/lib/task/plugin/sfPluginBaseTask.class.php index b7c657c90..4b8890c2d 100644 --- a/lib/task/plugin/sfPluginBaseTask.class.php +++ b/lib/task/plugin/sfPluginBaseTask.class.php @@ -15,6 +15,4 @@ * * @version SVN: $Id$ */ -abstract class sfPluginBaseTask extends sfBaseTask -{ -} +abstract class sfPluginBaseTask extends sfBaseTask {} diff --git a/lib/task/plugin/sfPluginInstallTask.class.php b/lib/task/plugin/sfPluginInstallTask.class.php index 0689f7689..0a646f210 100644 --- a/lib/task/plugin/sfPluginInstallTask.class.php +++ b/lib/task/plugin/sfPluginInstallTask.class.php @@ -88,9 +88,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/plugin/sfPluginListTask.class.php b/lib/task/plugin/sfPluginListTask.class.php index fbb779ad3..9d5957b44 100644 --- a/lib/task/plugin/sfPluginListTask.class.php +++ b/lib/task/plugin/sfPluginListTask.class.php @@ -40,9 +40,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/plugin/sfPluginPublishAssetsTask.class.php b/lib/task/plugin/sfPluginPublishAssetsTask.class.php index 3ca4831e7..f1de99698 100644 --- a/lib/task/plugin/sfPluginPublishAssetsTask.class.php +++ b/lib/task/plugin/sfPluginPublishAssetsTask.class.php @@ -57,9 +57,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { @@ -87,9 +84,8 @@ protected function execute($arguments = array(), $options = array()) /** * Installs web content for a plugin. * - * @param string $plugin The plugin name - * @param string $dir The plugin directory - * @param mixed $relative + * @param string $plugin The plugin name + * @param string $dir The plugin directory */ protected function installPluginAssets($plugin, $dir, $relative) { diff --git a/lib/task/plugin/sfPluginUninstallTask.class.php b/lib/task/plugin/sfPluginUninstallTask.class.php index 620b7a317..cc5d01a12 100644 --- a/lib/task/plugin/sfPluginUninstallTask.class.php +++ b/lib/task/plugin/sfPluginUninstallTask.class.php @@ -66,9 +66,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/plugin/sfPluginUpgradeTask.class.php b/lib/task/plugin/sfPluginUpgradeTask.class.php index 753ea2b67..7159efda6 100644 --- a/lib/task/plugin/sfPluginUpgradeTask.class.php +++ b/lib/task/plugin/sfPluginUpgradeTask.class.php @@ -55,9 +55,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/project/sfProjectClearControllersTask.class.php b/lib/task/project/sfProjectClearControllersTask.class.php index bbbd43480..1335876a4 100644 --- a/lib/task/project/sfProjectClearControllersTask.class.php +++ b/lib/task/project/sfProjectClearControllersTask.class.php @@ -56,9 +56,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/project/sfProjectDeployTask.class.php b/lib/task/project/sfProjectDeployTask.class.php index a4d91b7fd..aa7db60a3 100644 --- a/lib/task/project/sfProjectDeployTask.class.php +++ b/lib/task/project/sfProjectDeployTask.class.php @@ -108,9 +108,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/project/sfProjectDisableTask.class.php b/lib/task/project/sfProjectDisableTask.class.php index b891c0dae..3069cd6d9 100644 --- a/lib/task/project/sfProjectDisableTask.class.php +++ b/lib/task/project/sfProjectDisableTask.class.php @@ -45,9 +45,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/project/sfProjectEnableTask.class.php b/lib/task/project/sfProjectEnableTask.class.php index c106124da..2330c6a36 100644 --- a/lib/task/project/sfProjectEnableTask.class.php +++ b/lib/task/project/sfProjectEnableTask.class.php @@ -45,9 +45,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/project/sfProjectOptimizeTask.class.php b/lib/task/project/sfProjectOptimizeTask.class.php index 2aae397f2..bb29bdc6b 100644 --- a/lib/task/project/sfProjectOptimizeTask.class.php +++ b/lib/task/project/sfProjectOptimizeTask.class.php @@ -43,9 +43,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/project/sfProjectPermissionsTask.class.php b/lib/task/project/sfProjectPermissionsTask.class.php index c0c13d43c..fe5911182 100644 --- a/lib/task/project/sfProjectPermissionsTask.class.php +++ b/lib/task/project/sfProjectPermissionsTask.class.php @@ -25,10 +25,6 @@ class sfProjectPermissionsTask extends sfBaseTask * * @see http://www.php.net/set_error_handler * - * @param mixed $no - * @param mixed $string - * @param mixed $file - * @param mixed $line * @param mixed|null $context */ public function handleError($no, $string, $file, $line, $context = null) @@ -54,9 +50,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/project/sfProjectValidateTask.class.php b/lib/task/project/sfProjectValidateTask.class.php index 65881ec1f..2b30cf29b 100644 --- a/lib/task/project/sfProjectValidateTask.class.php +++ b/lib/task/project/sfProjectValidateTask.class.php @@ -38,9 +38,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/sfBaseTask.class.php b/lib/task/sfBaseTask.class.php index f83f4dd45..f6d8af988 100644 --- a/lib/task/sfBaseTask.class.php +++ b/lib/task/sfBaseTask.class.php @@ -25,8 +25,6 @@ abstract class sfBaseTask extends sfCommandApplicationTask /** * Sets the current task's configuration. - * - * @param sfProjectConfiguration $configuration */ public function setConfiguration(sfProjectConfiguration $configuration = null) { @@ -100,7 +98,6 @@ public function checkModuleExists($app, $module) /** * @see sfTask - * {@inheritdoc} */ protected function doRun(sfCommandManager $commandManager, $options) { @@ -396,8 +393,6 @@ protected function getPluginManager() /** * @see sfCommandApplicationTask - * - * @param mixed $name */ protected function createTask($name) { diff --git a/lib/task/sfCommandApplicationTask.class.php b/lib/task/sfCommandApplicationTask.class.php index 33f89d6d3..bf3c23635 100644 --- a/lib/task/sfCommandApplicationTask.class.php +++ b/lib/task/sfCommandApplicationTask.class.php @@ -44,7 +44,6 @@ public function setCommandApplication(sfCommandApplication $commandApplication = /** * @see sfTask - * {@inheritdoc} */ public function log($messages) { @@ -55,7 +54,8 @@ public function log($messages) /** * @see sfTask - * {@inheritdoc} + * + * @param mixed|null $size */ public function logSection($section, $message, $size = null, $style = 'INFO') { diff --git a/lib/task/sfTask.class.php b/lib/task/sfTask.class.php index 355ffa6ca..7059f10ea 100644 --- a/lib/task/sfTask.class.php +++ b/lib/task/sfTask.class.php @@ -184,10 +184,10 @@ public function addArguments($arguments) * * @see sfCommandArgument::__construct() * - * @param string $name - * @param int $mode - * @param string $help - * @param mixed $default + * @param string $name + * @param int $mode + * @param string $help + * @param mixed|null $default */ public function addArgument($name, $mode = null, $help = '', $default = null) { @@ -221,11 +221,11 @@ public function addOptions($options) * * @see sfCommandOption::__construct() * - * @param string $name - * @param string $shortcut - * @param int $mode - * @param string $help - * @param mixed $default + * @param string $name + * @param string $shortcut + * @param int $mode + * @param string $help + * @param mixed|null $default */ public function addOption($name, $shortcut = null, $mode = null, $help = '', $default = null) { @@ -458,8 +458,6 @@ public function askConfirmation($question, $style = 'QUESTION', $default = true) * * @param array|string $question * - * @return mixed - * * @throws sfValidatorError */ public function askAndValidate($question, sfValidatorBase $validator, array $options = array()) @@ -577,9 +575,7 @@ public function asXml() /** * Configures the current task. */ - protected function configure() - { - } + protected function configure() {} protected function process(sfCommandManager $commandManager, $options) { @@ -609,15 +605,15 @@ protected function doRun(sfCommandManager $commandManager, $options) return $ret; } - /** - * Executes the current task. - * - * @param array $arguments An array of arguments - * @param array $options An array of options - * - * @return int 0 if everything went fine, or an error code - */ - abstract protected function execute($arguments = array(), $options = array()); + /** + * Executes the current task. + * + * @param array $arguments An array of arguments + * @param array $options An array of options + * + * @return int 0 if everything went fine, or an error code + */ + abstract protected function execute($arguments = array(), $options = array()); protected function strlen($string) { diff --git a/lib/task/symfony/sfSymfonyTestTask.class.php b/lib/task/symfony/sfSymfonyTestTask.class.php index fc6864e97..70065aca7 100644 --- a/lib/task/symfony/sfSymfonyTestTask.class.php +++ b/lib/task/symfony/sfSymfonyTestTask.class.php @@ -42,9 +42,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/test/sfTestAllTask.class.php b/lib/task/test/sfTestAllTask.class.php index bc80f13c0..b3287c668 100644 --- a/lib/task/test/sfTestAllTask.class.php +++ b/lib/task/test/sfTestAllTask.class.php @@ -72,9 +72,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/test/sfTestCoverageTask.class.php b/lib/task/test/sfTestCoverageTask.class.php index e885d097d..df4fcd9b5 100644 --- a/lib/task/test/sfTestCoverageTask.class.php +++ b/lib/task/test/sfTestCoverageTask.class.php @@ -51,9 +51,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/test/sfTestFunctionalTask.class.php b/lib/task/test/sfTestFunctionalTask.class.php index f8493d025..c3a78b382 100644 --- a/lib/task/test/sfTestFunctionalTask.class.php +++ b/lib/task/test/sfTestFunctionalTask.class.php @@ -66,9 +66,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/test/sfTestPluginTask.class.php b/lib/task/test/sfTestPluginTask.class.php index ce04c2925..c8422d405 100644 --- a/lib/task/test/sfTestPluginTask.class.php +++ b/lib/task/test/sfTestPluginTask.class.php @@ -48,9 +48,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/task/test/sfTestUnitTask.class.php b/lib/task/test/sfTestUnitTask.class.php index 1c7cd7d2c..42a01e8f2 100644 --- a/lib/task/test/sfTestUnitTask.class.php +++ b/lib/task/test/sfTestUnitTask.class.php @@ -63,9 +63,6 @@ protected function configure() /** * @see sfTask - * - * @param mixed $arguments - * @param mixed $options */ protected function execute($arguments = array(), $options = array()) { diff --git a/lib/test/sfTestFunctional.class.php b/lib/test/sfTestFunctional.class.php index 3be0a9f10..a176cf774 100644 --- a/lib/test/sfTestFunctional.class.php +++ b/lib/test/sfTestFunctional.class.php @@ -22,7 +22,6 @@ class sfTestFunctional extends sfTestFunctionalBase * * @param sfBrowserBase $browser A sfBrowserBase instance * @param lime_test $lime A lime instance - * @param mixed $testers */ public function __construct(sfBrowserBase $browser, lime_test $lime = null, $testers = array()) { diff --git a/lib/test/sfTestFunctionalBase.class.php b/lib/test/sfTestFunctionalBase.class.php index e846e7eba..e9125d678 100644 --- a/lib/test/sfTestFunctionalBase.class.php +++ b/lib/test/sfTestFunctionalBase.class.php @@ -31,7 +31,6 @@ abstract class sfTestFunctionalBase * * @param sfBrowserBase $browser A sfBrowserBase instance * @param lime_test $lime A lime instance - * @param mixed $testers */ public function __construct(sfBrowserBase $browser, lime_test $lime = null, $testers = array()) { @@ -197,8 +196,7 @@ public function getAndCheck($module, $action, $url = null, $code = 200) isParameter('module', $module)-> isParameter('action', $action)-> end()-> - with('response')->isStatusCode($code) - ; + with('response')->isStatusCode($code); } /** diff --git a/lib/test/sfTesterMailer.class.php b/lib/test/sfTesterMailer.class.php index acdd755ff..98492c6e6 100644 --- a/lib/test/sfTesterMailer.class.php +++ b/lib/test/sfTesterMailer.class.php @@ -23,9 +23,7 @@ class sfTesterMailer extends sfTester /** * Prepares the tester. */ - public function prepare() - { - } + public function prepare() {} /** * Initializes the tester. diff --git a/lib/test/sfTesterRequest.class.php b/lib/test/sfTesterRequest.class.php index bd66957f8..1758b3174 100644 --- a/lib/test/sfTesterRequest.class.php +++ b/lib/test/sfTesterRequest.class.php @@ -22,9 +22,7 @@ class sfTesterRequest extends sfTester /** * Prepares the tester. */ - public function prepare() - { - } + public function prepare() {} /** * Initializes the tester. diff --git a/lib/test/sfTesterResponse.class.php b/lib/test/sfTesterResponse.class.php index 4b2080c56..d49e4655c 100644 --- a/lib/test/sfTesterResponse.class.php +++ b/lib/test/sfTesterResponse.class.php @@ -24,9 +24,7 @@ class sfTesterResponse extends sfTester /** * Prepares the tester. */ - public function prepare() - { - } + public function prepare() {} /** * Initializes the tester. @@ -322,7 +320,6 @@ public function setsCookie($name, $value = null, $attributes = array()) * Tests the response content against a regex. * * @param string Regex - * @param mixed $regex * * @return sfTester|sfTestFunctionalBase */ diff --git a/lib/test/sfTesterUser.class.php b/lib/test/sfTesterUser.class.php index b40ad3bc7..9dfd7e117 100644 --- a/lib/test/sfTesterUser.class.php +++ b/lib/test/sfTesterUser.class.php @@ -22,9 +22,7 @@ class sfTesterUser extends sfTester /** * Prepares the tester. */ - public function prepare() - { - } + public function prepare() {} /** * Initializes the tester. @@ -96,9 +94,8 @@ public function isAuthenticated($boolean = true) /** * Tests if the user has some credentials. * - * @param mixed $credentials - * @param bool $boolean Whether to check if the user have some credentials or not - * @param bool $useAnd specify the mode, either AND or OR + * @param bool $boolean Whether to check if the user have some credentials or not + * @param bool $useAnd specify the mode, either AND or OR * * @return sfTester|sfTestFunctionalBase */ diff --git a/lib/test/sfTesterViewCache.class.php b/lib/test/sfTesterViewCache.class.php index c4ae4991d..000e697cf 100644 --- a/lib/test/sfTesterViewCache.class.php +++ b/lib/test/sfTesterViewCache.class.php @@ -24,9 +24,7 @@ class sfTesterViewCache extends sfTester /** * Prepares the tester. */ - public function prepare() - { - } + public function prepare() {} /** * Initializes the tester. diff --git a/lib/user/sfBasicSecurityUser.class.php b/lib/user/sfBasicSecurityUser.class.php index 32b61f499..4a82bfa0a 100644 --- a/lib/user/sfBasicSecurityUser.class.php +++ b/lib/user/sfBasicSecurityUser.class.php @@ -74,8 +74,6 @@ public function removeCredential($credential) /** * Adds a credential. - * - * @param mixed $credential */ public function addCredential($credential) { @@ -116,8 +114,7 @@ public function addCredentials() /** * Returns true if user has credential. * - * @param mixed $credentials - * @param bool $useAnd specify the mode, either AND or OR + * @param bool $useAnd specify the mode, either AND or OR * * @return bool * diff --git a/lib/util/sfClassManipulator.class.php b/lib/util/sfClassManipulator.class.php index cd0e09c6a..45b628b72 100644 --- a/lib/util/sfClassManipulator.class.php +++ b/lib/util/sfClassManipulator.class.php @@ -95,7 +95,6 @@ public function getFile() * Sets the file associated with this instance. * * @param string A file name - * @param mixed $file */ public function setFile($file) { diff --git a/lib/util/sfParameterHolder.class.php b/lib/util/sfParameterHolder.class.php index 0e643a5a2..3dd5c5b31 100644 --- a/lib/util/sfParameterHolder.class.php +++ b/lib/util/sfParameterHolder.class.php @@ -27,9 +27,7 @@ class sfParameterHolder implements Serializable /** * The constructor for sfParameterHolder. */ - public function __construct() - { - } + public function __construct() {} /** * Serializes the current instance for PHP 7.4+. diff --git a/lib/util/sfToolkit.class.php b/lib/util/sfToolkit.class.php index a9d7c0e17..543440ac0 100644 --- a/lib/util/sfToolkit.class.php +++ b/lib/util/sfToolkit.class.php @@ -269,8 +269,6 @@ public static function stringToArray($string) * * @param string $value * @param bool $quoted Quote? - * - * @return mixed */ public static function literalize($value, $quoted = false) { @@ -355,7 +353,6 @@ public static function isArrayValuesEmpty($array) * Licensed under the BSD open source license * * @param string - * @param mixed $string * * @return bool true if $string is valid UTF-8 and false otherwise */ diff --git a/lib/validator/sfValidatorAnd.class.php b/lib/validator/sfValidatorAnd.class.php index 142f50b8d..24c9e45d4 100644 --- a/lib/validator/sfValidatorAnd.class.php +++ b/lib/validator/sfValidatorAnd.class.php @@ -71,8 +71,6 @@ public function getValidators() /** * @see sfValidatorBase - * - * @param mixed $indent */ public function asString($indent = 0) { @@ -122,8 +120,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorBase.class.php b/lib/validator/sfValidatorBase.class.php index ec150533d..28bcd1d75 100644 --- a/lib/validator/sfValidatorBase.class.php +++ b/lib/validator/sfValidatorBase.class.php @@ -385,9 +385,7 @@ public function asString($indent = 0) * * @see __construct() */ - protected function configure($options = array(), $messages = array()) - { - } + protected function configure($options = array(), $messages = array()) {} /** * Cleans the input value. diff --git a/lib/validator/sfValidatorBoolean.class.php b/lib/validator/sfValidatorBoolean.class.php index 98abfc434..6319b7b59 100755 --- a/lib/validator/sfValidatorBoolean.class.php +++ b/lib/validator/sfValidatorBoolean.class.php @@ -41,8 +41,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorCSRFToken.class.php b/lib/validator/sfValidatorCSRFToken.class.php index 4e1c09d18..2fcf5b2d1 100644 --- a/lib/validator/sfValidatorCSRFToken.class.php +++ b/lib/validator/sfValidatorCSRFToken.class.php @@ -19,9 +19,6 @@ class sfValidatorCSRFToken extends sfValidatorBase { /** * @see sfValidatorBase - * - * @param mixed $options - * @param mixed $messages */ protected function configure($options = array(), $messages = array()) { @@ -34,8 +31,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorCallback.class.php b/lib/validator/sfValidatorCallback.class.php index 94a2562ce..57a0fa5c8 100644 --- a/lib/validator/sfValidatorCallback.class.php +++ b/lib/validator/sfValidatorCallback.class.php @@ -40,8 +40,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorChoice.class.php b/lib/validator/sfValidatorChoice.class.php index d092816af..6b9c64c97 100644 --- a/lib/validator/sfValidatorChoice.class.php +++ b/lib/validator/sfValidatorChoice.class.php @@ -60,8 +60,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { @@ -81,8 +79,7 @@ protected function doClean($value) /** * Cleans a value when multiple is true. * - * @param mixed $value The submitted value - * @param mixed $choices + * @param mixed $value The submitted value * * @return array The cleaned value */ diff --git a/lib/validator/sfValidatorDate.class.php b/lib/validator/sfValidatorDate.class.php index a8d5f2902..a4366932a 100644 --- a/lib/validator/sfValidatorDate.class.php +++ b/lib/validator/sfValidatorDate.class.php @@ -62,8 +62,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { @@ -166,8 +164,7 @@ protected function convertDateArrayToString($value) $empties = (!isset($value['year']) || !$value['year'] ? 1 : 0) + (!isset($value['month']) || !$value['month'] ? 1 : 0) + - (!isset($value['day']) || !$value['day'] ? 1 : 0) - ; + (!isset($value['day']) || !$value['day'] ? 1 : 0); if ($empties > 0 && $empties < 3) { throw new sfValidatorError($this, 'invalid', array('value' => $value)); } @@ -220,8 +217,6 @@ protected function isValueSet($values, $key) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function isEmpty($value) { diff --git a/lib/validator/sfValidatorDateRange.class.php b/lib/validator/sfValidatorDateRange.class.php index b16c6ab49..48cd2f5d1 100644 --- a/lib/validator/sfValidatorDateRange.class.php +++ b/lib/validator/sfValidatorDateRange.class.php @@ -44,8 +44,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorDateTime.class.php b/lib/validator/sfValidatorDateTime.class.php index 493e4412e..ebd7aa783 100644 --- a/lib/validator/sfValidatorDateTime.class.php +++ b/lib/validator/sfValidatorDateTime.class.php @@ -19,9 +19,6 @@ class sfValidatorDateTime extends sfValidatorDate { /** * @see sfValidatorDate - * - * @param mixed $options - * @param mixed $messages */ protected function configure($options = array(), $messages = array()) { diff --git a/lib/validator/sfValidatorDecorator.class.php b/lib/validator/sfValidatorDecorator.class.php index 5136db45f..c197eb4a1 100644 --- a/lib/validator/sfValidatorDecorator.class.php +++ b/lib/validator/sfValidatorDecorator.class.php @@ -25,9 +25,6 @@ abstract class sfValidatorDecorator extends sfValidatorBase /** * @see sfValidatorBase - * - * @param mixed $options - * @param mixed $messages */ public function __construct($options = array(), $messages = array()) { @@ -48,8 +45,6 @@ public function __construct($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ public function clean($value) { @@ -58,8 +53,6 @@ public function clean($value) /** * @see sfValidatorBase - * - * @param mixed $name */ public function getMessage($name) { @@ -68,9 +61,6 @@ public function getMessage($name) /** * @see sfValidatorBase - * - * @param mixed $name - * @param mixed $value */ public function setMessage($name, $value) { @@ -87,8 +77,6 @@ public function getMessages() /** * @see sfValidatorBase - * - * @param mixed $values */ public function setMessages($values) { @@ -97,8 +85,6 @@ public function setMessages($values) /** * @see sfValidatorBase - * - * @param mixed $name */ public function getOption($name) { @@ -107,9 +93,6 @@ public function getOption($name) /** * @see sfValidatorBase - * - * @param mixed $name - * @param mixed $value */ public function setOption($name, $value) { @@ -118,8 +101,6 @@ public function setOption($name, $value) /** * @see sfValidatorBase - * - * @param mixed $name */ public function hasOption($name) { @@ -136,8 +117,6 @@ public function getOptions() /** * @see sfValidatorBase - * - * @param mixed $values */ public function setOptions($values) { @@ -146,8 +125,6 @@ public function setOptions($values) /** * @see sfValidatorBase - * - * @param mixed $indent */ public function asString($indent = 0) { @@ -181,8 +158,6 @@ abstract protected function getValidator(); /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorEmail.class.php b/lib/validator/sfValidatorEmail.class.php index a383edb20..39b218164 100644 --- a/lib/validator/sfValidatorEmail.class.php +++ b/lib/validator/sfValidatorEmail.class.php @@ -21,9 +21,6 @@ class sfValidatorEmail extends sfValidatorRegex /** * @see sfValidatorRegex - * - * @param mixed $options - * @param mixed $messages */ protected function configure($options = array(), $messages = array()) { diff --git a/lib/validator/sfValidatorEqual.class.php b/lib/validator/sfValidatorEqual.class.php index c6ad69272..bc5b16cda 100644 --- a/lib/validator/sfValidatorEqual.class.php +++ b/lib/validator/sfValidatorEqual.class.php @@ -46,8 +46,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorError.class.php b/lib/validator/sfValidatorError.class.php index 71d338f6c..f94ff6bc0 100644 --- a/lib/validator/sfValidatorError.class.php +++ b/lib/validator/sfValidatorError.class.php @@ -63,9 +63,6 @@ public function __serialize() /** * Unserializes a sfValidatorError instance for php 7.4+. - * - * @param string $serialized A serialized sfValidatorError instance - * @param mixed $data */ public function __unserialize($data) { diff --git a/lib/validator/sfValidatorErrorSchema.class.php b/lib/validator/sfValidatorErrorSchema.class.php index f56d9447f..1a242b3e0 100644 --- a/lib/validator/sfValidatorErrorSchema.class.php +++ b/lib/validator/sfValidatorErrorSchema.class.php @@ -86,8 +86,6 @@ public function addError(sfValidatorError $error, $name = null) /** * Adds a collection of errors. * - * @param sfValidatorErrorSchema $errorsAn sfValidatorErrorSchema instance - * * @return sfValidatorErrorSchema The current error schema instance */ public function addErrors(sfValidatorErrorSchema $errors) @@ -143,8 +141,6 @@ public function getValue() /** * @see sfValidatorError - * - * @param mixed $raw */ public function getArguments($raw = false) { @@ -271,9 +267,7 @@ public function offsetSet($offset, $value) * @param string $offset (ignored) */ #[\ReturnTypeWillChange] - public function offsetUnset($offset) - { - } + public function offsetUnset($offset) {} /** * Serializes the current instance. diff --git a/lib/validator/sfValidatorFile.class.php b/lib/validator/sfValidatorFile.class.php index e46cb07b2..368bea6f1 100644 --- a/lib/validator/sfValidatorFile.class.php +++ b/lib/validator/sfValidatorFile.class.php @@ -93,8 +93,6 @@ protected function configure($options = array(), $messages = array()) * * size: The file size in bytes (optional) * * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { @@ -270,8 +268,6 @@ protected function getMimeTypesFromCategory($category) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function isEmpty($value) { diff --git a/lib/validator/sfValidatorFileMulti.class.php b/lib/validator/sfValidatorFileMulti.class.php index a21c1a9ca..df726d1c3 100644 --- a/lib/validator/sfValidatorFileMulti.class.php +++ b/lib/validator/sfValidatorFileMulti.class.php @@ -4,8 +4,6 @@ class sfValidatorFileMulti extends sfValidatorFile { /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorFromDescription.class.php b/lib/validator/sfValidatorFromDescription.class.php index 49abf6f3b..11bcd93fc 100644 --- a/lib/validator/sfValidatorFromDescription.class.php +++ b/lib/validator/sfValidatorFromDescription.class.php @@ -22,10 +22,6 @@ class sfValidatorFromDescription extends sfValidatorDecorator /** * @see sfValidatorBase - * - * @param mixed $string - * @param mixed $options - * @param mixed $messages */ public function __construct($string, $options = array(), $messages = array()) { diff --git a/lib/validator/sfValidatorInteger.class.php b/lib/validator/sfValidatorInteger.class.php index 594e9f7af..48169a187 100644 --- a/lib/validator/sfValidatorInteger.class.php +++ b/lib/validator/sfValidatorInteger.class.php @@ -48,8 +48,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorNumber.class.php b/lib/validator/sfValidatorNumber.class.php index 0cd54cc2b..aa3656e15 100644 --- a/lib/validator/sfValidatorNumber.class.php +++ b/lib/validator/sfValidatorNumber.class.php @@ -48,8 +48,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorOr.class.php b/lib/validator/sfValidatorOr.class.php index 354da8997..910b14f05 100644 --- a/lib/validator/sfValidatorOr.class.php +++ b/lib/validator/sfValidatorOr.class.php @@ -71,8 +71,6 @@ public function getValidators() /** * @see sfValidatorBase - * - * @param mixed $indent */ public function asString($indent = 0) { @@ -103,9 +101,6 @@ public function asString($indent = 0) /** * @see sfValidatorBase - * - * @param mixed $options - * @param mixed $messages */ protected function configure($options = array(), $messages = array()) { @@ -114,8 +109,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorPass.class.php b/lib/validator/sfValidatorPass.class.php index def7dd3eb..24cf7592d 100644 --- a/lib/validator/sfValidatorPass.class.php +++ b/lib/validator/sfValidatorPass.class.php @@ -19,8 +19,6 @@ class sfValidatorPass extends sfValidatorBase { /** * @see sfValidatorBase - * - * @param mixed $value */ public function clean($value) { @@ -29,8 +27,6 @@ public function clean($value) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorRegex.class.php b/lib/validator/sfValidatorRegex.class.php index c72127827..4e2ba6cd5 100644 --- a/lib/validator/sfValidatorRegex.class.php +++ b/lib/validator/sfValidatorRegex.class.php @@ -52,8 +52,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorString - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorSchema.class.php b/lib/validator/sfValidatorSchema.class.php index 21a77afde..9064138c9 100644 --- a/lib/validator/sfValidatorSchema.class.php +++ b/lib/validator/sfValidatorSchema.class.php @@ -67,8 +67,6 @@ public function __clone() /** * @see sfValidatorBase - * - * @param mixed $values */ public function clean($values) { @@ -232,8 +230,6 @@ public function getFields() /** * @see sfValidatorBase - * - * @param mixed $indent */ public function asString($indent = 0) { @@ -268,8 +264,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $values */ protected function doClean($values) { diff --git a/lib/validator/sfValidatorSchemaCompare.class.php b/lib/validator/sfValidatorSchemaCompare.class.php index 93bddc007..3572aa1cb 100644 --- a/lib/validator/sfValidatorSchemaCompare.class.php +++ b/lib/validator/sfValidatorSchemaCompare.class.php @@ -65,8 +65,6 @@ public function __construct($leftField, $operator, $rightField, $options = array /** * @see sfValidatorBase - * - * @param mixed $indent */ public function asString($indent = 0) { @@ -95,8 +93,6 @@ public function asString($indent = 0) /** * @see sfValidatorBase - * - * @param mixed $values */ protected function doClean($values) { diff --git a/lib/validator/sfValidatorSchemaFilter.class.php b/lib/validator/sfValidatorSchemaFilter.class.php index 5ca9920ec..6c15bd0d5 100644 --- a/lib/validator/sfValidatorSchemaFilter.class.php +++ b/lib/validator/sfValidatorSchemaFilter.class.php @@ -37,8 +37,6 @@ public function __construct($field, sfValidatorBase $validator, $options = array /** * @see sfValidatorBase - * - * @param mixed $indent */ public function asString($indent = 0) { @@ -47,8 +45,6 @@ public function asString($indent = 0) /** * @see sfValidatorBase - * - * @param mixed $values */ protected function doClean($values) { diff --git a/lib/validator/sfValidatorString.class.php b/lib/validator/sfValidatorString.class.php index 23786f779..35574e7d9 100644 --- a/lib/validator/sfValidatorString.class.php +++ b/lib/validator/sfValidatorString.class.php @@ -48,8 +48,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { diff --git a/lib/validator/sfValidatorTime.class.php b/lib/validator/sfValidatorTime.class.php index a8ec40d07..bda409397 100644 --- a/lib/validator/sfValidatorTime.class.php +++ b/lib/validator/sfValidatorTime.class.php @@ -47,8 +47,6 @@ protected function configure($options = array(), $messages = array()) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function doClean($value) { @@ -119,8 +117,6 @@ protected function isValueSet($values, $key) /** * @see sfValidatorBase - * - * @param mixed $value */ protected function isEmpty($value) { diff --git a/lib/view/sfPHPView.class.php b/lib/view/sfPHPView.class.php index 6ccd701cd..43d19ce6c 100644 --- a/lib/view/sfPHPView.class.php +++ b/lib/view/sfPHPView.class.php @@ -22,9 +22,7 @@ class sfPHPView extends sfView /** * Executes any presentation logic for this view. */ - public function execute() - { - } + public function execute() {} /** * Retrieves the template engine associated with this view. diff --git a/lib/view/sfPartialView.class.php b/lib/view/sfPartialView.class.php index 7c7711552..0e9d89061 100644 --- a/lib/view/sfPartialView.class.php +++ b/lib/view/sfPartialView.class.php @@ -26,11 +26,6 @@ class sfPartialView extends sfPHPView * Constructor. * * @see sfView - * - * @param mixed $context - * @param mixed $moduleName - * @param mixed $actionName - * @param mixed $viewName */ public function initialize($context, $moduleName, $actionName, $viewName) { @@ -48,9 +43,7 @@ public function initialize($context, $moduleName, $actionName, $viewName) /** * Executes any presentation logic for this view. */ - public function execute() - { - } + public function execute() {} public function setPartialVars(array $partialVars) { diff --git a/lib/view/sfView.class.php b/lib/view/sfView.class.php index 35bc3a3bc..3efbf0f8a 100644 --- a/lib/view/sfView.class.php +++ b/lib/view/sfView.class.php @@ -85,11 +85,6 @@ abstract class sfView * Class constructor. * * @see initialize() - * - * @param mixed $context - * @param mixed $moduleName - * @param mixed $actionName - * @param mixed $viewName */ public function __construct($context, $moduleName, $actionName, $viewName) { diff --git a/lib/view/sfViewCacheManager.class.php b/lib/view/sfViewCacheManager.class.php index dde3b65ab..dd5201b00 100644 --- a/lib/view/sfViewCacheManager.class.php +++ b/lib/view/sfViewCacheManager.class.php @@ -36,9 +36,6 @@ class sfViewCacheManager * Class constructor. * * @see initialize() - * - * @param mixed $context - * @param mixed $options */ public function __construct($context, sfCache $cache, $options = array()) { @@ -50,7 +47,6 @@ public function __construct($context, sfCache $cache, $options = array()) * * @param sfContext $context Current application context * @param sfCache $cache An sfCache instance - * @param mixed $options */ public function initialize($context, sfCache $cache, $options = array()) { @@ -850,7 +846,6 @@ public function decorateContentWithDebug(sfEvent $event, $content) * Gets the vary header part of view cache key. * * @param string $vary - * @param mixed $internalUri * * @return string */ diff --git a/lib/view/sfViewParameterHolder.class.php b/lib/view/sfViewParameterHolder.class.php index ca5b42e78..817b1d127 100644 --- a/lib/view/sfViewParameterHolder.class.php +++ b/lib/view/sfViewParameterHolder.class.php @@ -25,9 +25,6 @@ class sfViewParameterHolder extends sfParameterHolder /** * Constructor. - * - * @param mixed $parameters - * @param mixed $options */ public function __construct(sfEventDispatcher $dispatcher, $parameters = array(), $options = array()) { diff --git a/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php b/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php index bcd1e52d8..c2b3e2d88 100644 --- a/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php +++ b/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php @@ -43,8 +43,6 @@ protected function configure($options = array(), $attributes = array()) /** * @see sfWidgetFormDateTime - * - * @param mixed $attributes */ protected function getDateWidget($attributes = array()) { @@ -53,8 +51,6 @@ protected function getDateWidget($attributes = array()) /** * @see sfWidgetFormDateTime - * - * @param mixed $attributes */ protected function getTimeWidget($attributes = array()) { diff --git a/lib/widget/sfWidget.class.php b/lib/widget/sfWidget.class.php index 8bd37963e..6ddf589a6 100644 --- a/lib/widget/sfWidget.class.php +++ b/lib/widget/sfWidget.class.php @@ -381,9 +381,7 @@ public function attributesToHtml($attributes) * * @see __construct() */ - protected function configure($options = array(), $attributes = array()) - { - } + protected function configure($options = array(), $attributes = array()) {} /** * Prepares an attribute key and value for HTML representation. diff --git a/lib/widget/sfWidgetFormSchemaDecorator.class.php b/lib/widget/sfWidgetFormSchemaDecorator.class.php index 5db5c0b3a..3a01e96a7 100644 --- a/lib/widget/sfWidgetFormSchemaDecorator.class.php +++ b/lib/widget/sfWidgetFormSchemaDecorator.class.php @@ -70,7 +70,6 @@ public function render($name, $values = array(), $attributes = array(), $errors /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function addFormFormatter($name, sfWidgetFormSchemaFormatter $formatter) { @@ -89,7 +88,6 @@ public function getFormFormatters() /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function setFormFormatterName($name) { @@ -100,7 +98,6 @@ public function setFormFormatterName($name) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function getFormFormatterName() { @@ -109,7 +106,6 @@ public function getFormFormatterName() /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function getFormFormatter() { @@ -118,7 +114,6 @@ public function getFormFormatter() /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function setNameFormat($format) { @@ -129,7 +124,6 @@ public function setNameFormat($format) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function getNameFormat() { @@ -138,7 +132,6 @@ public function getNameFormat() /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function setLabels(array $labels) { @@ -149,7 +142,6 @@ public function setLabels(array $labels) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function getLabels() { @@ -158,7 +150,8 @@ public function getLabels() /** * @see sfWidgetFormSchema - * {@inheritdoc} + * + * @param mixed|null $value */ public function setLabel($name, $value = null) { @@ -173,7 +166,8 @@ public function setLabel($name, $value = null) /** * @see sfWidgetFormSchema - * {@inheritdoc} + * + * @param mixed|null $name */ public function getLabel($name = null) { @@ -182,7 +176,6 @@ public function getLabel($name = null) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function setHelps(array $helps) { @@ -193,7 +186,6 @@ public function setHelps(array $helps) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function getHelps() { @@ -202,7 +194,6 @@ public function getHelps() /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function setHelp($name, $help) { @@ -213,7 +204,6 @@ public function setHelp($name, $help) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function getHelp($name) { @@ -250,7 +240,8 @@ public function needsMultipartForm() /** * @see sfWidgetFormSchema - * {@inheritdoc} + * + * @param mixed|null $value */ public function renderField($name, $value = null, $attributes = array(), $errors = array()) { @@ -259,7 +250,6 @@ public function renderField($name, $value = null, $attributes = array(), $errors /** * @see sfWidgetFormSchemaFormatter - * {@inheritdoc} */ public function generateLabel($name) { @@ -268,7 +258,6 @@ public function generateLabel($name) /** * @see sfWidgetFormSchemaFormatter - * {@inheritdoc} */ public function generateLabelName($name) { @@ -277,7 +266,6 @@ public function generateLabelName($name) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function generateName($name) { @@ -286,7 +274,6 @@ public function generateName($name) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function getParent() { @@ -295,7 +282,6 @@ public function getParent() /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function setParent(sfWidgetFormSchema $parent = null) { @@ -306,7 +292,6 @@ public function setParent(sfWidgetFormSchema $parent = null) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function getFields() { @@ -315,7 +300,6 @@ public function getFields() /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function getPositions() { @@ -324,7 +308,6 @@ public function getPositions() /** * @see sfWidgetFormSchema - * {@inheritdoc} */ public function setPositions(array $positions) { @@ -335,7 +318,8 @@ public function setPositions(array $positions) /** * @see sfWidgetFormSchema - * {@inheritdoc} + * + * @param mixed|null $pivot */ public function moveField($field, $action, $pivot = null) { @@ -344,7 +328,6 @@ public function moveField($field, $action, $pivot = null) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ #[\ReturnTypeWillChange] public function offsetExists($name) @@ -354,7 +337,6 @@ public function offsetExists($name) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ #[\ReturnTypeWillChange] public function offsetGet($name) @@ -364,7 +346,6 @@ public function offsetGet($name) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ #[\ReturnTypeWillChange] public function offsetSet($name, $widget) @@ -374,7 +355,6 @@ public function offsetSet($name, $widget) /** * @see sfWidgetFormSchema - * {@inheritdoc} */ #[\ReturnTypeWillChange] public function offsetUnset($name) diff --git a/lib/widget/sfWidgetFormSchemaFormatter.class.php b/lib/widget/sfWidgetFormSchemaFormatter.class.php index 0b9f3c9df..863e0e3be 100644 --- a/lib/widget/sfWidgetFormSchemaFormatter.class.php +++ b/lib/widget/sfWidgetFormSchemaFormatter.class.php @@ -84,8 +84,6 @@ public function translate($subject, $parameters = array()) /** * Returns the current i18n callable. - * - * @return mixed */ public static function getTranslationCallable() { @@ -95,8 +93,6 @@ public static function getTranslationCallable() /** * Sets a callable which aims to translate form labels, errors and help messages. * - * @param mixed $callable - * * @throws InvalidArgumentException if an invalid php callable or sfCallable has been provided */ public static function setTranslationCallable($callable) diff --git a/lib/yaml/sfYaml.class.php b/lib/yaml/sfYaml.class.php index cd9027fe1..e5246c1fe 100644 --- a/lib/yaml/sfYaml.class.php +++ b/lib/yaml/sfYaml.class.php @@ -55,8 +55,7 @@ public static function getSpecVersion() * print_r($array); * * - * @param string $input Path of YAML file or string containing YAML - * @param mixed $encoding + * @param string $input Path of YAML file or string containing YAML * * @return array The YAML converted to a PHP array * diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php index 577d0b8ee..d1028416f 100644 --- a/lib/yaml/sfYamlInline.class.php +++ b/lib/yaml/sfYamlInline.class.php @@ -134,10 +134,8 @@ public static function dump($value) * * @param scalar $scalar * @param string $delimiters - * @param array $stringDelimiter * @param int $i * @param bool $evaluate - * @param mixed $stringDelimiters * * @return string A YAML string */ diff --git a/test/functional/authTest.php b/test/functional/authTest.php index 44d142ffe..2c771d0f8 100644 --- a/test/functional/authTest.php +++ b/test/functional/authTest.php @@ -28,8 +28,7 @@ public function checkNonAuth() checkElement('#user', '')-> checkElement('#password', '')-> checkElement('#msg', 'KO')-> - end() - ; + end(); } public function checkAuth() @@ -45,8 +44,7 @@ public function checkAuth() checkElement('#user', 'foo')-> checkElement('#password', 'bar')-> checkElement('#msg', 'OK')-> - end() - ; + end(); } } @@ -62,5 +60,4 @@ public function checkAuth() restart()-> - checkNonAuth() -; + checkNonAuth(); diff --git a/test/functional/autoloadTest.php b/test/functional/autoloadTest.php index 0c226b67d..1391b678e 100755 --- a/test/functional/autoloadTest.php +++ b/test/functional/autoloadTest.php @@ -24,8 +24,7 @@ with('response')->begin()-> isStatusCode(200)-> checkElement('body div', 'foo')-> - end() -; + end(); $t = $b->test(); diff --git a/test/functional/cacheTest.php b/test/functional/cacheTest.php index 09ba506d6..878eef54c 100644 --- a/test/functional/cacheTest.php +++ b/test/functional/cacheTest.php @@ -91,8 +91,7 @@ public function getMultiAction($parameter = null) isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array('varParam' => 'varParam'))), true)-> isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array('varParam' => 'another'))), false)-> - end() - ; + end(); } public function launch() @@ -112,8 +111,7 @@ public function launch() checkElement('body', '/congratulations/i')-> end()-> - with('view_cache')->isCached(true) - ; + with('view_cache')->isCached(true); $b-> get('/nocache')-> @@ -125,8 +123,7 @@ public function launch() isStatusCode(200)-> checkElement('body', '/nocache/i')-> end()-> - with('view_cache')->isCached(false) - ; + with('view_cache')->isCached(false); $b-> get('/cache/page')-> @@ -138,8 +135,7 @@ public function launch() isStatusCode(200)-> checkElement('body', '/page in cache/')-> end()-> - with('view_cache')->isCached(true, true) - ; + with('view_cache')->isCached(true, true); $b-> get('/cache/forward')-> @@ -151,8 +147,7 @@ public function launch() isStatusCode(200)-> checkElement('body', '/page in cache/')-> end()-> - with('view_cache')->isCached(true) - ; + with('view_cache')->isCached(true); // remove all cache sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir')); @@ -168,8 +163,7 @@ public function launch() checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_')-> checkElement('#cacheablePartial .cacheablePartial__')-> checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_')-> - end() - ; + end(); // remove all cache sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir')); @@ -200,8 +194,7 @@ public function launch() checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_requestParam')-> checkElement('#cacheablePartial .cacheablePartial__requestParam')-> checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_requestParam')-> - end() - ; + end(); // check contextual cache with another action $b-> @@ -240,8 +233,7 @@ public function launch() // contextual component cache isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array())), true)-> - end() - ; + end(); // remove all cache sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir')); @@ -269,8 +261,7 @@ public function launch() // contextual component cache isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key=contextualCacheableComponent', true)-> - end() - ; + end(); // check cache content for actions @@ -284,8 +275,7 @@ public function launch() isParameter('action', 'action')-> end()-> with('response')->isStatusCode(200)-> - with('view_cache')->isCached(true) - ; + with('view_cache')->isCached(true); $b->test()->is(sfConfig::get('ACTION_EXECUTED', false), true, 'action is executed when not in cache'); sfConfig::set('ACTION_EXECUTED', false); @@ -302,8 +292,7 @@ public function launch() isParameter('action', 'action')-> end()-> with('response')->isStatusCode(200)-> - with('view_cache')->isCached(true) - ; + with('view_cache')->isCached(true); $b->test()->is(sfConfig::get('ACTION_EXECUTED', false), false, 'action is not executed when in cache'); @@ -347,8 +336,7 @@ public function launch() checkResponseContent($image, 'image (no layout/action cache) in cache is not decorated when web_debug is on')-> get('/cache/imageNoLayoutCacheNoLayout')-> with('view_cache')->isCached(true)-> - checkResponseContent($image, 'image (no layout/action cache) in cache is not decorated when web_debug is on') -; + checkResponseContent($image, 'image (no layout/action cache) in cache is not decorated when web_debug is on'); sfConfig::set('sf_web_debug', false); // check stylesheets, javascripts inclusions @@ -394,8 +382,7 @@ public function launch() checkElement('#partial_slot_content', 'Partial')-> checkElement('#another_partial_slot_content', 'Another Partial')-> checkElement('#component_slot_content', 'Component')-> - end() -; + end(); $b-> get('/cache/partial')-> @@ -468,8 +455,7 @@ public function launch() checkElement('#partial_slot_content', '')-> checkElement('#another_partial_slot_content', '')-> checkElement('#component_slot_content', 'Component')-> - end() -; + end(); $b->get('/') ->with('view_cache')->isUriCached('cache/list', false) diff --git a/test/functional/filterTest.php b/test/functional/filterTest.php index 39930c10d..e1bd3c462 100644 --- a/test/functional/filterTest.php +++ b/test/functional/filterTest.php @@ -26,8 +26,7 @@ isStatusCode(200)-> checkElement('div[class="before"]', 1)-> checkElement('div[class="after"]', 1)-> - end() -; + end(); // filter with a forward in the same module $b-> @@ -40,5 +39,4 @@ isStatusCode(200)-> checkElement('div[class="before"]', 2)-> checkElement('div[class="after"]', 1)-> - end() -; + end(); diff --git a/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php b/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php index 52660cd15..ccea20685 100644 --- a/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php +++ b/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php @@ -2,7 +2,5 @@ class cacheConfiguration extends sfApplicationConfiguration { - public function configure() - { - } + public function configure() {} } diff --git a/test/functional/fixtures/apps/cache/lib/myUser.class.php b/test/functional/fixtures/apps/cache/lib/myUser.class.php index 4c793028e..ad920b971 100644 --- a/test/functional/fixtures/apps/cache/lib/myUser.class.php +++ b/test/functional/fixtures/apps/cache/lib/myUser.class.php @@ -1,5 +1,3 @@ getResponse()->setTitle('Param: '.$this->getRequestParameter('param')); } - public function executeMultiBis() - { - } + public function executeMultiBis() {} - public function executePartial() - { - } + public function executePartial() {} - public function executeAnotherPartial() - { - } + public function executeAnotherPartial() {} - public function executeComponent() - { - } + public function executeComponent() {} - public function executeSpecificCacheKey() - { - } + public function executeSpecificCacheKey() {} public function executeAction() { diff --git a/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php b/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php index a2639d4f0..1ac7fd13d 100644 --- a/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php +++ b/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php @@ -12,7 +12,5 @@ class nocacheActions extends sfActions /** * Executes index action. */ - public function executeIndex() - { - } + public function executeIndex() {} } diff --git a/test/functional/fixtures/apps/frontend/lib/myUser.class.php b/test/functional/fixtures/apps/frontend/lib/myUser.class.php index 4c793028e..ad920b971 100644 --- a/test/functional/fixtures/apps/frontend/lib/myUser.class.php +++ b/test/functional/fixtures/apps/frontend/lib/myUser.class.php @@ -1,5 +1,3 @@ redirect('browser/redirectTarget1'); } - public function executeRedirectTarget1() - { - } + public function executeRedirectTarget1() {} public function executeRedirect2() { diff --git a/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php index 2eaffc78d..7907f3ddb 100644 --- a/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php +++ b/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php @@ -9,7 +9,5 @@ */ class configFiltersSimpleFilterActions extends sfActions { - public function executeIndex() - { - } + public function executeIndex() {} } diff --git a/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php index 401423512..13d44d326 100644 --- a/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php +++ b/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php @@ -9,7 +9,5 @@ */ class configModuleDisabledActions extends sfActions { - public function executeIndex() - { - } + public function executeIndex() {} } diff --git a/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php index 65f183268..005c93896 100644 --- a/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php +++ b/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php @@ -9,7 +9,5 @@ */ class configSecurityIsSecureActions extends sfActions { - public function executeIndex() - { - } + public function executeIndex() {} } diff --git a/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php index 82e82f6b2..98c610bb5 100644 --- a/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php +++ b/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php @@ -9,7 +9,5 @@ */ class configSecurityIsSecureActionActions extends sfActions { - public function executeIndex() - { - } + public function executeIndex() {} } diff --git a/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php index c15812526..363542071 100644 --- a/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php +++ b/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php @@ -9,7 +9,5 @@ */ class configViewHasLayoutActions extends sfActions { - public function executeWithoutLayout() - { - } + public function executeWithoutLayout() {} } diff --git a/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php index 7bd56d590..9d2a25462 100644 --- a/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php +++ b/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php @@ -14,11 +14,7 @@ public function executeIndex() $this->setTemplate('foo'); } - public function executePlain() - { - } + public function executePlain() {} - public function executeImage() - { - } + public function executeImage() {} } diff --git a/test/functional/fixtures/apps/i18n/lib/myUser.class.php b/test/functional/fixtures/apps/i18n/lib/myUser.class.php index 4c793028e..ad920b971 100644 --- a/test/functional/fixtures/apps/i18n/lib/myUser.class.php +++ b/test/functional/fixtures/apps/i18n/lib/myUser.class.php @@ -1,5 +1,3 @@ /')-> matches('/Some js headers/')-> matches('/This is a js file/')-> - end() -; + end(); $b-> get('/format_test.css')-> @@ -42,8 +41,7 @@ isStatusCode(200)-> isHeader('content-type', 'text/css; charset=utf-8')-> matches('/This is a css file/')-> - end() -; + end(); $b-> get('/format_test')-> @@ -56,8 +54,7 @@ isStatusCode(200)-> isHeader('content-type', 'text/html; charset=utf-8')-> checkElement('body #content', 'This is an HTML file')-> - end() -; + end(); $b-> get('/format_test.xml')-> @@ -70,8 +67,7 @@ isStatusCode(200)-> isHeader('content-type', 'text/xml; charset=utf-8')-> checkElement('sentences sentence:first', 'This is a XML file')-> - end() -; + end(); $b-> get('/format_test.foo')-> @@ -85,8 +81,7 @@ isHeader('content-type', 'text/html; charset=utf-8')-> isHeader('x-foo', 'true')-> checkElement('body #content', 'This is an HTML file')-> - end() -; + end(); $b-> get('/format/js')-> @@ -99,8 +94,7 @@ isStatusCode(200)-> isHeader('content-type', 'application/javascript')-> matches('/A js file/')-> - end() -; + end(); $b-> setHttpHeader('User-Agent', 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3')-> @@ -115,10 +109,8 @@ isHeader('content-type', 'text/html; charset=utf-8')-> checkElement('#content', 'This is an HTML file for the iPhone')-> checkElement('link[href*="iphone.css"]')-> - end() -; + end(); $b-> getAndCheck('format', 'throwsException', null, 500)-> - throwsException('Exception', '/message/') -; + throwsException('Exception', '/message/'); diff --git a/test/functional/genericTest.php b/test/functional/genericTest.php index 1fcbcc250..964820cc1 100644 --- a/test/functional/genericTest.php +++ b/test/functional/genericTest.php @@ -24,14 +24,12 @@ checkElement('link[href="/css/main.css"]')-> checkElement('link[href="/css/multiple_media.css"][media="print,handheld"]')-> matches('#'.preg_quote('').'#')-> - end() -; + end(); // default 404 $b-> get('/nonexistant')-> - with('response')->isStatusCode(404) -; + with('response')->isStatusCode(404); /* $b-> get('/nonexistant/')-> @@ -60,16 +58,14 @@ with('response')->begin()-> isStatusCode(404)-> checkElement('body', '/404/')-> - end() -; + end(); sfConfig::set('sf_cache', false); sfConfig::set('sf_etag', false); // unexistant action $b-> get('/default/nonexistantaction')-> - with('response')->isStatusCode(404) -; + with('response')->isStatusCode(404); // module.yml: enabled $b-> @@ -82,8 +78,7 @@ checkElement('body', '/module is unavailable/i')-> checkElement('body', '!/congratulations/i')-> checkElement('link[href="/sf/sf_default/css/screen.css"]')-> - end() -; + end(); // view.yml: has_layout $b-> @@ -92,8 +87,7 @@ isStatusCode(200)-> checkElement('body', '/no layout/i')-> checkElement('head title', false)-> - end() -; + end(); // security.yml: is_secure $b-> @@ -108,8 +102,7 @@ // check that there is no double output caused by the forwarding in a filter checkElement('body', 1)-> checkElement('link[href="/sf/sf_default/css/screen.css"]')-> - end() -; + end(); // security.yml: case sensitivity $b-> @@ -120,8 +113,7 @@ with('response')->begin()-> isStatusCode(200)-> checkElement('body', '/Login Required/i')-> - end() -; + end(); $b-> get('/configSecurityIsSecureAction/Index')-> @@ -131,15 +123,13 @@ with('response')->begin()-> isStatusCode(200)-> checkElement('body', '/Login Required/i')-> - end() -; + end(); // Max forwards $b-> get('/configSettingsMaxForwards/selfForward')-> with('response')->isStatusCode(500)-> - throwsException(null, '/Too many forwards have been detected for this request/i') -; + throwsException(null, '/Too many forwards have been detected for this request/i'); // filters.yml: add a filter $b-> @@ -148,8 +138,7 @@ isStatusCode(200)-> checkElement('body', '/in a filter/i')-> checkElement('body', '!/congratulation/i')-> - end() -; + end(); // css and js inclusions $b-> @@ -158,8 +147,7 @@ isStatusCode(200)-> checkElement('head link[rel="stylesheet"]', false)-> checkElement('head script[type="text/javascript"]', false)-> - end() -; + end(); // libraries autoloading $b-> @@ -170,8 +158,7 @@ checkElement('#lib2', 'pong')-> checkElement('#lib3', 'pong')-> checkElement('#lib4', 'nopong')-> - end() -; + end(); // libraries autoloading in a plugin $b-> @@ -181,8 +168,7 @@ checkElement('#lib1', 'pong')-> checkElement('#lib2', 'pong')-> checkElement('#lib3', 'pong')-> - end() -; + end(); // renderText $b-> @@ -190,8 +176,7 @@ with('response')->begin()-> isStatusCode(200)-> matches('/foo/')-> - end() -; + end(); // view.yml when changing template $b-> @@ -200,8 +185,7 @@ isStatusCode(200)-> isHeader('Content-Type', 'text/html; charset=utf-8')-> checkElement('head title', 'foo title')-> - end() -; + end(); // view.yml with other than default content-type $b-> @@ -211,8 +195,7 @@ isStatusCode(200)-> matches('//')-> matches('/plaintext/')-> - end() -; + end(); // view.yml with other than default content-type and no layout $b-> @@ -221,8 +204,7 @@ isStatusCode(200)-> isHeader('Content-Type', 'image/jpg')-> matches('/image/')-> - end() -; + end(); // getPresentationFor() $b-> @@ -231,5 +213,4 @@ isStatusCode(200)-> checkElement('#foo', 'foo')-> checkElement('#foo_bis', 'foo')-> - end() -; + end(); diff --git a/test/functional/httpcacheTest.php b/test/functional/httpcacheTest.php index 0594310a5..a26b6e161 100644 --- a/test/functional/httpcacheTest.php +++ b/test/functional/httpcacheTest.php @@ -23,8 +23,7 @@ isHeader('ETag', true)-> isHeader('Expires', false)-> isHeader('Cache-Control', false)-> - end() -; + end(); $b-> info('Expiration (client_lifetime is 86400)')-> @@ -34,8 +33,7 @@ isHeader('ETag', false)-> isHeader('Expires', '/^'.substr(preg_quote(sfWebResponse::getDate(time() + 86400), '/'), 5, 16).'/')-> isHeader('Cache-Control', '/max-age=86400/')-> - end() -; + end(); $b-> info('Expiration (client_lifetime is 86400) but the developer has set a Last-Modified header')-> @@ -45,8 +43,7 @@ isHeader('ETag', false)-> isHeader('Expires', false)-> isHeader('Cache-Control', false)-> - end() -; + end(); $b-> info('No expiration and the developer has set a Last-Modified header')-> @@ -56,5 +53,4 @@ isHeader('ETag', true)-> isHeader('Expires', false)-> isHeader('Cache-Control', false)-> - end() -; + end(); diff --git a/test/functional/i18nFormTest.php b/test/functional/i18nFormTest.php index aa392642c..4f5d30ff1 100644 --- a/test/functional/i18nFormTest.php +++ b/test/functional/i18nFormTest.php @@ -35,8 +35,7 @@ with('response')->begin()-> checkElement('ul li', 'Required.', array('position' => 0))-> checkElement('ul li', 'foo/bar is an invalid email address', array('position' => 2))-> - end() -; + end(); // changed culture (fr) $b-> @@ -58,8 +57,7 @@ with('response')->begin()-> checkElement('ul li', 'Champ requis.', array('position' => 0))-> checkElement('ul li', 'foo/bar est une adresse email invalide', array('position' => 2))-> - end() -; + end(); // forms label custom catalogue test $b-> @@ -74,5 +72,4 @@ checkElement('label', 'Prénom!!!', array('position' => 0))-> checkElement('label', 'Nom!!!', array('position' => 1))-> checkElement('label', 'Adresse email!!!', array('position' => 2))-> - end() -; + end(); diff --git a/test/functional/i18nTest.php b/test/functional/i18nTest.php index 5b9ced072..615745a86 100644 --- a/test/functional/i18nTest.php +++ b/test/functional/i18nTest.php @@ -34,8 +34,7 @@ public function checkResponseForCulture($culture = 'fr') // messages in another module catalogue checkElement('#action_other_local', '/une autre phrase locale en français/i')-> checkElement('#template_other_local', '/une autre phrase locale en français/i')-> - end() - ; + end(); } } @@ -53,8 +52,7 @@ public function checkResponseForCulture($culture = 'fr') checkElement('#action', '/an english sentence/i')-> checkElement('#template', '/an english sentence/i')-> end()-> - with('user')->isCulture('en') -; + with('user')->isCulture('en'); $b-> get('/fr/i18n/index')-> @@ -64,8 +62,7 @@ public function checkResponseForCulture($culture = 'fr') end()-> with('response')->isStatusCode(200)-> with('user')->isCulture('fr')-> - checkResponseForCulture('fr') -; + checkResponseForCulture('fr'); // change user culture in the action $b-> @@ -76,8 +73,7 @@ public function checkResponseForCulture($culture = 'fr') end()-> with('response')->isStatusCode(200)-> with('user')->isCulture('fr')-> - checkResponseForCulture('fr') -; + checkResponseForCulture('fr'); // messages for a module plugin $b-> @@ -99,5 +95,4 @@ public function checkResponseForCulture($culture = 'fr') checkElement('#template_yetAnother', '/encore une autre phrase en français - from plugin but translation overridden in the application/i')-> checkElement('#action_testForPluginI18N', '/une phrase en français depuis un plugin - global/i')-> checkElement('#template_testForPluginI18N', '/une phrase en français depuis un plugin - global/i')-> - end() -; + end(); diff --git a/test/functional/prodTest.php b/test/functional/prodTest.php index cb50442dd..7a5757db5 100644 --- a/test/functional/prodTest.php +++ b/test/functional/prodTest.php @@ -26,8 +26,7 @@ with('response')->begin()-> isStatusCode(200)-> checkElement('body', '/congratulations/i')-> - end() -; + end(); // default main page (with cache) $b-> @@ -39,8 +38,7 @@ with('response')->begin()-> isStatusCode(200)-> checkElement('body', '/congratulations/i')-> - end() -; + end(); // 404 $b-> @@ -52,8 +50,7 @@ isStatusCode(404)-> checkElement('body', '!/congratulations/i')-> checkElement('link[href="/sf/sf_default/css/screen.css"]')-> - end() -; + end(); $b-> get('/nonexistant/')-> @@ -64,8 +61,7 @@ isStatusCode(404)-> checkElement('body', '!/congratulations/i')-> checkElement('link[href="/sf/sf_default/css/screen.css"]')-> - end() -; + end(); // unexistant action $b-> @@ -77,5 +73,4 @@ isStatusCode(404)-> checkElement('body', '!/congratulations/i')-> checkElement('link[href="/sf/sf_default/css/screen.css"]')-> - end() -; + end(); diff --git a/test/functional/sfTestBrowserTest.php b/test/functional/sfTestBrowserTest.php index 76c88a2ee..5aea35569 100644 --- a/test/functional/sfTestBrowserTest.php +++ b/test/functional/sfTestBrowserTest.php @@ -89,8 +89,7 @@ public function listen(sfEvent $event) isParameter('action', 'throwsSfException')-> end()-> with('response')->isStatusCode(500)-> - throwsException('sfException', 'sfException message') -; + throwsException('sfException', 'sfException message'); $b-> get('/browser')-> @@ -102,8 +101,7 @@ public function listen(sfEvent $event) get('/browser/text')-> with('response')->begin()-> matches('/text/')-> - end() -; + end(); try { $b->with('response')->checkElement('h1', 'text'); @@ -122,8 +120,7 @@ public function listen(sfEvent $event) isHeader('content-type', '!#text/html#')-> isHeader('foo', 'bar')-> isHeader('foo', 'foobar')-> - end() -; + end(); // cookies $b-> @@ -161,8 +158,7 @@ public function listen(sfEvent $event) hasCookie('foo', false)-> hasCookie('bar', false)-> end()-> - with('response')->checkElement('p', '.-') -; + with('response')->checkElement('p', '.-'); $b-> setCookie('foo', 'bar')-> @@ -211,8 +207,7 @@ public function listen(sfEvent $event) hasCookie('foo', false)-> hasCookie('bar', false)-> end()-> - with('response')->checkElement('p', '.-') -; + with('response')->checkElement('p', '.-'); $b-> get('/browser')-> @@ -220,8 +215,7 @@ public function listen(sfEvent $event) post('/browser')-> with('request')->isMethod('post')-> call('/browser', 'put')-> - with('request')->isMethod('put') -; + with('request')->isMethod('put'); // sfBrowser: clean the custom view templates $b-> @@ -232,8 +226,7 @@ public function listen(sfEvent $event) with('response')->checkElement('#test', 'template 1')-> get('/browser/templateCustom')-> - with('response')->checkElement('#test', 'template') -; + with('response')->checkElement('#test', 'template'); $b ->getAndCheck('browser', 'redirect1', null, 302) diff --git a/test/other/fixtures/task/myPluginTask.class.php b/test/other/fixtures/task/myPluginTask.class.php index 4bd4628a9..af7b2ac7c 100644 --- a/test/other/fixtures/task/myPluginTask.class.php +++ b/test/other/fixtures/task/myPluginTask.class.php @@ -8,7 +8,5 @@ public function configure() $this->name = 'run'; } - public function execute($arguments = array(), $options = array()) - { - } + public function execute($arguments = array(), $options = array()) {} } diff --git a/test/unit/action/sfComponentTest.php b/test/unit/action/sfComponentTest.php index 215245b0e..b62b4e5d1 100644 --- a/test/unit/action/sfComponentTest.php +++ b/test/unit/action/sfComponentTest.php @@ -18,9 +18,7 @@ class myComponent extends sfComponent { - public function execute($request) - { - } + public function execute($request) {} } $context = sfContext::getInstance(array( diff --git a/test/unit/addon/sfPagerTest.php b/test/unit/addon/sfPagerTest.php index 7b5df6286..6712298c4 100644 --- a/test/unit/addon/sfPagerTest.php +++ b/test/unit/addon/sfPagerTest.php @@ -13,13 +13,9 @@ $t = new lime_test(2); class myPager extends sfPager { - public function init() - { - } + public function init() {} - public function retrieveObject($offset) - { - } + public function retrieveObject($offset) {} public function getResults() { diff --git a/test/unit/cache/sfCacheTest.php b/test/unit/cache/sfCacheTest.php index 4f6dfe76f..668793bcd 100644 --- a/test/unit/cache/sfCacheTest.php +++ b/test/unit/cache/sfCacheTest.php @@ -12,42 +12,24 @@ class myCache extends sfCache { - public function get($key, $default = null) - { - } + public function get($key, $default = null) {} - public function has($key) - { - } + public function has($key) {} - public function set($key, $data, $lifetime = null) - { - } + public function set($key, $data, $lifetime = null) {} - public function remove($key) - { - } + public function remove($key) {} - public function clean($mode = sfCache::ALL) - { - } + public function clean($mode = sfCache::ALL) {} - public function getTimeout($key) - { - } + public function getTimeout($key) {} - public function getLastModified($key) - { - } + public function getLastModified($key) {} - public function removePattern($pattern, $delimiter = ':') - { - } + public function removePattern($pattern, $delimiter = ':') {} } -class fakeCache -{ -} +class fakeCache {} $t = new lime_test(1); diff --git a/test/unit/config/sfConfigHandlerTest.php b/test/unit/config/sfConfigHandlerTest.php index f04a4d2c8..da6cd449a 100644 --- a/test/unit/config/sfConfigHandlerTest.php +++ b/test/unit/config/sfConfigHandlerTest.php @@ -14,9 +14,7 @@ class myConfigHandler extends sfConfigHandler { - public function execute($configFiles) - { - } + public function execute($configFiles) {} } $config = new myConfigHandler(); diff --git a/test/unit/config/sfYamlConfigHandlerTest.php b/test/unit/config/sfYamlConfigHandlerTest.php index caf09e976..4d204ca32 100644 --- a/test/unit/config/sfYamlConfigHandlerTest.php +++ b/test/unit/config/sfYamlConfigHandlerTest.php @@ -16,9 +16,7 @@ class myConfigHandler extends sfYamlConfigHandler { public $yamlConfig; - public function execute($configFiles) - { - } + public function execute($configFiles) {} public static function parseYamls($configFiles) { diff --git a/test/unit/controller/sfControllerTest.php b/test/unit/controller/sfControllerTest.php index 4ab303491..61f562928 100644 --- a/test/unit/controller/sfControllerTest.php +++ b/test/unit/controller/sfControllerTest.php @@ -16,9 +16,7 @@ class myController extends sfController { - public function execute() - { - } + public function execute() {} } $context = sfContext::getInstance(); diff --git a/test/unit/controller/sfWebControllerTest.php b/test/unit/controller/sfWebControllerTest.php index 9b90bb709..db3e7e998 100644 --- a/test/unit/controller/sfWebControllerTest.php +++ b/test/unit/controller/sfWebControllerTest.php @@ -18,13 +18,9 @@ class myWebResponse extends sfWebResponse { - public function sendHttpHeaders() - { - } + public function sendHttpHeaders() {} - public function send() - { - } + public function send() {} } $_SERVER['HTTP_HOST'] = 'localhost'; diff --git a/test/unit/database/sfDatabaseTest.php b/test/unit/database/sfDatabaseTest.php index 7a0ab91d0..9ce8d376c 100644 --- a/test/unit/database/sfDatabaseTest.php +++ b/test/unit/database/sfDatabaseTest.php @@ -16,13 +16,9 @@ class myDatabase extends sfDatabase { - public function connect() - { - } + public function connect() {} - public function shutdown() - { - } + public function shutdown() {} } $context = sfContext::getInstance(); diff --git a/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php b/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php index 874534574..471a9b5b3 100644 --- a/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php +++ b/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php @@ -24,9 +24,7 @@ require_once __DIR__.'/../../../lib/config/sfConfig.class.php'; -class sfException extends Exception -{ -} +class sfException extends Exception {} sfConfig::set('sf_charset', 'UTF-8'); diff --git a/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php b/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php index c818d7a96..7e1bfeaf0 100644 --- a/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php +++ b/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php @@ -24,9 +24,7 @@ require_once __DIR__.'/../../../lib/config/sfConfig.class.php'; -class sfException extends Exception -{ -} +class sfException extends Exception {} sfConfig::set('sf_charset', 'UTF-8'); @@ -71,9 +69,7 @@ public function getTitles() $t->skip('->__toString() is compatible with SimpleXMLElement'); } -class Foo -{ -} +class Foo {} class FooCountable implements Countable { diff --git a/test/unit/escaper/sfOutputEscaperTest.php b/test/unit/escaper/sfOutputEscaperTest.php index a01c07794..9288d2425 100644 --- a/test/unit/escaper/sfOutputEscaperTest.php +++ b/test/unit/escaper/sfOutputEscaperTest.php @@ -47,9 +47,7 @@ public function getTitleTitle() } } -class OutputEscaperTestClassChild extends OutputEscaperTestClass -{ -} +class OutputEscaperTestClassChild extends OutputEscaperTestClass {} // ::escape() $t->diag('::escape()'); diff --git a/test/unit/generator/sfGeneratorTest.php b/test/unit/generator/sfGeneratorTest.php index e2f48bd1c..3dbaf796c 100644 --- a/test/unit/generator/sfGeneratorTest.php +++ b/test/unit/generator/sfGeneratorTest.php @@ -14,14 +14,10 @@ class myGenerator extends sfGenerator { - public function generate($params = array()) - { - } + public function generate($params = array()) {} } -class ProjectConfiguration extends sfProjectConfiguration -{ -} +class ProjectConfiguration extends sfProjectConfiguration {} $manager = new sfGeneratorManager(new ProjectConfiguration()); $generator = new myGenerator($manager); diff --git a/test/unit/helper/PartialHelperTest.php b/test/unit/helper/PartialHelperTest.php index aeaaf915e..580fb157b 100644 --- a/test/unit/helper/PartialHelperTest.php +++ b/test/unit/helper/PartialHelperTest.php @@ -25,13 +25,9 @@ public function render() return '==RENDERED=='; } - public function initialize($context, $moduleName, $actionName, $viewName) - { - } + public function initialize($context, $moduleName, $actionName, $viewName) {} - public function setPartialVars(array $partialVars) - { - } + public function setPartialVars(array $partialVars) {} } $t->diag('get_partial()'); diff --git a/test/unit/helper/UrlHelperTest.php b/test/unit/helper/UrlHelperTest.php index e4a746055..9799296e6 100644 --- a/test/unit/helper/UrlHelperTest.php +++ b/test/unit/helper/UrlHelperTest.php @@ -87,9 +87,7 @@ public function getCSRFToken($secret = null) $t->is(button_to('test', '@homepage', 'popup=true confirm=really?'), '', 'button_to() works with confirm and popup option'); $t->like(button_to('test', '@homepage', array('method' => 'post')), '/==TOKEN==/', 'button_to() includes CSRF token from BaseForm'); -class testObject -{ -} +class testObject {} try { $o1 = new testObject(); diff --git a/test/unit/i18n/extract/sfI18nExtractTest.php b/test/unit/i18n/extract/sfI18nExtractTest.php index ba519c3b9..65eac36c5 100644 --- a/test/unit/i18n/extract/sfI18nExtractTest.php +++ b/test/unit/i18n/extract/sfI18nExtractTest.php @@ -12,9 +12,7 @@ $t = new lime_test(3); -class ProjectConfiguration extends sfProjectConfiguration -{ -} +class ProjectConfiguration extends sfProjectConfiguration {} class TestConfiguration extends sfApplicationConfiguration { diff --git a/test/unit/i18n/sfI18NTest.php b/test/unit/i18n/sfI18NTest.php index a1ea000bf..82bcf8b51 100644 --- a/test/unit/i18n/sfI18NTest.php +++ b/test/unit/i18n/sfI18NTest.php @@ -12,9 +12,7 @@ $t = new lime_test(34); -class ProjectConfiguration extends sfProjectConfiguration -{ -} +class ProjectConfiguration extends sfProjectConfiguration {} class TestConfiguration extends sfApplicationConfiguration { diff --git a/test/unit/i18n/sfMessageSourceTest.php b/test/unit/i18n/sfMessageSourceTest.php index 7e38efbbf..c81e9a5f6 100644 --- a/test/unit/i18n/sfMessageSourceTest.php +++ b/test/unit/i18n/sfMessageSourceTest.php @@ -14,29 +14,17 @@ class sfMessageSource_Simple extends sfMessageSource { - public function __construct($source) - { - } + public function __construct($source) {} - public function delete($message, $catalogue = 'messages') - { - } + public function delete($message, $catalogue = 'messages') {} - public function update($text, $target, $comments, $catalogue = 'messages') - { - } + public function update($text, $target, $comments, $catalogue = 'messages') {} - public function catalogues() - { - } + public function catalogues() {} - public function save($catalogue = 'messages') - { - } + public function save($catalogue = 'messages') {} - public function getId() - { - } + public function getId() {} } // ::factory() diff --git a/test/unit/i18n/sfMessageSource_FileTest.php b/test/unit/i18n/sfMessageSource_FileTest.php index 1d963717d..c4415fdff 100644 --- a/test/unit/i18n/sfMessageSource_FileTest.php +++ b/test/unit/i18n/sfMessageSource_FileTest.php @@ -16,17 +16,11 @@ class sfMessageSource_Simple extends sfMessageSource_File { protected $dataExt = '.xml'; - public function delete($message, $catalogue = 'messages') - { - } + public function delete($message, $catalogue = 'messages') {} - public function update($text, $target, $comments, $catalogue = 'messages') - { - } + public function update($text, $target, $comments, $catalogue = 'messages') {} - public function save($catalogue = 'messages') - { - } + public function save($catalogue = 'messages') {} public function getCatalogueByDir($catalogue) { diff --git a/test/unit/log/sfLoggerTest.php b/test/unit/log/sfLoggerTest.php index 36ed81572..7aa352332 100644 --- a/test/unit/log/sfLoggerTest.php +++ b/test/unit/log/sfLoggerTest.php @@ -22,9 +22,7 @@ protected function doLog($message, $priority) } } -class notaLogger -{ -} +class notaLogger {} $dispatcher = new sfEventDispatcher(); $logger = new myLogger($dispatcher, array('log_dir_name' => '/tmp')); diff --git a/test/unit/mailer/fixtures/TestMailMessage.class.php b/test/unit/mailer/fixtures/TestMailMessage.class.php index 1e43fc076..7a97cd1a7 100644 --- a/test/unit/mailer/fixtures/TestMailMessage.class.php +++ b/test/unit/mailer/fixtures/TestMailMessage.class.php @@ -9,11 +9,7 @@ */ class TestMailMessage { - public function setMessage(Swift_Mime_Message $message) - { - } + public function setMessage(Swift_Mime_Message $message) {} - public function getMessage() - { - } + public function getMessage() {} } diff --git a/test/unit/mailer/fixtures/TestMailerTransport.class.php b/test/unit/mailer/fixtures/TestMailerTransport.class.php index bcb8f43bd..c714b6088 100644 --- a/test/unit/mailer/fixtures/TestMailerTransport.class.php +++ b/test/unit/mailer/fixtures/TestMailerTransport.class.php @@ -34,9 +34,7 @@ public function stop() $this->started = false; } - public function registerPlugin(Swift_Events_EventListener $plugin) - { - } + public function registerPlugin(Swift_Events_EventListener $plugin) {} public function setFoo($foo) { diff --git a/test/unit/mailer/fixtures/TestSpool.class.php b/test/unit/mailer/fixtures/TestSpool.class.php index f0a80ec00..39a4e87b5 100644 --- a/test/unit/mailer/fixtures/TestSpool.class.php +++ b/test/unit/mailer/fixtures/TestSpool.class.php @@ -11,22 +11,16 @@ class TestSpool implements Swift_Spool { protected $messages = array(); - public function __construct() - { - } + public function __construct() {} public function isStarted() { return true; } - public function start() - { - } + public function start() {} - public function stop() - { - } + public function stop() {} public function queueMessage(Swift_Mime_Message $message) { diff --git a/test/unit/plugin/sfPearDownloaderTest.class.php b/test/unit/plugin/sfPearDownloaderTest.class.php index 3061be907..45094e94a 100644 --- a/test/unit/plugin/sfPearDownloaderTest.class.php +++ b/test/unit/plugin/sfPearDownloaderTest.class.php @@ -26,13 +26,8 @@ class sfPearDownloaderTest extends sfPearDownloader /** * @see PEAR_REST::downloadHttp() * - * @param mixed $url - * @param mixed $ui - * @param mixed $save_dir * @param mixed|null $callback * @param mixed|null $lastmodified - * @param mixed $accept - * @param mixed $channel */ public function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null, $accept = false, $channel = false) { diff --git a/test/unit/plugin/sfPearRestTest.class.php b/test/unit/plugin/sfPearRestTest.class.php index b7b126336..133bbf358 100644 --- a/test/unit/plugin/sfPearRestTest.class.php +++ b/test/unit/plugin/sfPearRestTest.class.php @@ -24,10 +24,7 @@ class sfPearRestTest extends sfPearRest /** * @see PEAR_REST::downloadHttp() * - * @param mixed $url * @param mixed|null $lastmodified - * @param mixed $accept - * @param mixed $channel */ public function downloadHttp($url, $lastmodified = null, $accept = false, $channel = false) { diff --git a/test/unit/request/sfRequestTest.php b/test/unit/request/sfRequestTest.php index e816325f9..518a63f95 100755 --- a/test/unit/request/sfRequestTest.php +++ b/test/unit/request/sfRequestTest.php @@ -18,9 +18,7 @@ public function getEventDispatcher() } } -class fakeRequest -{ -} +class fakeRequest {} $t = new lime_test(41); diff --git a/test/unit/response/sfResponseTest.php b/test/unit/response/sfResponseTest.php index 997b2d800..5f219e5bd 100644 --- a/test/unit/response/sfResponseTest.php +++ b/test/unit/response/sfResponseTest.php @@ -12,26 +12,16 @@ class myResponse extends sfResponse { - public function __serialize() - { - } + public function __serialize() {} - public function __unserialize($data) - { - } + public function __unserialize($data) {} - public function serialize() - { - } + public function serialize() {} - public function unserialize($serialized) - { - } + public function unserialize($serialized) {} } -class fakeResponse -{ -} +class fakeResponse {} $t = new lime_test(8); diff --git a/test/unit/service/fixtures/containers/container10.php b/test/unit/service/fixtures/containers/container10.php index 99b200a34..6a8555c33 100644 --- a/test/unit/service/fixtures/containers/container10.php +++ b/test/unit/service/fixtures/containers/container10.php @@ -5,7 +5,6 @@ $container = new sfServiceContainerBuilder(); $container-> register('foo', 'FooClass')-> - addArgument(new sfServiceReference('bar')) -; + addArgument(new sfServiceReference('bar')); return $container; diff --git a/test/unit/service/fixtures/containers/container9.php b/test/unit/service/fixtures/containers/container9.php index fc72a46a7..1728e6d6b 100644 --- a/test/unit/service/fixtures/containers/container9.php +++ b/test/unit/service/fixtures/containers/container9.php @@ -11,19 +11,16 @@ setShared(false)-> addMethodCall('setBar', array('bar'))-> addMethodCall('initialize')-> - setConfigurator('sc_configure') -; + setConfigurator('sc_configure'); $container-> register('bar', 'FooClass')-> setArguments(array('foo', new sfServiceReference('foo.baz'), new sfServiceParameter('foo_bar')))-> setShared(true)-> - setConfigurator(array(new sfServiceReference('foo.baz'), 'configure')) -; + setConfigurator(array(new sfServiceReference('foo.baz'), 'configure')); $container-> register('foo.baz', '%baz_class%')-> setConstructor('getInstance')-> - setConfigurator(array('%baz_class%', 'configureStatic1')) -; + setConfigurator(array('%baz_class%', 'configureStatic1')); $container->register('foo_bar', 'FooClass'); $container->setParameters(array( 'baz_class' => 'BazClass', diff --git a/test/unit/service/fixtures/includes/classes.php b/test/unit/service/fixtures/includes/classes.php index f7a3290f7..3b6cd0931 100644 --- a/test/unit/service/fixtures/includes/classes.php +++ b/test/unit/service/fixtures/includes/classes.php @@ -5,9 +5,7 @@ function sc_configure($instance) $instance->configure(); } -class BarClass -{ -} +class BarClass {} class BazClass { @@ -26,7 +24,5 @@ public static function configureStatic($instance) $instance->configure(); } - public static function configureStatic1() - { - } + public static function configureStatic1() {} } diff --git a/test/unit/service/sfServiceContainerDumperTest.php b/test/unit/service/sfServiceContainerDumperTest.php index b482aa0d3..420bbafca 100644 --- a/test/unit/service/sfServiceContainerDumperTest.php +++ b/test/unit/service/sfServiceContainerDumperTest.php @@ -12,9 +12,7 @@ $t = new lime_test(1); -class ProjectDumper extends sfServiceContainerDumper -{ -} +class ProjectDumper extends sfServiceContainerDumper {} $builder = new sfServiceContainerBuilder(); $dumper = new ProjectDumper($builder); diff --git a/test/unit/sfNoRouting.class.php b/test/unit/sfNoRouting.class.php index 724387f47..71cdb4170 100644 --- a/test/unit/sfNoRouting.class.php +++ b/test/unit/sfNoRouting.class.php @@ -19,8 +19,6 @@ class sfNoRouting extends sfRouting { /** * @see sfRouting - * - * @param mixed $with_route_name */ public function getCurrentInternalUri($with_route_name = false) { @@ -37,10 +35,6 @@ public function getCurrentInternalUri($with_route_name = false) /** * @see sfRouting - * - * @param mixed $name - * @param mixed $params - * @param mixed $absolute */ public function generate($name, $params = array(), $absolute = false) { @@ -59,8 +53,6 @@ public function generate($name, $params = array(), $absolute = false) /** * @see sfRouting - * - * @param mixed $url */ public function parse($url) { @@ -77,8 +69,6 @@ public function getRoutes() /** * @see sfRouting - * - * @param mixed $name */ public function getRoute($name) { @@ -87,8 +77,6 @@ public function getRoute($name) /** * @see sfRouting - * - * @param mixed $routes */ public function setRoutes($routes) { @@ -106,9 +94,7 @@ public function hasRoutes() /** * @see sfRouting */ - public function clearRoutes() - { - } + public function clearRoutes() {} protected function mergeArrays($arr1, $arr2) { diff --git a/test/unit/storage/sfStorageTest.php b/test/unit/storage/sfStorageTest.php index 6ba8fcec1..a3f76105e 100644 --- a/test/unit/storage/sfStorageTest.php +++ b/test/unit/storage/sfStorageTest.php @@ -14,27 +14,15 @@ class myStorage extends sfStorage { - public function read($key) - { - } + public function read($key) {} - public function remove($key) - { - } + public function remove($key) {} - public function shutdown() - { - } + public function shutdown() {} - public function write($key, $data) - { - } + public function write($key, $data) {} - public function regenerate($destroy = false) - { - } + public function regenerate($destroy = false) {} } -class fakeStorage -{ -} +class fakeStorage {} diff --git a/test/unit/task/sfBaseTaskTest.php b/test/unit/task/sfBaseTaskTest.php index 7da390a11..d04039085 100644 --- a/test/unit/task/sfBaseTaskTest.php +++ b/test/unit/task/sfBaseTaskTest.php @@ -24,9 +24,7 @@ public function initializeAutoload(sfProjectConfiguration $configuration, $reloa parent::initializeAutoload($configuration, $reload); } - protected function execute($arguments = array(), $options = array()) - { - } + protected function execute($arguments = array(), $options = array()) {} } $rootDir = __DIR__.'/../../functional/fixtures'; diff --git a/test/unit/test/sfTestFunctionalTest.php b/test/unit/test/sfTestFunctionalTest.php index 509f97182..45e9b1372 100644 --- a/test/unit/test/sfTestFunctionalTest.php +++ b/test/unit/test/sfTestFunctionalTest.php @@ -25,9 +25,7 @@ public function setResponseContent($content) class mockLime extends lime_test { - public function __destruct() - { - } + public function __destruct() {} } class mockTestFunctional extends sfTestFunctional diff --git a/test/unit/util/sfBrowserTest.php b/test/unit/util/sfBrowserTest.php index a3b1ef50f..137c2d43e 100755 --- a/test/unit/util/sfBrowserTest.php +++ b/test/unit/util/sfBrowserTest.php @@ -270,8 +270,7 @@ public function getDefaultServerArray($name) setField('myarray[0]', 'value0')-> setField('myarray[1]', 'value1')-> setField('myarray[2]', 'value2')-> - click('submit') -; + click('submit'); $t->is($parameters['text_default_value'], 'myvalue', '->setField() overrides default form field values'); $t->is($parameters['text'], 'myothervalue', '->setField() overrides default form field values'); $t->is($parameters['article']['title'], 'mytitle', '->setField() overrides default form field values'); @@ -280,8 +279,7 @@ public function getDefaultServerArray($name) list($method, $uri, $parameters) = $b-> setField('text_default_value', 'myvalue')-> setField('text', 'myothervalue')-> - click('submit', array('text_default_value' => 'yourvalue', 'text' => 'yourothervalue')) -; + click('submit', array('text_default_value' => 'yourvalue', 'text' => 'yourothervalue')); $t->is($parameters['text_default_value'], 'yourvalue', '->setField() is overriden by parameters from click call'); $t->is($parameters['text'], 'yourothervalue', '->setField() is overriden by parameters from click call'); @@ -291,15 +289,13 @@ public function getDefaultServerArray($name) deselect('checkbox1')-> select('checkbox3')-> select('b-radio')-> - click('submit') -; + click('submit'); $t->is(isset($parameters['checkbox1']), false, '->deselect() unckecks a checkbox'); $t->is(isset($parameters['checkbox3']), true, '->select() ckecks a checkbox'); $t->is($parameters['radio1'], 'b', '->select() selects a radiobutton'); list($method, $uri, $parameters) = $b-> select('a-radio')-> - click('submit') -; + click('submit'); $t->is($parameters['radio1'], 'a', '->select() toggles radiobuttons'); try { diff --git a/test/unit/util/sfContextTest.php b/test/unit/util/sfContextTest.php index 27746aac1..7acafc492 100644 --- a/test/unit/util/sfContextTest.php +++ b/test/unit/util/sfContextTest.php @@ -14,9 +14,7 @@ class myContext extends sfContext { - public function initialize(sfApplicationConfiguration $configuration) - { - } + public function initialize(sfApplicationConfiguration $configuration) {} } /* diff --git a/test/unit/validator/sfValidatorFileTest.php b/test/unit/validator/sfValidatorFileTest.php index ae34001cd..be9457fc0 100755 --- a/test/unit/validator/sfValidatorFileTest.php +++ b/test/unit/validator/sfValidatorFileTest.php @@ -124,9 +124,7 @@ public function getMimeTypesFromCategory($category) $t->is($f->getSize(), strlen($content), '->clean() returns a sfValidatedFile with a computed file size if the size is not passed in the initial value'); $t->is($f->getType(), 'text/plain', '->clean() returns a sfValidatedFile with a guessed content type'); -class myValidatedFile extends sfValidatedFile -{ -} +class myValidatedFile extends sfValidatedFile {} $v->setOption('validated_file_class', 'myValidatedFile'); $f = $v->clean(array('tmp_name' => $tmpDir.'/test.txt')); diff --git a/test/unit/view/sfViewCacheManagerTest.php b/test/unit/view/sfViewCacheManagerTest.php index 24f004c57..aa8fd7328 100644 --- a/test/unit/view/sfViewCacheManagerTest.php +++ b/test/unit/view/sfViewCacheManagerTest.php @@ -34,14 +34,10 @@ function get_cache_config($contextual = false) class myViewCacheManager extends sfViewCacheManager { - public function registerConfiguration($moduleName) - { - } + public function registerConfiguration($moduleName) {} } -class myController extends sfWebController -{ -} +class myController extends sfWebController {} class myRequest { @@ -72,9 +68,7 @@ class myCache extends sfCache { public static $cache = array(); - public function initialize($parameters = array()) - { - } + public function initialize($parameters = array()) {} public function get($key, $default = null) { diff --git a/test/unit/view/sfViewTest.php b/test/unit/view/sfViewTest.php index 69e8b1d7e..8ddaf99ae 100644 --- a/test/unit/view/sfViewTest.php +++ b/test/unit/view/sfViewTest.php @@ -16,21 +16,13 @@ class myView extends sfView { - public function execute() - { - } + public function execute() {} - public function configure() - { - } + public function configure() {} - public function getEngine() - { - } + public function getEngine() {} - public function render() - { - } + public function render() {} } class configuredView extends myView diff --git a/test/unit/widget/sfWidgetFormChoiceTest.php b/test/unit/widget/sfWidgetFormChoiceTest.php index 86a5f02c6..2a6f5ae53 100644 --- a/test/unit/widget/sfWidgetFormChoiceTest.php +++ b/test/unit/widget/sfWidgetFormChoiceTest.php @@ -12,9 +12,7 @@ class FormFormatterStub extends sfWidgetFormSchemaFormatter { - public function __construct() - { - } + public function __construct() {} public function translate($subject, $parameters = array()) { diff --git a/test/unit/widget/sfWidgetFormDateRangeTest.php b/test/unit/widget/sfWidgetFormDateRangeTest.php index 5e273bdbb..2b23f94a4 100644 --- a/test/unit/widget/sfWidgetFormDateRangeTest.php +++ b/test/unit/widget/sfWidgetFormDateRangeTest.php @@ -14,9 +14,7 @@ class FormFormatterMock extends sfWidgetFormSchemaFormatter { public $translateSubjects = array(); - public function __construct() - { - } + public function __construct() {} public function translate($subject, $parameters = array()) { @@ -28,9 +26,7 @@ public function translate($subject, $parameters = array()) class WidgetFormStub extends sfWidget { - public function __construct() - { - } + public function __construct() {} public function render($name, $value = null, $attributes = array(), $errors = array()) { diff --git a/test/unit/widget/sfWidgetFormFilterDateTest.php b/test/unit/widget/sfWidgetFormFilterDateTest.php index 653fdad05..40bf6b492 100644 --- a/test/unit/widget/sfWidgetFormFilterDateTest.php +++ b/test/unit/widget/sfWidgetFormFilterDateTest.php @@ -12,9 +12,7 @@ class FormFormatterStub extends sfWidgetFormSchemaFormatter { - public function __construct() - { - } + public function __construct() {} public function translate($subject, $parameters = array()) { @@ -24,9 +22,7 @@ public function translate($subject, $parameters = array()) class WidgetFormStub extends sfWidget { - public function __construct() - { - } + public function __construct() {} public function render($name, $value = null, $attributes = array(), $errors = array()) { diff --git a/test/unit/widget/sfWidgetFormFilterInputTest.php b/test/unit/widget/sfWidgetFormFilterInputTest.php index 0b2fbd7d5..08b0962ef 100644 --- a/test/unit/widget/sfWidgetFormFilterInputTest.php +++ b/test/unit/widget/sfWidgetFormFilterInputTest.php @@ -12,9 +12,7 @@ class FormFormatterStub extends sfWidgetFormSchemaFormatter { - public function __construct() - { - } + public function __construct() {} public function translate($subject, $parameters = array()) { diff --git a/test/unit/widget/sfWidgetFormInputFileEditableTest.php b/test/unit/widget/sfWidgetFormInputFileEditableTest.php index 6978b74f4..694d16f51 100644 --- a/test/unit/widget/sfWidgetFormInputFileEditableTest.php +++ b/test/unit/widget/sfWidgetFormInputFileEditableTest.php @@ -12,9 +12,7 @@ class FormFormatterStub extends sfWidgetFormSchemaFormatter { - public function __construct() - { - } + public function __construct() {} public function translate($subject, $parameters = array()) { diff --git a/test/unit/widget/sfWidgetFormSchemaFormatterTest.php b/test/unit/widget/sfWidgetFormSchemaFormatterTest.php index 398157797..876de73ab 100644 --- a/test/unit/widget/sfWidgetFormSchemaFormatterTest.php +++ b/test/unit/widget/sfWidgetFormSchemaFormatterTest.php @@ -143,9 +143,7 @@ public static function __($string) $t->is($f->generateLabel('last_name'), '', '->generateLabelName() returns a i18ned label tag'); // ->setTranslationCatalogue() ->getTranslationCatalogue() -class MyFormatter2 extends sfWidgetFormSchemaFormatter -{ -} +class MyFormatter2 extends sfWidgetFormSchemaFormatter {} $f = new MyFormatter2(new sfWidgetFormSchema(array())); $f->setTranslationCatalogue('foo'); diff --git a/test/unit/widget/sfWidgetFormSelectCheckboxTest.php b/test/unit/widget/sfWidgetFormSelectCheckboxTest.php index c0a0a6f89..0dcaa565e 100644 --- a/test/unit/widget/sfWidgetFormSelectCheckboxTest.php +++ b/test/unit/widget/sfWidgetFormSelectCheckboxTest.php @@ -12,9 +12,7 @@ class FormFormatterStub extends sfWidgetFormSchemaFormatter { - public function __construct() - { - } + public function __construct() {} public function translate($subject, $parameters = array()) { diff --git a/test/unit/widget/sfWidgetFormSelectRadioTest.php b/test/unit/widget/sfWidgetFormSelectRadioTest.php index cc2a4d710..a5ba5ea0a 100644 --- a/test/unit/widget/sfWidgetFormSelectRadioTest.php +++ b/test/unit/widget/sfWidgetFormSelectRadioTest.php @@ -12,9 +12,7 @@ class FormFormatterStub extends sfWidgetFormSchemaFormatter { - public function __construct() - { - } + public function __construct() {} public function translate($subject, $parameters = array()) { diff --git a/test/unit/widget/sfWidgetFormSelectTest.php b/test/unit/widget/sfWidgetFormSelectTest.php index d3668963c..578be108e 100644 --- a/test/unit/widget/sfWidgetFormSelectTest.php +++ b/test/unit/widget/sfWidgetFormSelectTest.php @@ -12,9 +12,7 @@ class FormFormatterStub extends sfWidgetFormSchemaFormatter { - public function __construct() - { - } + public function __construct() {} public function translate($subject, $parameters = array()) {