diff --git a/.ddev/commands/web/localdev b/.ddev/commands/web/localdev new file mode 100755 index 00000000000..6d67d3ac980 --- /dev/null +++ b/.ddev/commands/web/localdev @@ -0,0 +1,19 @@ +#!/bin/bash + +## Description: create local development directory +## Usage: localdev +## Example: ddev localdev + +if [ ! -d ".localdev/" ] +then + mkdir ".localdev/" + echo "Directory created." +fi + +if ! grep -q "./.localdev/*" composer.json; then + php vendor/bin/composer config repositories.local '{"type": "path", "url": "./.localdev/*", "canonical": false}' + echo "Patched composer.json." +fi + +cd ".localdev/" || exit +git clone "$@" diff --git a/.ddev/commands/web/phpunit b/.ddev/commands/web/phpunit new file mode 100755 index 00000000000..40352e7b153 --- /dev/null +++ b/.ddev/commands/web/phpunit @@ -0,0 +1,7 @@ +#!/bin/bash + +## Description: run PHPUnit +## Usage: phpunit +## Example: ddev phpunit + +php vendor/bin/phpunit --no-coverage "$@" --testdox diff --git a/.ddev/commands/web/phpunit-coverage b/.ddev/commands/web/phpunit-coverage new file mode 100755 index 00000000000..c0971c51e6c --- /dev/null +++ b/.ddev/commands/web/phpunit-coverage @@ -0,0 +1,9 @@ +#!/bin/bash + +## Description: run PHPUnit with coverage +## Usage: phpunit-coverage +## Example: ddev phpunit-coverage + +enable_xdebug +XDEBUG_MODE=coverage php vendor/bin/phpunit --testdox +disable_xdebug \ No newline at end of file diff --git a/.ddev/commands/web/phpunit-coverage-local b/.ddev/commands/web/phpunit-coverage-local new file mode 100755 index 00000000000..ce6c0987a5c --- /dev/null +++ b/.ddev/commands/web/phpunit-coverage-local @@ -0,0 +1,9 @@ +#!/bin/bash + +## Description: run PHPUnit with local HTML coverage +## Usage: phpunit-coverage-local +## Example: ddev phpunit-coverage-local + +enable_xdebug +XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-html build/coverage --testdox +disable_xdebug \ No newline at end of file diff --git a/.ddev/commands/web/rector b/.ddev/commands/web/rector index 05ec4689d58..1189ce12807 100755 --- a/.ddev/commands/web/rector +++ b/.ddev/commands/web/rector @@ -4,5 +4,4 @@ ## Usage: rector ## Example: ddev rector -cp -n vendor/sreichel/openmage-rector/rector.php rector.php php vendor/bin/rector process "$@" diff --git a/.gitattributes b/.gitattributes index a54ca6bcb41..e000b8e4c36 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,6 +3,7 @@ /.github export-ignore /dev export-ignore /docs export-ignore +/tests export-ignore /.all-contributorsrc export-ignore /.gitattributes export-ignore @@ -14,9 +15,9 @@ /.phpcs.php.xml.dist export-ignore /.phpcs.xml.dist export-ignore /.phpmd.dist.xml export-ignore -/phpstan.dist.baseline.neon export-ignore -/phpstan.dist.issues.neon export-ignore -/phpstan.dist.neon export-ignore +/.phpstan.dist.baseline.neon export-ignore +/.phpstan.dist.neon export-ignore +/rector.php export-ignore /README.md export-ignore diff --git a/.github/labeler.yml b/.github/labeler.yml index a1b1d9fad16..876fc5fcf0b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -895,11 +895,9 @@ 'phpunit': - changed-files: - any-glob-to-any-file: [ - dev/test/*, - dev/phpunit*, - dev/sonar*, - .github/workflows/phpunit.yml, - .github/workflows/sonar.yml + phpunit*, + tests/*, + .github/workflows/phpunit.yml ] 'ddev': @@ -908,3 +906,10 @@ .ddev/*, .ddev/**/* ] + +'rector': + - changed-files: + - any-glob-to-any-file: [ + rector.php, + .github/workflows/rector.yml + ] \ No newline at end of file diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml index b1470d0ea4e..4478b2f810e 100644 --- a/.github/workflows/check-files.yml +++ b/.github/workflows/check-files.yml @@ -33,9 +33,6 @@ on: phpunit: description: "Count changed PhpUnit files" value: ${{ jobs.check.outputs.phpunit }} - sonar: - description: "Count changed Sonar files" - value: ${{ jobs.check.outputs.sonar }} # Allow manually triggering the workflow. workflow_dispatch: @@ -54,7 +51,6 @@ jobs: phpstan: ${{ steps.changes-phpstan.outputs.phpstan }} phpunit-test: ${{ steps.changes-phpunit-test.outputs.phpunit-test }} phpunit: ${{ steps.changes-phpunit.outputs.phpunit }} - sonar: ${{ steps.changes-sonar.outputs.sonar }} steps: - name: Checkout code @@ -87,9 +83,9 @@ jobs: **phpcs** **php-cs-fixer** **phpstan** - dev/tests/ - dev/phpunit* - dev/sonar* + rector.php + tests/ + phpunit* - name: Check if composer files changed id: changes-composer @@ -161,7 +157,7 @@ jobs: id: changes-phpunit-test if: steps.changed-files-specific.outputs.any_modified == 'true' run: | - count="$(grep -oE "dev/tests/" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)" + count="$(grep -oE "tests/" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)" echo "$count UnitTest test file(s) changed" echo "phpunit-test=$count" >> $GITHUB_OUTPUT @@ -169,14 +165,6 @@ jobs: id: changes-phpunit if: steps.changed-files-specific.outputs.any_modified == 'true' run: | - count="$(grep -oE "dev/phpunit*" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)" + count="$(grep -oE "phpunit*" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)" echo "$count PHPUnit file(s) changed" echo "phpunit=$count" >> $GITHUB_OUTPUT - - - name: Check if Sonar files changed - id: changes-sonar - if: steps.changed-files-specific.outputs.any_modified == 'true' - run: | - count="$(grep -oE "dev/sonar*" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)" - echo "$count Sonar file(s) changed" - echo "sonar=$count" >> $GITHUB_OUTPUT diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index b4db7974e5c..d9142354e3b 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -10,16 +10,39 @@ on: jobs: unit-tests: - runs-on: [ubuntu-latest] + runs-on: ${{ matrix.operating-system }} + strategy: + matrix: + operating-system: [ubuntu-latest] + php-versions: ['7.4', '8.3'] + mysql-version: ['5.7', '8.0'] + + services: + mysql: + image: mysql:${{ matrix.mysql-version }} + env: + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: db + ports: + - 3306:3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - - uses: actions/checkout@v4 + - name: Validate mysql service + run: | + echo "Checking mysql service" + sudo apt-get install -y mysql-client + mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports['3306'] }} -uroot -proot -e "SHOW DATABASES" + + - name: Setup PHP + uses: shivammathur/setup-php@v2 with: - repository: OpenMage/Testfield - path: ./ + php-version: ${{ matrix.php-versions }} + coverage: pcov #optional, setup coverage driver + env: + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Validate composer - run: composer validate + - uses: actions/checkout@v4 - name: Get composer cache directory id: composer-cache @@ -33,24 +56,61 @@ jobs: restore-keys: ${{ runner.os }}-composer- - name: Install dependencies - run: composer install --prefer-dist --no-progress --ignore-platform-reqs - - - name: Checkout OpenMage repo - uses: actions/checkout@v4 - with: - path: openmage + run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-* - - name: Install OpenMage dependencies - working-directory: ./openmage - run: composer install --prefer-dist --no-progress --ignore-platform-reqs --no-dev + - name: Install OpenMage + run: | + php -f install.php -- \ + --license_agreement_accepted 'yes' \ + --locale 'en_US' \ + --timezone 'America/New_York' \ + --db_host '127.0.0.1' \ + --db_name 'db' \ + --db_user 'root' \ + --db_pass 'root' \ + --db_prefix '' \ + --url 'http://openmage.local' \ + --use_rewrites 'yes' \ + --use_secure 'yes' \ + --secure_base_url 'http://openmage.local' \ + --use_secure_admin 'yes' \ + --admin_username 'admin' \ + --admin_lastname 'Administrator' \ + --admin_firstname 'OpenMage' \ + --admin_email 'admin@example.com' \ + --admin_password 'veryl0ngpassw0rd' \ + --session_save 'files' \ + --admin_frontname 'admin' \ + --backend_frontname 'admin' \ + --default_currency 'USD' \ + --enable_charts 'yes' \ + --skip_url_validation 'yes' - - name: run phpUnit - run: bash ./run_unit_tests.sh + - name: Run phpUnit + run: php -f vendor/bin/phpunit - name: Publish Unit Test Results - uses: EnricoMi/publish-unit-test-result-action@v2.7 + uses: EnricoMi/publish-unit-test-result-action@v2 if: always() - continue-on-error: true with: github_token: ${{ secrets.GITHUB_TOKEN }} - files: output/*.xml + files: tests/logging/*.xml + + - name: prepare SonarCloud Scan Data + if: ${{ (matrix.php-versions == '7.4') && (matrix.mysql-version == '5.7') }} + run: | + head tests/coverage/clover.xml + sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' tests/logging/junit.xml + sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' tests/coverage/clover.xml + head ./tests/coverage/clover.xml + + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + continue-on-error: true + if: ${{ (matrix.php-versions == '7.4') && (matrix.mysql-version == '5.7') }} && SONAR_TOKEN + with: + args: > + -Dproject.settings=tests/sonar-project.properties + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml new file mode 100644 index 00000000000..9314962d057 --- /dev/null +++ b/.github/workflows/rector.yml @@ -0,0 +1,37 @@ +name: Rector + +on: + workflow_call: + # Allow manually triggering the workflow. + workflow_dispatch: + +jobs: + rector: + name: Validation + runs-on: [ubuntu-latest] + + steps: + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 7.4 + + - name: Checkout code + uses: actions/checkout@v4 + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + uses: actions/cache@v4 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: ${{ runner.os }}-composer- + + - name: Install dependencies + run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-* + + - name: Rector + run: php vendor/bin/rector process --dry-run diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml deleted file mode 100644 index cc2ffcb5d43..00000000000 --- a/.github/workflows/sonar.yml +++ /dev/null @@ -1,71 +0,0 @@ -name: Sonar - -on: - # Run automatically every Monday on midnight. - schedule: - - cron: '0 0 * * 1' - workflow_call: - # Allow manually triggering the workflow. - workflow_dispatch: - -jobs: - unit: - name: Unit Tests on ${{ matrix.php }} - runs-on: ${{ matrix.os }} - strategy: - max-parallel: 5 - matrix: - os: [ubuntu-latest] - php: ['7.4', '8.1'] - steps: - - uses: actions/checkout@v4 - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: mbstring - tools: composer, pecl, phpcs, phpstan, phpunit:9.5 - ini-values: pcov.directory=api, post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration - coverage: pcov #optional, setup coverage driver - env: - COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Get composer cache directory - id: composer-cache - run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - - name: Cache dependencies - uses: actions/cache@v4 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: ${{ runner.os }}-composer- - - - name: Install dependencies - run: composer install --dev -n --prefer-source --ignore-platform-req=php+ - - - name: Run Unit Tests - run: phpunit --configuration ./dev/phpunit.xml.dist --testsuite=Unit; - - - name: prepare SonarCloud Scan Data - continue-on-error: true - if: ${{ matrix.php == '8.1' }} - run: | - echo $PWD - ls -la - head ./dev/tests/clover.xml - sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' ./dev/tests/junit.xml - sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' ./dev/tests/clover.xml - head ./dev/tests/clover.xml - ls -la - - - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master - continue-on-error: true - if: ${{ matrix.php == '8.1' }} && SONAR_TOKEN - with: - args: > - -Dproject.settings=dev/sonar-project.properties - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/update-copyright.yml b/.github/workflows/update-copyright.yml index 5bab98610f6..438a6c71db4 100644 --- a/.github/workflows/update-copyright.yml +++ b/.github/workflows/update-copyright.yml @@ -43,7 +43,7 @@ jobs: run: php -f shell/update-copyright.php - name: Create Pull Request - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: commit-message: update copyright title: Updated Copyright diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 68400099a6c..4ac1ddb8806 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -93,10 +93,10 @@ jobs: uses: ./.github/workflows/phpstan.yml # DOES NOT run by default - # runs on schedule or when worklfow changed + # runs on schedule or when workflow changed syntax_php: name: PHP Syntax - needs: [check, phpcs, php-cs-fixer] + needs: [check, php-cs-fixer] if: needs.check.outputs.workflow > 0 uses: ./.github/workflows/syntax-php.yml @@ -106,24 +106,21 @@ jobs: if: needs.check.outputs.xml > 0 uses: ./.github/workflows/syntax-xml.yml - # DOES NOT run by default - # runs on schedule or when worklfow or unit tests changed - sonar: - name: Unit Tests (Sonar) + rector: + name: Rector needs: [check, phpcs, php-cs-fixer] if: | - needs.check.outputs.phpunit-test > 0 || - needs.check.outputs.phpunit > 0 || - needs.check.outputs.sonar > 0 || + needs.check.outputs.php > 0 || needs.check.outputs.workflow > 0 - uses: ./.github/workflows/sonar.yml + uses: ./.github/workflows/rector.yml # DOES NOT run by default - # runs on schedule or when worklfow or unit tests changed + # runs on schedule or when workflow or unit tests changed unit_tests: name: Unit Tests (OpenMage) - needs: [check, sonar] + needs: [check, php-cs-fixer] if: | + needs.check.outputs.php > 0 || needs.check.outputs.phpunit-test > 0 || needs.check.outputs.phpunit > 0 || needs.check.outputs.workflow > 0 diff --git a/.gitignore b/.gitignore index e5aaad872a9..cef12b3e51c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,13 +23,6 @@ /app/etc/modules/Cm_RedisSession.xml /lib/Credis -# Add a base setup for running unit Tests with code coverage and send them to SonarCloud -# https://github.com/OpenMage/magento-lts/pull/1836 -/dev/testfield -/dev/tests/clover.xml -/dev/tests/crap4j.xml -/dev/tests/junit.xml - # Add Gitpod online IDE config # https://github.com/OpenMage/magento-lts/pull/1836 /dev/gitpod/docker-magento @@ -76,6 +69,16 @@ phpstan*.neon !.phpstan.dist.neon !.phpstan.dist.*.neon +# PhpUnit +tests/coverage +tests/logging +.phpunit.result.cache +phpunit.xml +!phpunit.xml.dist + +# build +/build + # dev scripts loaded via composer /shell/update-copyright.php /shell/translations.php diff --git a/.gitpod.yml b/.gitpod.yml index 6cd0417492e..df0a5451b50 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,21 @@ -# List the start up tasks. Learn more https://www.gitpod.io/docs/config-start-tasks/ +github: + prebuilds: + # enable for the master/default branch (defaults to true) + master: true + # enable for all branches in this repo (defaults to false) + branches: true + # enable for pull requests coming from this repo (defaults to true) + pullRequests: true + # enable for pull requests coming from forks (defaults to false) + pullRequestsFromForks: true + # add a "Review in Gitpod" button as a comment to pull requests (defaults to true) + addComment: false + # add a "Review in Gitpod" button to pull requests (defaults to false) + addBadge: true + # add a label once the prebuild is ready to pull requests (defaults to false) + addLabel: false + +# List the start-up tasks. Learn more https://www.gitpod.io/docs/config-start-tasks/ tasks: - init: echo 'init script' # runs during prebuild command: echo 'start script' diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index c5dce8dc29c..8924d1fc496 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -114,6 +114,7 @@ 'lib/Magento/', 'lib/Varien/', 'shell/', + 'tests/unit/', ]) ->name('*.php') ->ignoreDotFiles(true) diff --git a/.phpcs.php.xml.dist b/.phpcs.php.xml.dist index aefb549779a..fe91de479b7 100644 --- a/.phpcs.php.xml.dist +++ b/.phpcs.php.xml.dist @@ -12,6 +12,7 @@ lib/Magento/ lib/Varien/ shell/ + tests/unit/ */Varien/Object.php* diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist index cfa926c52f2..19a8ceb29dd 100644 --- a/.phpcs.xml.dist +++ b/.phpcs.xml.dist @@ -12,6 +12,7 @@ lib/Magento/ lib/Varien/ shell/ + tests/unit/ diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon index 08f066bb2b0..8e50e08bf4f 100644 --- a/.phpstan.dist.baseline.neon +++ b/.phpstan.dist.baseline.neon @@ -2710,11 +2710,6 @@ parameters: count: 2 path: app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php - - - message: "#^Method Mage_Directory_Model_Region\\:\\:loadByName\\(\\) invoked with 1 parameter, 2 required\\.$#" - count: 1 - path: app/code/core/Mage/Customer/Model/Customer.php - - message: "#^Parameter \\#1 \\$data \\(stdClass\\) of method Mage_Customer_Model_Customer_Api_V2\\:\\:_prepareData\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Customer_Model_Customer_Api\\:\\:_prepareData\\(\\)$#" count: 1 @@ -4865,11 +4860,6 @@ parameters: count: 1 path: lib/Mage/DB/Mysqli.php - - - message: "#^Property Mage_HTTP_Client_Curl\\:\\:\\$_ch \\(object\\) does not accept resource\\.$#" - count: 1 - path: lib/Mage/HTTP/Client/Curl.php - - message: "#^Property Mage_HTTP_Client_Socket\\:\\:\\$_postFields is never read, only written\\.$#" count: 1 diff --git a/.phpstan.dist.neon b/.phpstan.dist.neon index 3a65bcd553a..d56b4f77325 100644 --- a/.phpstan.dist.neon +++ b/.phpstan.dist.neon @@ -17,6 +17,7 @@ parameters: - lib/Magento - lib/Varien - shell + - tests/unit excludePaths: #incompatible interfaces - app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php @@ -68,9 +69,5 @@ parameters: checkFunctionNameCase: true checkInternalClassCaseSensitivity: true treatPhpDocTypesAsCertain: false - # For v1.12+ with "bleeding edge" - ignoreErrors: - - - identifier: missingType.iterableValue # universalObjectCratesClasses: # - Varien_Object diff --git a/README.md b/README.md index 0b7abed4c90..bee054d0ed0 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ level of backwards compatibility to the official releases. - [Changes to SOAP/WSDL](#changes-to-soapwsdl) - [Development Environment with ddev](#development-environment-with-ddev) - [PhpStorm Factory Helper](#phpstorm-factory-helper) +- [PhpStorm File-Watcher for SCSS files](#phpstorm-file-watcher-for-scss-files) - [Public Communication](#public-communication) - [Maintainers](#maintainers) - [License](#license) @@ -356,6 +357,22 @@ You can add additional meta files in this directory to cover your own project fi [PhpStorm advanced metadata](https://www.jetbrains.com/help/phpstorm/ide-advanced-metadata.html) for more information. +## PhpStorm File-Watcher for SCSS files +- install SCSS + ```bash + npm install -g sass + ``` +- open settings `CTRL+ALT+S` and go to File Watcher +- change default setting to: + - Arguments: + ``` + $FileName$:$FileParentDir$/$FileNameWithoutExtension$.css + ``` + - Output paths to refresh: + ``` + $FileParentDir$/$FileNameWithoutExtension$.css:$FileParentDir$/$FileNameWithoutExtension$.css.map + ``` + ## Public Communication * [Discord](https://discord.gg/EV8aNbU) (maintained by Flyingmana) diff --git a/app/Mage.php b/app/Mage.php index 29a0ce52bcb..dd016e03030 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -199,8 +199,6 @@ public static function getOpenMageVersion(): string * Gets the detailed OpenMage version information * @link https://openmage.github.io/supported-versions.html * @link https://semver.org/ - * - * @return array */ public static function getOpenMageVersionInfo(): array { @@ -410,9 +408,7 @@ public static function getStoreConfig($path, $store = null) } /** - * @param string $path * @param null|string|bool|int|Mage_Core_Model_Store $store - * @return float */ public static function getStoreConfigAsFloat(string $path, $store = null): float { @@ -420,9 +416,7 @@ public static function getStoreConfigAsFloat(string $path, $store = null): float } /** - * @param string $path * @param null|string|bool|int|Mage_Core_Model_Store $store - * @return int */ public static function getStoreConfigAsInt(string $path, $store = null): int { @@ -518,7 +512,6 @@ public static function addObserver($eventName, $callback, $data = [], $observerN * and multiple observers matching event name pattern * * @param string $name - * @param array $data * @return Mage_Core_Model_App */ public static function dispatchEvent($name, array $data = []) @@ -546,7 +539,6 @@ public static function getModel($modelClass = '', $arguments = []) * Retrieve model object singleton * * @param string $modelClass - * @param array $arguments * @return Mage_Core_Model_Abstract|false */ public static function getSingleton($modelClass = '', array $arguments = []) @@ -576,7 +568,6 @@ public static function getResourceModel($modelClass, $arguments = []) * @param string $class * @param Mage_Core_Controller_Request_Http $request * @param Mage_Core_Controller_Response_Http $response - * @param array $invokeArgs * @return Mage_Core_Controller_Front_Action */ public static function getControllerInstance($class, $request, $response, array $invokeArgs = []) @@ -588,7 +579,6 @@ public static function getControllerInstance($class, $request, $response, array * Retrieve resource vodel object singleton * * @param string $modelClass - * @param array $arguments * @return object */ public static function getResourceSingleton($modelClass = '', array $arguments = []) @@ -945,8 +935,6 @@ public static function log($message, $level = null, $file = '', $forceLog = fals /** * Write exception to log - * - * @param Throwable $e */ public static function logException(Throwable $e) { @@ -981,8 +969,6 @@ public static function getIsDeveloperMode() /** * Display exception - * - * @param Throwable $e */ public static function printException(Throwable $e, $extra = '') { diff --git a/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php b/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php index ca25cbe4125..fa333d89a0d 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,9 +24,6 @@ class Mage_Admin_Model_Acl_Assert_Ip implements Zend_Acl_Assert_Interface /** * Check whether ip is allowed * - * @param Mage_Admin_Model_Acl $acl - * @param Mage_Admin_Model_Acl_Role|null $role - * @param Mage_Admin_Model_Acl_Resource|null $resource * @param string|null $privilege * @return bool|null */ diff --git a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php index e69d46c8529..a88100fd02c 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,9 +24,6 @@ class Mage_Admin_Model_Acl_Assert_Time implements Zend_Acl_Assert_Interface /** * Assert time * - * @param Mage_Admin_Model_Acl $acl - * @param Mage_Admin_Model_Acl_Role|null $role - * @param Mage_Admin_Model_Acl_Resource|null $resource * @param string|null $privilege * @return bool|null */ diff --git a/app/code/core/Mage/Admin/Model/Config.php b/app/code/core/Mage/Admin/Model/Config.php index cb7aa5c3816..504acca68c7 100644 --- a/app/code/core/Mage/Admin/Model/Config.php +++ b/app/code/core/Mage/Admin/Model/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,7 +71,6 @@ public function __construct() /** * Load Acl resources from config * - * @param Mage_Admin_Model_Acl $acl * @param Mage_Core_Model_Config_Element|Varien_Simplexml_Element $resource * @param string $parentName * @return $this diff --git a/app/code/core/Mage/Admin/Model/Observer.php b/app/code/core/Mage/Admin/Model/Observer.php index e945acc6c94..c7685a7f348 100644 --- a/app/code/core/Mage/Admin/Model/Observer.php +++ b/app/code/core/Mage/Admin/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Redirectpolicy.php b/app/code/core/Mage/Admin/Model/Redirectpolicy.php index 85a501d22d9..a32a79e61d0 100644 --- a/app/code/core/Mage/Admin/Model/Redirectpolicy.php +++ b/app/code/core/Mage/Admin/Model/Redirectpolicy.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,8 +38,6 @@ public function __construct($parameters = []) /** * Redirect to startup page after logging in if request contains any params (except security key) * - * @param Mage_Admin_Model_User $user - * @param Zend_Controller_Request_Http|null $request * @param string|null $alternativeUrl * @return null|string */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Acl.php b/app/code/core/Mage/Admin/Model/Resource/Acl.php index b07083b4c70..bd5880f9b99 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Acl.php +++ b/app/code/core/Mage/Admin/Model/Resource/Acl.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -75,8 +75,6 @@ public function loadAcl() /** * Load roles * - * @param Mage_Admin_Model_Acl $acl - * @param array $rolesArr * @return $this */ public function loadRoles(Mage_Admin_Model_Acl $acl, array $rolesArr) @@ -106,8 +104,6 @@ public function loadRoles(Mage_Admin_Model_Acl $acl, array $rolesArr) /** * Load rules * - * @param Mage_Admin_Model_Acl $acl - * @param array $rulesArr * @return $this */ public function loadRules(Mage_Admin_Model_Acl $acl, array $rulesArr) diff --git a/app/code/core/Mage/Admin/Model/Resource/Role.php b/app/code/core/Mage/Admin/Model/Resource/Role.php index 8d06d309b6b..bbcd231f134 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Role.php +++ b/app/code/core/Mage/Admin/Model/Resource/Role.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Process role before saving * - * @param Mage_Core_Model_Abstract|Mage_Admin_Model_Role $object * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles.php b/app/code/core/Mage/Admin/Model/Resource/Roles.php index 91e0d6efd03..029a84a0923 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Roles.php +++ b/app/code/core/Mage/Admin/Model/Resource/Roles.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,6 @@ protected function _construct() /** * Process role before saving * - * @param Mage_Core_Model_Abstract|Mage_Admin_Model_Roles $role * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $role) @@ -82,7 +81,6 @@ protected function _beforeSave(Mage_Core_Model_Abstract $role) /** * Process role after saving * - * @param Mage_Core_Model_Abstract $role * @return $this */ protected function _afterSave(Mage_Core_Model_Abstract $role) @@ -98,7 +96,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $role) /** * Process role after deleting * - * @param Mage_Core_Model_Abstract $role * @return $this */ protected function _afterDelete(Mage_Core_Model_Abstract $role) @@ -112,7 +109,6 @@ protected function _afterDelete(Mage_Core_Model_Abstract $role) /** * Get role users * - * @param Mage_Admin_Model_Roles $role * @return array */ public function getRoleUsers(Mage_Admin_Model_Roles $role) @@ -129,7 +125,6 @@ public function getRoleUsers(Mage_Admin_Model_Roles $role) /** * Update role users * - * @param Mage_Admin_Model_Roles $role * @return bool */ private function _updateRoleUsersAcl(Mage_Admin_Model_Roles $role) diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php index dad38cc5c52..8aaca8da37a 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php index 74c531cca25..98afcf54583 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Rules.php b/app/code/core/Mage/Admin/Model/Resource/Rules.php index 4888387285c..0034335de7e 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Rules.php +++ b/app/code/core/Mage/Admin/Model/Resource/Rules.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,8 +28,6 @@ protected function _construct() /** * Save ACL resources - * - * @param Mage_Admin_Model_Rules $rule */ public function saveRel(Mage_Admin_Model_Rules $rule) { @@ -96,8 +94,6 @@ public function setResourceIdAsIdFieldName() /** * Delete orphaned resources * - * @param array $orphanedIds - * @return int * @throws Mage_Core_Exception */ public function deleteOrphanedResources(array $orphanedIds): int diff --git a/app/code/core/Mage/Admin/Model/Resource/User.php b/app/code/core/Mage/Admin/Model/Resource/User.php index e834f921ce9..cf4624ff8ca 100644 --- a/app/code/core/Mage/Admin/Model/Resource/User.php +++ b/app/code/core/Mage/Admin/Model/Resource/User.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,7 +47,6 @@ protected function _initUniqueFields() /** * Authenticate user by $username and $password * - * @param Mage_Admin_Model_User $user * @return $this */ public function recordLogin(Mage_Admin_Model_User $user) @@ -154,7 +153,6 @@ protected function _beforeSave(Mage_Core_Model_Abstract $user) /** * Unserialize user extra data after user save * - * @param Mage_Core_Model_Abstract $user * @return $this */ protected function _afterSave(Mage_Core_Model_Abstract $user) @@ -176,7 +174,6 @@ protected function _afterLoad(Mage_Core_Model_Abstract $user) /** * Delete user role record with user * - * @param Mage_Core_Model_Abstract $user * @return $this * @throws Exception */ @@ -206,7 +203,6 @@ public function delete(Mage_Core_Model_Abstract $user) /** * TODO: unify _saveRelations() and add() methods, they make same things * - * @param Mage_Core_Model_Abstract|Mage_Admin_Model_User $user * @return $this|Mage_Core_Model_Abstract */ public function _saveRelations(Mage_Core_Model_Abstract $user) @@ -265,7 +261,6 @@ public function _saveRelations(Mage_Core_Model_Abstract $user) /** * Get user roles * - * @param Mage_Core_Model_Abstract $user * @return array */ public function getRoles(Mage_Core_Model_Abstract $user) @@ -301,7 +296,6 @@ public function getRoles(Mage_Core_Model_Abstract $user) /** * Save user roles * - * @param Mage_Core_Model_Abstract|Mage_Admin_Model_User $user * @return $this */ public function add(Mage_Core_Model_Abstract $user) @@ -346,7 +340,6 @@ public function add(Mage_Core_Model_Abstract $user) /** * Delete user role * - * @param Mage_Core_Model_Abstract|Mage_Admin_Model_User $user * @return $this */ public function deleteFromRole(Mage_Core_Model_Abstract $user) @@ -372,7 +365,6 @@ public function deleteFromRole(Mage_Core_Model_Abstract $user) /** * Check if role user exists * - * @param Mage_Core_Model_Abstract|Mage_Admin_Model_User $user * @return array */ public function roleUserExists(Mage_Core_Model_Abstract $user) @@ -400,7 +392,6 @@ public function roleUserExists(Mage_Core_Model_Abstract $user) /** * Check if user exists * - * @param Mage_Core_Model_Abstract|Mage_Admin_Model_User $user * @return array|false */ public function userExists(Mage_Core_Model_Abstract $user) @@ -471,7 +462,6 @@ public function saveReloadAclFlag($object, $flag) /** * Unserializes user extra data * - * @param Mage_Core_Model_Abstract|Mage_Admin_Model_User $user * @return Mage_Core_Model_Abstract */ protected function _unserializeExtraData(Mage_Core_Model_Abstract $user) diff --git a/app/code/core/Mage/Admin/Model/Roles.php b/app/code/core/Mage/Admin/Model/Roles.php index ab3d1b57387..af64915a018 100644 --- a/app/code/core/Mage/Admin/Model/Roles.php +++ b/app/code/core/Mage/Admin/Model/Roles.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -114,7 +114,6 @@ public function getRoleUsers() /** * Build resources array process * - * @param null|Varien_Simplexml_Element $resource * @param null|string $parentName * @param null|int $level * @param null|mixed $represent2Darray diff --git a/app/code/core/Mage/Admin/Model/Session.php b/app/code/core/Mage/Admin/Model/Session.php index eb1ae01cd51..44df8b46d1b 100644 --- a/app/code/core/Mage/Admin/Model/Session.php +++ b/app/code/core/Mage/Admin/Model/Session.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,7 +54,7 @@ class Mage_Admin_Model_Session extends Mage_Core_Model_Session_Abstract public const XML_PATH_ALLOW_SID_FOR_ADMIN_AREA = 'web/session/use_admin_sid'; /** - * Whether it is the first page after successfull login + * Whether it is the first page after successful login * * @var bool|null */ @@ -256,7 +256,7 @@ public function isLoggedIn() } /** - * Check if it is the first page after successfull login + * Check if it is the first page after successful login * * @return bool */ diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php index 10ce60260a1..b59eb2c8532 100644 --- a/app/code/core/Mage/Admin/Model/User.php +++ b/app/code/core/Mage/Admin/Model/User.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php index bae52aea26f..c9fc20b53eb 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Inbox.php index 0b8363d7d9a..efb9dcf6e54 100644 --- a/app/code/core/Mage/AdminNotification/Model/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Inbox.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -96,7 +96,6 @@ public function getNoticeStatus() /** * Parse and save new data * - * @param array $data * @return $this */ public function parse(array $data) diff --git a/app/code/core/Mage/AdminNotification/Model/Observer.php b/app/code/core/Mage/AdminNotification/Model/Observer.php index fec07161d0d..9f84d85dec9 100644 --- a/app/code/core/Mage/AdminNotification/Model/Observer.php +++ b/app/code/core/Mage/AdminNotification/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ class Mage_AdminNotification_Model_Observer { /** * Predispath admin action controller - * - * @param Varien_Event_Observer $observer */ public function preDispatch(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php index fafdf3eeb0b..f5bc27bf4bd 100644 --- a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +33,6 @@ protected function _construct() /** * Load latest notice * - * @param Mage_AdminNotification_Model_Inbox $object * @return $this */ public function loadLatestNotice(Mage_AdminNotification_Model_Inbox $object) @@ -59,7 +58,6 @@ public function loadLatestNotice(Mage_AdminNotification_Model_Inbox $object) /** * Get notifications grouped by severity * - * @param Mage_AdminNotification_Model_Inbox $object * @return array */ public function getNoticeStatus(Mage_AdminNotification_Model_Inbox $object) @@ -77,9 +75,6 @@ public function getNoticeStatus(Mage_AdminNotification_Model_Inbox $object) /** * Save notifications (if not exists) - * - * @param Mage_AdminNotification_Model_Inbox $object - * @param array $data */ public function parse(Mage_AdminNotification_Model_Inbox $object, array $data) { diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php index a86d17128c8..d333c184822 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php b/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php index bb072483a89..8aca5571763 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php index 804d2273e2f..f503878d832 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php index 44ba406e84b..585e35e184b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php index 3d6d06704db..378be70a9e6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php index eefad54c8d3..908e9f57f4c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php index 8f0d533dc8c..669fe5c16ee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php index fed75f6b88f..6bb0e53be55 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -202,7 +202,6 @@ public function getDeleteUrl(array $args = []) /** * Return URL for refresh input element 'path' in form * - * @param array $args * @return string */ public function getRefreshPathUrl(array $args = []) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php index 72e1fc4a4c8..b33877cb103 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php index bae54abe7ce..44c21774123 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php index 91591cc65a4..389cf8bb980 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php index bec23bce0a1..4ddb30829a2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php index e2d48b66b04..6469d5b633a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php index 1c38afcf7cb..71c9f2c7a05 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php index d15d4a6b5a3..ac40e5953be 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,7 +51,6 @@ public function getProduct() /** * Set product object * - * @param Mage_Catalog_Model_Product|null $product * @return $this */ public function setProduct(?Mage_Catalog_Model_Product $product = null) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php index c291a852609..663680b618a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,7 +50,7 @@ public function getCurrentStore() } /** - * Returns additional values for js config, con be overriden by descedants + * Returns additional values for js config, con be overridden by descendants * * @return array */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php index f41d5106289..84077aaa2e8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,7 +34,6 @@ public function __construct() /** * Get option html block * - * @param Mage_Catalog_Model_Product_Option $option * * @return string */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php index feb9993cac7..72fb1619cc0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,7 +54,7 @@ public function getProductId() } /** - * Indentifies edit mode of popup + * Identifies edit mode of popup * * @return bool */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php index 7180ac936f6..635f03fd065 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -79,7 +79,7 @@ protected function _getAdditionalElementTypes() } /** - * Custom additional elemnt html + * Custom additional element html * * @param Varien_Data_Form_Element_Abstract $element * @return string diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php index 122bdbff703..e1bbd83c3a3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,7 +30,7 @@ public function getProduct() } /** - * Get store object of curently edited product + * Get store object of currently edited product * * @return Mage_Core_Model_Store */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php index 4a3fa59f634..46eb6883279 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php index e189e7362be..39f28eeda08 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,7 +55,6 @@ public function getProduct() /** * Render HTML * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) @@ -67,7 +66,6 @@ public function render(Varien_Data_Form_Element_Abstract $element) /** * Set form element instance * - * @param Varien_Data_Form_Element_Abstract $element * @return $this */ public function setElement(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php index 8a9686703c9..2627f127420 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -350,7 +350,6 @@ protected function _getConfigAttributeCodes() /** * Retrieve item row configurable attribute data * - * @param Varien_Object $item * @return array */ protected function _retrieveRowData(Varien_Object $item) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php index 45777be9494..afde1c9a1ad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid_Renderer_C /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php index bf708259546..7071e69eb73 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid_Renderer_I /** * Renders grid column value * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php index 67b4d2ff2d9..331d1ba96d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php index 218ef0eb592..320e6905096 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php index 7beec3267fd..772ad938511 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,7 +43,7 @@ public function getElementHtml() } /** - * Dublicate interface of Varien_Data_Form_Element_Abstract::setReadonly + * Duplicate interface of Varien_Data_Form_Element_Abstract::setReadonly * * @param bool $readonly * @param bool $useDisabled diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php index dd9369974ac..4ecb3350676 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php index 33de324c5b0..be1580b1860 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php index 069e7c05cbe..510adac26de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Weight extends Varien_Dat { /** * Validation classes for weight field which corresponds to DECIMAL(12,4) SQL type - * - * @param array $attributes */ public function __construct(array $attributes = []) { diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php index d4c668fee43..3f318de8a8a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php index 2893ade2169..8b5fa086be9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php @@ -26,7 +26,7 @@ public function render(Varien_Object $row) $href = $row->getPreviewUrl(); } else { $urlModel = Mage::getModel('core/url')->setStore($row->getData('_first_store_id')); - $href = $urlModel->getUrl( + $href = $urlModel->getDirectUrl( $row->getIdentifier(), [ '_current' => false, diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php index 1ec9e998895..75e1dcf56ef 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,7 +55,6 @@ public function getFilesCount() /** * File idetifier getter * - * @param Varien_Object $file * @return string */ public function getFileId(Varien_Object $file) @@ -66,7 +65,6 @@ public function getFileId(Varien_Object $file) /** * File thumb URL getter * - * @param Varien_Object $file * @return string */ public function getFileThumbUrl(Varien_Object $file) @@ -77,7 +75,6 @@ public function getFileThumbUrl(Varien_Object $file) /** * File name URL getter * - * @param Varien_Object $file * @return string */ public function getFileName(Varien_Object $file) @@ -88,7 +85,6 @@ public function getFileName(Varien_Object $file) /** * Image file width getter * - * @param Varien_Object $file * @return string */ public function getFileWidth(Varien_Object $file) @@ -99,7 +95,6 @@ public function getFileWidth(Varien_Object $file) /** * Image file height getter * - * @param Varien_Object $file * @return string */ public function getFileHeight(Varien_Object $file) @@ -110,7 +105,6 @@ public function getFileHeight(Varien_Object $file) /** * File short name getter * - * @param Varien_Object $file * @return string */ public function getFileShortName(Varien_Object $file) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php index df3cf52634b..7773d50d3f2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php @@ -9,12 +9,12 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Directoty tree renderer for Cms Wysiwyg Images + * Directory tree renderer for Cms Wysiwyg Images * * @category Mage * @package Mage_Adminhtml diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Adminpass.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Adminpass.php index 86507c03fe8..c859d04b87a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Adminpass.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Adminpass.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Adminpass extends Mage_Adminht /** * Render block * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) @@ -39,7 +38,6 @@ public function render(Varien_Data_Form_Element_Abstract $element) } /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getScriptHtml(Varien_Data_Form_Element_Abstract $element) @@ -56,6 +54,13 @@ protected function _getScriptHtml(Varien_Data_Form_Element_Abstract $element) $('{$element->getHtmlId()}_container').hide(); $('{$element->getHtmlId()}').disable(); } + if ($('email-passowrd-warning')) { + if (!$('_accountnew_password').getValue() || $('account-send-pass').checked) { + $('email-passowrd-warning').hide(); + } else if ($('_accountnew_password').getValue()) { + $('email-passowrd-warning').show(); + } + } }); $(elem).on('focus', function() { $('{$element->getHtmlId()}_container').show(); diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php index 345668fd254..b551233da28 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Newpass extends Mage_Adminhtml /** * Render block * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) @@ -35,6 +34,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) if ($element->getNote()) { $html .= '

' . $element->getNote() . '

'; } + $html .= ''; $html .= ''; $html .= '' . "\n"; $html .= ''; @@ -49,7 +49,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) . $element->getHtmlId() . '\', this.checked)"/> '; $html .= ''; $html .= '' . "\n"; diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php index eb35d5bc441..56fd4706c2d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,9 +28,6 @@ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Region extends Mage_Adminhtml_ */ protected $_factory; - /** - * @param array $args - */ public function __construct(array $args = []) { $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory'); @@ -39,7 +36,6 @@ public function __construct(array $args = []) /** * Output the region element and javasctipt that makes it dependent from country element * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php index b0846a73b7c..e54cbf69ec5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php index 49e8af59580..3a9b5bdc578 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -110,13 +110,11 @@ public function getDeleteButtonHtml() */ public function initForm() { - /** @var Mage_Customer_Model_Customer $customer */ - $customer = Mage::registry('current_customer'); - $form = new Varien_Data_Form(); $fieldset = $form->addFieldset('address_fieldset', [ 'legend' => Mage::helper('customer')->__("Edit Customer's Address")]); + $customer = $this->getRegistryCurrentCustomer(); $addressModel = Mage::getModel('customer/address'); $addressModel->setCountryId(Mage::helper('core')->getDefaultCountry($customer->getStore())); /** @var Mage_Customer_Model_Form $addressForm */ @@ -296,4 +294,9 @@ public function addValuesToNameSuffixElement($values) } return $this; } + + protected function getRegistryCurrentCustomer(): ?Mage_Customer_Model_Customer + { + return Mage::registry('current_customer'); + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php index 75bf8385835..94c815fdf58 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php @@ -31,7 +31,7 @@ public function initForm() { $form = new Varien_Data_Form(); $form->setHtmlIdPrefix('_newsletter'); - $customer = Mage::registry('current_customer'); + $customer = $this->getRegistryCurrentCustomer(); $subscriber = Mage::getModel('newsletter/subscriber')->loadByCustomer($customer); Mage::register('subscriber', $subscriber); @@ -95,4 +95,9 @@ protected function _prepareLayout() ); return parent::_prepareLayout(); } + + protected function getRegistryCurrentCustomer(): ?Mage_Customer_Model_Customer + { + return Mage::registry('current_customer'); + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php index ba596c26988..ffe2a2b4a04 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php index bc293d3a6c7..56c48db39cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -106,7 +106,6 @@ protected function getFormattedOptionValue($option) /** * Renders item product name and its configuration * - * @param Varien_Object $item * @return string */ public function render(Varien_Object $item) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php index c650493d903..88ce72e6d83 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php index 049d64e985f..43446e01498 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php index d06544fcbe3..797723b460b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -165,7 +165,6 @@ protected function _getPreviewUrl() * Return Element HTML * * @param string $element - * @param array $attributes * @param bool $closed * @return string */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php index 185a8c9214a..d7ce105d3f4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Customer_Grid_Renderer_Multiaction extends Mage_Admin /** * Renders column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) @@ -55,7 +54,6 @@ public function render(Varien_Object $row) * Render single action as link html * * @param array $action - * @param Varien_Object $row * @return string */ protected function _toLinkHtml($action, Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php index 1e34bfdec8a..12b49000c0a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Customer_Online_Grid_Renderer_Url extends Mage_Adminh /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php b/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php index 6c212c438ee..7aae44fc778 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ protected function _prepareLayout() /** * Unset some non-related element parameters * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) @@ -50,7 +49,6 @@ public function render(Varien_Data_Form_Element_Abstract $element) /** * Get the button and scripts contents * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php index 1eb775d3fa1..706b698b558 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -134,7 +134,6 @@ public function setDataRows($rows) * Add series * * @param string $seriesId - * @param array $options */ public function addSeries($seriesId, array $options) { diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php index 6a33bc60334..45b82e9f117 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Newsletter_Problem_Grid_Renderer_Checkbox extends Mag /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php index 17a2eceda81..7a17fb7236a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php index 05f5a0941ef..d0d1f102bdd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Renderer_Checkbox extends /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php index cd98f9512c9..90235d415c9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php index 3e95bef5581..04e72c3f5e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php index 673121247bd..325d27b5cf4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Curl.php b/app/code/core/Mage/Adminhtml/Block/Notification/Curl.php index e6fe15454c1..54dd9c06667 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Curl.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Curl.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php index 41924f6f449..e269c1dddaf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Notification_Grid_Renderer_Actions extends Mage_Admin /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php index 7d29cd0b504..dd6c36673a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Notification_Grid_Renderer_Notice extends Mage_Adminh /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php index 7213016bfd9..66f8d4eba14 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Notification_Grid_Renderer_Severity extends Mage_Admi /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Security.php b/app/code/core/Mage/Adminhtml/Block/Notification/Security.php index 52db59889cc..eb0502aeb36 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Security.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Security.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php index 9d63e7857a9..d62a13a6487 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -80,7 +80,6 @@ public function getLanguageSelect() } /** - * @param string $url * @return $this * @deprecated see setReportIssuesUrl() */ @@ -90,7 +89,6 @@ public function setBugreportUrl(string $url) } /** - * @return string * @deprecated see getReportIssuesUrl() */ public function getBugreportUrl(): string @@ -99,7 +97,6 @@ public function getBugreportUrl(): string } /** - * @param string $url * @return $this */ public function setReportIssuesUrl(string $url) @@ -107,16 +104,12 @@ public function setReportIssuesUrl(string $url) return $this->setData('report_issues_url', $url); } - /** - * @return string - */ public function getReportIssuesUrl(): string { return (string) $this->_getData('report_issues_url'); } /** - * @param string $url * @return $this * @deprecated see setOpenMageProjectUrl() */ @@ -126,7 +119,6 @@ public function setConnectWithMagentoUrl(string $url) } /** - * @return string * @deprecated see getOpenMageProjectUrl() */ public function getConnectWithMagentoUrl(): string @@ -135,7 +127,6 @@ public function getConnectWithMagentoUrl(): string } /** - * @param string $url * @return $this */ public function setOpenMageProjectUrl(string $url) @@ -143,9 +134,6 @@ public function setOpenMageProjectUrl(string $url) return $this->setData('openmage_project_url', $url); } - /** - * @return string - */ public function getOpenMageProjectUrl(): string { return (string) $this->_getData('openmage_project_url'); diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Head.php b/app/code/core/Mage/Adminhtml/Block/Page/Head.php index 1e008cfed85..4420fd714a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Head.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Head.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php index 03754aa32b7..655e9efb68d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,7 +91,6 @@ public function getMenuArray() /** * Retrieve Title value for menu node * - * @param Varien_Simplexml_Element $child * @return string */ protected function _getHelperValue(Varien_Simplexml_Element $child) @@ -109,7 +108,6 @@ protected function _getHelperValue(Varien_Simplexml_Element $child) /** * Recursive Build Menu array * - * @param Varien_Simplexml_Element $parent * @param string $path * @param int $level * @return array @@ -187,7 +185,6 @@ protected function _sortMenu($a, $b) /** * Check Depends * - * @param Varien_Simplexml_Element $depends * @return bool */ protected function _checkDepends(Varien_Simplexml_Element $depends) @@ -291,7 +288,6 @@ public function getMenuLevel($menu, $level = 0) /** * Check is module output enabled * - * @param Varien_Simplexml_Element $child * @return bool */ protected function _isEnabledModuleOutput(Varien_Simplexml_Element $child) diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php index 9ade3099fb6..8a2cd1d858c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php index 6d1fcc5e819..9cc63e87763 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource.php b/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource.php index ab529bf7470..f364b45454a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource.php @@ -31,9 +31,6 @@ public function __construct() $this->_removeButton('add'); } - /** - * @return string - */ protected function _toHtml(): string { Mage::dispatchEvent('permissions_orphanedresource_html_before', ['block' => $this]); diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php index 1794f7abfbd..b4abe98fe98 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php index 53a164d42a4..60eeafee193 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php index 4b04f26b5ad..dfbedc51e02 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php index 2a6be3175d2..f578c7165e3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php index 581de16e558..7560157d78c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php index 0a669adc7e0..7fc2f0c735b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Promo_Quote_Edit_Tab_Main_Renderer_Checkbox extends M /** * Checkbox render function * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php index 656ee9a8040..d005531ccb1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php b/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php index 171a5a7e780..a7e8797beaa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,7 +32,7 @@ class Mage_Adminhtml_Block_Report_Filter_Form extends Mage_Adminhtml_Block_Widge protected $_fieldVisibility = []; /** - * Report field opions + * Report field options */ protected $_fieldOptions = []; @@ -170,7 +170,7 @@ protected function _prepareForm() } /** - * Initialize form fileds values + * Initialize form fields values * Method will be called after prepareForm and can be used for field values initialization * * @return Mage_Adminhtml_Block_Widget_Form diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php index efc441c2365..15909037915 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -409,10 +409,10 @@ public function addGrandTotals($total) } } /* - * recalc totals if we have average + * recalculate totals if we have average */ foreach ($this->getColumns() as $key => $_column) { - if (str_contains($_column->getTotal(), '/')) { + if ($_column->hasTotal() && str_contains($_column->getTotal(), '/')) { list($t1, $t2) = explode('/', $_column->getTotal()); if ($this->getGrandTotals()->getData($t2) != 0) { $this->getGrandTotals()->setData( diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php index b1e0bd63cd2..309c04c6eda 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,7 +85,7 @@ protected function _getAggregatedColumns() /** * Add column to grid - * Overriden to add support for visibility_filter column option + * Overridden to add support for visibility_filter column option * It stands for conditional visibility of the column depending on filter field values * Value of visibility_filter supports (filter_field_name => filter_field_value) pairs * diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php index 92c8643a11a..46cb5df7bbf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Report_Grid_Column_Renderer_Currency extends Mage_Adm /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php index 052feec8e1e..a7be0d93318 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Report_Grid_Column_Renderer_Customer extends Mage_Adm /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php index 17cb37d1592..67ef971056a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Report_Grid_Column_Renderer_Product extends Mage_Admi /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php index 5230cff04ff..3b576a559d4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Report_Product_Downloads_Renderer_Purchases extends M /** * Renders Purchases value * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php index dcc18315045..afc87dd6ee3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,7 +60,6 @@ protected function _getFormat() /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php index b1aa9870c5b..c98a6c41454 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php index e60828bc845..b475d682e75 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -147,7 +147,6 @@ public function getColumnRenderer($column, $compositePart = '') /** * Retrieve rendered item html content * - * @param Varien_Object $item * @return string */ public function getItemHtml(Varien_Object $item) @@ -167,7 +166,6 @@ public function getItemHtml(Varien_Object $item) /** * Retrieve rendered item extra info html content * - * @param Varien_Object $item * @return string */ public function getItemExtraInfoHtml(Varien_Object $item) @@ -184,7 +182,6 @@ public function getItemExtraInfoHtml(Varien_Object $item) /** * Retrieve rendered column html content * - * @param Varien_Object $item * @param string $column the column key * @param string $field the custom item field * @return string @@ -326,7 +323,6 @@ public function displayRoundedPrices($basePrice, $price, $precision = 2, $strong /** * Retrieve include tax html formatted content * - * @param Varien_Object $item * @return string */ public function displayPriceInclTax(Varien_Object $item) @@ -369,7 +365,6 @@ public function displaySubtotalInclTax($item) /** * Retrieve tax calculation html content * - * @param Varien_Object $item * @return string */ public function displayTaxCalculation(Varien_Object $item) @@ -391,7 +386,6 @@ public function displayTaxCalculation(Varien_Object $item) /** * Retrieve tax with persent html content * - * @param Varien_Object $item * @return string */ public function displayTaxPercent(Varien_Object $item) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php index 6e43ea89528..17db343d431 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php index 2a834b56878..2eea01e2f08 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php index 60e76866ed5..ecc2143584a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php index fc68328add8..e10e46eeaa2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Data extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { /** - * Retrieve avilable currency codes + * Retrieve available currency codes * * @return array */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php index a1d7ec249a9..933169f1bcb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -102,7 +102,6 @@ protected function _getAdditionalFormElementRenderers() /** * Add additional data to form element * - * @param Varien_Data_Form_Element_Abstract $element * @return Mage_Adminhtml_Block_Sales_Order_Create_Form_Abstract */ protected function _addAdditionalFormElementData(Varien_Data_Form_Element_Abstract $element) @@ -114,7 +113,6 @@ protected function _addAdditionalFormElementData(Varien_Data_Form_Element_Abstra * Add rendering EAV attributes to Form element * * @param array|Varien_Data_Collection $attributes - * @param Varien_Data_Form_Abstract $form * @return Mage_Adminhtml_Block_Sales_Order_Create_Form_Abstract */ protected function _addAttributesToForm($attributes, Varien_Data_Form_Abstract $form) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php index 77bfd65235c..45a364bc3d4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -92,7 +92,6 @@ protected function _prepareForm() /** * Add additional data to form element * - * @param Varien_Data_Form_Element_Abstract $element * @return $this */ protected function _addAdditionalFormElementData(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php index 9a035cb6068..2279fe0a523 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -189,7 +189,6 @@ protected function _prepareForm() /** * Add additional data to form element * - * @param Varien_Data_Form_Element_Abstract $element * @return Mage_Adminhtml_Block_Sales_Order_Create_Form_Abstract */ protected function _addAdditionalFormElementData(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php index ab3b3e98cfd..81a5e037a46 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Giftmessage extends Mage_Adminhtml /** * Generate form for editing of gift message for entity * - * @param Varien_Object $entity * @param string $entityType * @return string */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php index 069215bfe1d..9fae47ca10d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Giftmessage_Form extends Mage_Admi /** * Set entity for form * - * @param Varien_Object $entity * @return $this */ public function setEntity(Varien_Object $entity) @@ -146,7 +145,7 @@ public function _prepareForm() $this->_prepareVisibleFields($fieldset); } - // Set default sender and recipient from billing and shipping adresses + // Set default sender and recipient from billing and shipping addresses if (!$this->getMessage()->getSender()) { $this->getMessage()->setSender($this->getDefaultSender()); } @@ -157,7 +156,7 @@ public function _prepareForm() $this->getMessage()->setType($this->getEntityType()); - // Overriden default data with edited when block reloads througth Ajax + // Overridden default data with edited when block reloads through Ajax $this->_applyPostData(); $form->setValues($this->getMessage()->getData()); @@ -170,7 +169,6 @@ public function _prepareForm() * Prepare form fieldset * All fields are hidden * - * @param Varien_Data_Form_Element_Fieldset $fieldset * * @return $this */ @@ -205,7 +203,6 @@ protected function _prepareHiddenFields(Varien_Data_Form_Element_Fieldset $field * Prepare form fieldset * All fields are visible * - * @param Varien_Data_Form_Element_Fieldset $fieldset * * @return $this */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php index 31340158816..1e2b1d41c77 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -297,7 +297,6 @@ public function getTierHtml($item) /** * Get Custom Options of item * - * @param Mage_Sales_Model_Quote_Item $item * @return string */ public function getCustomOptions(Mage_Sales_Model_Quote_Item $item) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php index ac022f3d097..c4a575568ef 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,7 +25,6 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid_Renderer_Giftmessage e /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php index bba741cfcfc..92fce2ad326 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid_Renderer_Price extends /** * Render minimal price for downloadable products * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php index 5f5950fb8eb..03a175d126e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,7 +35,6 @@ protected function _isInactive($row) /** * Render product qty field * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php index 5916951616f..542fef1e76a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php index 9435b8c5bad..bca32503e26 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php index 9ce243f7b67..ebc9cb96691 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php index cadd04f47d8..733a725d611 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -69,7 +69,6 @@ public function getSubmitUrl() /** * Customer Notification Applicable check method * - * @param Mage_Sales_Model_Order_Status_History $history * @return bool */ public function isCustomerNotificationNotApplicable(Mage_Sales_Model_Order_Status_History $history) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php index 32094b094a3..89a5027964d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,7 +85,6 @@ public function getViewUrl($orderId) * Find sort order for account data * Sort Order used as array key * - * @param array $data * @param int $sortOrder * @return int */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php index fb82040b5c3..f529163770e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -232,7 +232,6 @@ public function displaySubtotalInclTax($item) /** * Display item price including tax * - * @param Mage_Sales_Model_Order_Item|Varien_Object $item * @return string */ public function displayPriceInclTax(Varien_Object $item) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php index 02d063b64aa..26f7aef7f4e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -123,7 +123,6 @@ public function getFullHistory() /** * Status history date/datetime getter * - * @param array $item * @param string $dateType * @param string $format * @return string @@ -142,7 +141,6 @@ public function getItemCreatedAt(array $item, $dateType = 'date', $format = 'med /** * Status history item title getter * - * @param array $item * @return string */ public function getItemTitle(array $item) @@ -153,7 +151,6 @@ public function getItemTitle(array $item) /** * Check whether status history comment is with customer notification * - * @param array $item * @param bool $isSimpleCheck * @return bool */ @@ -168,7 +165,6 @@ public function isItemNotified(array $item, $isSimpleCheck = true) /** * Status history item comment getter * - * @param array $item * @return string */ public function getItemComment(array $item) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php index a67f70a2e49..15c2a967438 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,7 +50,6 @@ protected function _getEscapedValue($value) /** * Render options array as a HTML string * - * @param array $actions * @return string */ protected function _actionsToHtml(array $actions = []) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php index 2a585eb5b7d..590ff5de165 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php index c0b83ee96ac..75df46da0d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php index ed9dcafca94..04175b38040 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -75,7 +75,7 @@ protected function _prepareColumns() } /** - * Retrieve Transaction addtitional info + * Retrieve Transaction additional info * * @return array */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php index b7e75452532..365760a445e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Sitemap_Grid_Renderer_Link extends Mage_Adminhtml_Blo /** * Prepare link to display in grid * - * @param Varien_Object $row * @return string * @throws Mage_Core_Model_Store_Exception|Mage_Core_Exception */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php index 0ba08285fc4..b46b6c1bb2f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Sitemap_Grid_Renderer_Time extends Mage_Adminhtml_Blo /** * Prepare link to display in grid * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php index 33442aa26b1..a65f42f67fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php index cb77319f61e..0b2772b1605 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,6 @@ public function getElement() /** * Render element * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php index 1d38f0ddd67..dd343b55865 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,6 @@ public function getElement() /** * Render element * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php index a38a7d8db43..407e35d8226 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -704,7 +704,7 @@ protected function _getAdditionalElementTypes() } /** - * Temporary moved those $this->getRequest()->getParam('blabla') from the code accross this block + * Temporary moved those $this->getRequest()->getParam('blabla') from the code across this block * to getBlala() methods to be later set from controller with setters */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php index f2ffa8d2e72..45d035579eb 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Adminhtml_Block_System_Config_Form_Field extends Mage_Adminhtml_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface { /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) @@ -31,7 +30,6 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) } /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php index 24362c6c16d..4229660b194 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -94,7 +94,6 @@ public function addColumn($name, $params) /** * Get the grid and scripts contents * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) @@ -107,8 +106,6 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) /** * Prepare existing row data object - * - * @param Varien_Object $row */ protected function _prepareArrayRow(Varien_Object $row) { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php index 961c4b2fc41..3d1dea4ab0f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php index 5956fc4f137..6efb1e1e209 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php index a482b36370e..461fb3ec848 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_System_Config_Form_Field_Heading extends Mage_Adminht /** * Render element html * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php index 4efdaeb089f..3163c807ff4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php @@ -9,12 +9,12 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * System congifuration shipping methods allow all countries selec + * System configuration shipping methods allow all countries select * * @category Mage * @package Mage_Adminhtml diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php index 7c99ea1fe0e..910662c9e67 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php @@ -9,12 +9,12 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * System congifuration shipping methods allow all countries selec + * System configuration shipping methods allow all countries select * * @category Mage * @package Mage_Adminhtml diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php index 689cc80d3f1..49f9b4b3548 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_System_Config_Form_Field_Select_Flatproduct extends M /** * Retrieve Element HTML * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php index bbf0162206a..bfe219694f6 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_System_Config_Form_Fieldset extends Mage_Adminhtml_Bl /** * Render fieldset html * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php index b66bef6c7a8..ce764b4d0b3 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +33,6 @@ protected function _construct() /** * Remove scope label * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) @@ -45,7 +44,6 @@ public function render(Varien_Data_Form_Element_Abstract $element) /** * Return element html * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php index 3871b4a9a5f..aa17028c1a9 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php index a8ff8fe1648..0fc992d2738 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php @@ -29,7 +29,7 @@ public function initForm() $form = new Varien_Data_Form(); $form->setHtmlIdPrefix('_view'); - $model = Mage::registry('current_convert_profile'); + $model = $this->getRegistryCurrentConvertProfile(); $fieldset = $form->addFieldset('base_fieldset', [ 'legend' => Mage::helper('adminhtml')->__('View Actions XML'), @@ -50,4 +50,9 @@ public function initForm() return $this; } + + protected function getRegistryCurrentConvertProfile(): ?Mage_Dataflow_Model_Profile + { + return Mage::registry('current_convert_profile'); + } } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php index 13abc90c8a0..796f7b3dace 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php index de42e352cfe..e8b952b1e1d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php @@ -29,7 +29,7 @@ public function initForm() $form = new Varien_Data_Form(); $form->setHtmlIdPrefix('_edit'); - $model = Mage::registry('current_convert_profile'); + $model = $this->getRegistryCurrentConvertProfile(); $fieldset = $form->addFieldset('base_fieldset', [ 'legend' => Mage::helper('adminhtml')->__('General Information'), @@ -57,4 +57,9 @@ public function initForm() return $this; } + + protected function getRegistryCurrentConvertProfile(): ?Mage_Dataflow_Model_Profile + { + return Mage::registry('current_convert_profile'); + } } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php index 0311bc9c720..f5874ab3ec5 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php index d8b79e15a22..8400d456284 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -358,7 +358,7 @@ public function getUsedCurrentlyForPaths($asJSON = true) } /** - * Convert xml config pathes to decorated names + * Convert xml config paths to decorated names * * @param array $paths * @return array diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php index b0786525b35..e681f36a0cc 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php index addf1580d4a..aa20a6e18bd 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php index 115a5e50cae..7731d257c9d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php index 4aeed772bb3..6e731fd8683 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,7 +23,6 @@ class Mage_Adminhtml_Block_System_Store_Grid_Render_Group extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { /** - * @param Varien_Object $row * @return string|null */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php index 038d0c7e862..81817406e5b 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,7 +23,6 @@ class Mage_Adminhtml_Block_System_Store_Grid_Render_Store extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { /** - * @param Varien_Object $row * @return string|null */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php index 9b379f631b6..89e44d9d387 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,7 +23,6 @@ class Mage_Adminhtml_Block_System_Store_Grid_Render_Website extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { /** - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php index 789d6b5ea6c..3884de74fd7 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -111,7 +111,6 @@ protected function _createCellTemplate() /** * Render website * - * @param Mage_Core_Model_Website $website * @return string */ public function renderWebsite(Mage_Core_Model_Website $website) @@ -126,7 +125,6 @@ public function renderWebsite(Mage_Core_Model_Website $website) /** * Render store group * - * @param Mage_Core_Model_Store_Group $storeGroup * @return string */ public function renderStoreGroup(Mage_Core_Model_Store_Group $storeGroup) @@ -142,7 +140,6 @@ public function renderStoreGroup(Mage_Core_Model_Store_Group $storeGroup) /** * Render store * - * @param Mage_Core_Model_Store $store * @return string */ public function renderStore(Mage_Core_Model_Store $store) diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php index a216632b6ce..a33535e76fa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,7 +27,7 @@ class Mage_Adminhtml_Block_Tag_Store_Switcher extends Mage_Adminhtml_Block_Store protected $_hasDefaultOption = false; /** - * Set overriden params + * Set overridden params */ public function __construct() { diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php index f4c149d635f..46d5449f440 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,11 +22,10 @@ class Mage_Adminhtml_Block_Tax_Rate_Grid_Renderer_Country extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Country { /** - * Render column for export - * - * @param Varien_Object $row - * @return string - */ + * Render column for export + * + * @return string + */ public function renderExport(Varien_Object $row) { return $row->getData($this->getColumn()->getIndex()); diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php index 2086b80027c..879615fa0ba 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php index 9b565b023ac..4723217fdcf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Adminhtml_Block_Urlrewrite extends Mage_Adminhtml_Block_Widget_Grid_Container { /** - * Part for generating apropriate grid block name + * Part for generating appropriate grid block name * * @var string */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php index fc959e184ff..16aab534eb2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php index 955c2f871b0..434cdc6c4c1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php index bea57ee0146..aa953698ccb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -100,7 +100,6 @@ public function getFormHtml() /** * Set form object * - * @param Varien_Data_Form $form * @return $this */ public function setForm(Varien_Data_Form $form) @@ -216,8 +215,6 @@ protected function _setFieldset($attributes, $fieldset, $exclude = []) /** * Add new element type - * - * @param Varien_Data_Form_Abstract $baseElement */ protected function _addElementTypes(Varien_Data_Form_Abstract $baseElement) { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php index 73debbcecaf..e143135a1c1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -79,7 +79,6 @@ public function addFieldDependence($fieldName, $fieldNameFrom, $refValues) /** * Add misc configuration options to the javascript dependencies controller * - * @param array $options * @return $this */ public function addConfigOptions(array $options) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php index 90ac04bed96..73fc55d546e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index f51c7a42c20..a8818b9b4ef 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -1037,7 +1037,6 @@ public function getHtml() /** * Retrieve file content from file container array * - * @param array $fileData * @return string */ protected function _getFileContainerContent(array $fileData) @@ -1120,9 +1119,6 @@ public function _exportIterateCollection($callback, array $args) /** * Write item data to csv export file - * - * @param Varien_Object $item - * @param Varien_Io_File $adapter */ protected function _exportCsvItem(Varien_Object $item, Varien_Io_File $adapter) { @@ -1271,8 +1267,6 @@ public function getXml() /** * Write item data to Excel 2003 XML export file * - * @param Varien_Object $item - * @param Varien_Io_File $adapter * @param Varien_Convert_Parser_Xml_Excel $parser */ protected function _exportExcelItem(Varien_Object $item, Varien_Io_File $adapter, $parser = null) @@ -1647,8 +1641,6 @@ public function getCountTotals() /** * Set totals - * - * @param Varien_Object $totals */ public function setTotals(Varien_Object $totals) { @@ -1690,7 +1682,6 @@ public function getCountSubTotals() /** * Set subtotal items * - * @param array $items * @return $this */ public function setSubTotals(array $items) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php index 79697d4dbc0..34e54f3406b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -142,7 +142,6 @@ public function getHeaderHtmlProperty() /** * Retrieve row column field value for display * - * @param Varien_Object $row * @return string */ public function getRowField(Varien_Object $row) @@ -174,7 +173,6 @@ public function getRowField(Varien_Object $row) /** * Retrieve row column field value for export * - * @param Varien_Object $row * @return string */ public function getRowFieldExport(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php index 667a6a9895d..7ed15de8e9d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php @@ -9,12 +9,12 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Grid colum filter block + * Grid column filter block * * @category Mage * @package Mage_Adminhtml diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php index b2328125cce..e8a07feb76c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -182,7 +182,7 @@ protected function _convertDate($date, $locale) Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE) ); - //set begining of day + //set beginning of day $dateObj->setHour(00); $dateObj->setMinute(00); $dateObj->setSecond(00); diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php index f60c84e799d..e431e6cfddc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +41,7 @@ public function getHtml() } /** - * Retrieve options setted in column. + * Retrieve options set in column. * Or load if options was not set. * * @return array diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php index e49f8908c90..1d1f92bee25 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,6 @@ public function getColumn() /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) @@ -63,7 +62,6 @@ public function render(Varien_Object $row) /** * Render column for export * - * @param Varien_Object $row * @return string */ public function renderExport(Varien_Object $row) @@ -72,7 +70,6 @@ public function renderExport(Varien_Object $row) } /** - * @param Varien_Object $row * @return string|null */ protected function _getValue(Varien_Object $row) @@ -92,7 +89,6 @@ protected function _getValue(Varien_Object $row) } /** - * @param Varien_Object $row * @return string */ public function _getInputValueElement(Varien_Object $row) @@ -104,7 +100,6 @@ public function _getInputValueElement(Varien_Object $row) } /** - * @param Varien_Object $row * @return string|null */ protected function _getInputValue(Varien_Object $row) @@ -165,7 +160,6 @@ public function renderCss() } /** - * @param Varien_Object $row * @return string|null */ public function getCopyableText(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php index 9bdad27dbbf..973ed06d0b0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Action extends Mage_Admin /** * Renders column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) @@ -59,7 +58,6 @@ public function render(Varien_Object $row) * Render single action as dropdown option html * * @param array $action - * @param Varien_Object $row * @return string */ protected function _toOptionHtml($action, Varien_Object $row) @@ -78,7 +76,6 @@ protected function _toOptionHtml($action, Varien_Object $row) * Render single action as link html * * @param array $action - * @param Varien_Object $row * @return string */ protected function _toLinkHtml($action, Varien_Object $row) @@ -104,7 +101,6 @@ protected function _toLinkHtml($action, Varien_Object $row) * * @param array $action * @param string $actionCaption - * @param Varien_Object $row * @return $this */ protected function _transformActionData(&$action, &$actionCaption, Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php index 0c747a9defc..c7cf86d33ed 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,7 +39,6 @@ public function getValues() /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php index c7d4dbacd01..f2d9fa7cd44 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Concat extends Mage_Admin /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php index bb3e9f822bd..874cc0a790e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Country extends Mage_Admi /** * Render country grid column * - * @param Varien_Object $row * @return string|null */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php index 4e9f5930488..53feae029af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Currency extends Mage_Adm /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php index e1219c2e3a5..fd7587bc30c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,7 +53,6 @@ protected function _getFormat() /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php index 1a97dfb8f6a..0462fa60b13 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,7 +52,6 @@ protected function _getFormat() /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php index 5593f62ba4d..5bcc55116ea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +26,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Input extends Mage_Adminh /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php index 3982eb07d74..ad82653ea67 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,8 +40,6 @@ public function getColumn(); /** * Renders grid column - * - * @param Varien_Object $row */ public function render(Varien_Object $row); } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php index 0607aae6163..fba237dc241 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,9 +24,7 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Ip extends Mage_Adminhtml /** * Render the grid cell value * - * @param Varien_Object $row * @return string - * * @SuppressWarnings(PHPMD.ErrorControlOperator) */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php index 9078f6f35dc..7ac22e7bfab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,7 +27,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Longtext extends Mage_Adm * Text will be truncated as specified in string_limit, truncate or 250 by default * Also it can be html-escaped and nl2br() * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php index 817bbb84b5f..bde6ad16562 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,7 +49,6 @@ public function renderProperty() /** * Returns HTML of the object * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php index 4c764538bd6..7118fd51722 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +26,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Number extends Mage_Admin /** * Returns value of the row * - * @param Varien_Object $row * @return mixed|string */ protected function _getValue(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php index cadf133c1db..fcf29841299 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Options extends Mage_Admi /** * Render a grid cell as options * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php index a09ace5bfd8..e00e93299e4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,7 +30,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Price extends Mage_Adminh /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php index 30b1d1cd608..d07e9985622 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,7 +39,6 @@ public function getValues() /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php index 7620dbf7241..d51bd2e4054 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Select extends Mage_Admin /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php index 48792de9e76..a5428dbe813 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -61,7 +61,6 @@ protected function _getShowEmptyStoresLabelFlag() /** * Render row store views * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) @@ -111,7 +110,6 @@ public function render(Varien_Object $row) /** * Render row store views for export * - * @param Varien_Object $row * @return string */ public function renderExport(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php index 7f750a7e406..64d24f24f3a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Text extends Mage_Adminht /** * Renders grid column * - * @param Varien_Object $row * @return mixed */ public function _getValue(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php index f4a5b1bed69..7717b805c61 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Theme extends Mage_Adminh /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) @@ -39,7 +38,7 @@ public function render(Varien_Object $row) } /** - * Retrieve options setted in column. + * Retrieve options set in column. * Or load if options was not set. * * @return array diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php index ca9a0b653f5..7dd30b314ee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Wrapline extends Mage_Adm /** * Renders grid column * - * @param Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php index a7abf519cb5..372d4142c2a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -97,7 +97,6 @@ public function __construct() * ); * * @param string $itemId - * @param array $item * @return Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract */ public function addItem($itemId, array $item) @@ -334,8 +333,6 @@ public function setUseSelectAll($flag) /** * Group items for optgroups - * - * @return array */ public function getGroupedItems(): array { @@ -354,10 +351,6 @@ public function getGroupedItems(): array return $groupedItems; } - /** - * @param string $itemId - * @return bool - */ protected function isConfirmMassAction(string $itemId): bool { return in_array($itemId, static::$needsConfirm); diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php index b58efc2e080..127895f73e2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,7 +67,6 @@ public function setAdditionalActionBlock($block) } /** - * @param array $config * @return Mage_Adminhtml_Block_Widget_Grid_Massaction_Item_Additional_Default */ protected function _createFromConfig(array $config) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php index 8221c496723..5b09fed9381 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Adminhtml_Block_Widget_Grid_Massaction_Item_Additional_Default extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Grid_Massaction_Item_Additional_Interface { /** - * @param array $configuration * @return $this */ public function createFromConfiguration(array $configuration) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php index 87c0ffeec7f..7ee99cf9395 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -97,7 +97,7 @@ public function getDataAsJSON() * @param Mage_Adminhtml_Block_Widget_Grid | string $grid grid object or grid block name * @param string $callback block method to retrieve data to serialize * @param string $hiddenInputName hidden input name where serialized data will be store - * @param string $reloadParamName name of request parametr that will be used to save setted data while reload grid + * @param string $reloadParamName name of request parameter that will be used to save set data while reload grid */ public function initSerializerBlock($grid, $callback, $hiddenInputName, $reloadParamName = 'entityCollection') { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php index ca58c8f7fc6..8e9f2e9e94a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -395,7 +395,7 @@ public function getTabContent($tab) } /** - * Mark tabs as dependant of each other + * Mark tabs as dependent of each other * Arbitrary number of tabs can be specified, but at least two * * @param string $tabOneId diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php index 4f1d37c8640..ae018c03517 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Action.php +++ b/app/code/core/Mage/Adminhtml/Controller/Action.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -339,9 +339,9 @@ public function __() } /** - * Set referer url for redirect in responce + * Set referer url for redirect in response * - * Is overriden here to set defaultUrl to admin url + * Is overridden here to set defaultUrl to admin url * * @param string $defaultUrl * @return Mage_Adminhtml_Controller_Action @@ -354,7 +354,7 @@ protected function _redirectReferer($defaultUrl = null) } /** - * Set redirect into responce + * Set redirect into response * * @param string $path * @param array $arguments diff --git a/app/code/core/Mage/Adminhtml/Helper/Addresses.php b/app/code/core/Mage/Adminhtml/Helper/Addresses.php index ad3e9f05fd9..9ccb843fbd0 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Addresses.php +++ b/app/code/core/Mage/Adminhtml/Helper/Addresses.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,7 +28,6 @@ class Mage_Adminhtml_Helper_Addresses extends Mage_Core_Helper_Abstract /** * Check if number of street lines is non-zero * - * @param Mage_Customer_Model_Attribute $attribute * @return Mage_Customer_Model_Attribute */ public function processStreetAttribute(Mage_Customer_Model_Attribute $attribute) diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php index fd1ad95b45e..6b6635073a3 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php +++ b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,7 +42,6 @@ protected function _initUpdateResultLayout($controller) * when single configuration submitted * * @param Mage_Adminhtml_Controller_Action $controller - * @param Varien_Object $updateResult * @return $this */ public function renderUpdateResult($controller, Varien_Object $updateResult) @@ -86,7 +85,6 @@ protected function _initConfigureResultLayout($controller, $isOk, $productType) * - 'error' = true, and 'message' to show * * @param Mage_Adminhtml_Controller_Action $controller - * @param Varien_Object $configureResult * @return $this */ public function renderConfigureResult($controller, Varien_Object $configureResult) diff --git a/app/code/core/Mage/Adminhtml/Helper/Config.php b/app/code/core/Mage/Adminhtml/Helper/Config.php index 5e29f965338..73ac1905229 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Config.php +++ b/app/code/core/Mage/Adminhtml/Helper/Config.php @@ -29,7 +29,6 @@ class Mage_Adminhtml_Helper_Config extends Mage_Core_Helper_Abstract * Return information array of input types * * @param string $inputType - * @return array */ public function getInputTypes(?string $inputType = null): array { @@ -49,9 +48,6 @@ public function getInputTypes(?string $inputType = null): array /** * Return default backend model by input type - * - * @param string $inputType - * @return string|null */ public function getBackendModelByInputType(string $inputType): ?string { @@ -64,9 +60,6 @@ public function getBackendModelByInputType(string $inputType): ?string /** * Get field backend model by field config node - * - * @param Varien_Simplexml_Element $fieldConfig - * @return string|null */ public function getBackendModelByFieldConfig(Varien_Simplexml_Element $fieldConfig): ?string { diff --git a/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php b/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php index 78451d7bcde..60da12013ec 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php +++ b/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Sales.php b/app/code/core/Mage/Adminhtml/Helper/Sales.php index 8e6f84457df..87eb74c9d1b 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Sales.php +++ b/app/code/core/Mage/Adminhtml/Helper/Sales.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Config/Data.php b/app/code/core/Mage/Adminhtml/Model/Config/Data.php index 9df3c531950..8a7db15aaf3 100644 --- a/app/code/core/Mage/Adminhtml/Model/Config/Data.php +++ b/app/code/core/Mage/Adminhtml/Model/Config/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php index f22deaaab27..f47c1848599 100644 --- a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php +++ b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Email/Template.php b/app/code/core/Mage/Adminhtml/Model/Email/Template.php index ddf502394c7..d8cf5f761af 100644 --- a/app/code/core/Mage/Adminhtml/Model/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Model/Email/Template.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,7 +28,7 @@ class Mage_Adminhtml_Model_Email_Template extends Mage_Core_Model_Email_Template public const XML_PATH_TEMPLATE_EMAIL = '//sections/*/groups/*/fields/*[source_model="adminhtml/system_config_source_email_template"]'; /** - * Collect all system config pathes where current template is used as default + * Collect all system config paths where current template is used as default * * @return array */ @@ -59,7 +59,7 @@ public function getSystemConfigPathsWhereUsedAsDefault() } /** - * Collect all system config pathes where current template is currently used + * Collect all system config paths where current template is currently used * * @return array */ diff --git a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php index 19b1a0d4716..f7ce5d55797 100644 --- a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php +++ b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -152,8 +152,6 @@ protected function _getXpathBlockValidationExpression() /** * Validate template path for preventing access to the directory above * If template path value has "../" @throws Exception - * - * @param array $templatePaths */ protected function _validateTemplatePath(array $templatePaths) { diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php index 138b500194d..b7fb3980774 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -239,7 +239,6 @@ public function getQuote() /** * Set quote object * - * @param Mage_Sales_Model_Quote $quote * @return $this */ public function setQuote(Mage_Sales_Model_Quote $quote) @@ -251,7 +250,6 @@ public function setQuote(Mage_Sales_Model_Quote $quote) /** * Initialize creation data from existing order * - * @param Mage_Sales_Model_Order $order * @return $this */ public function initFromOrder(Mage_Sales_Model_Order $order) @@ -408,7 +406,6 @@ protected function _initShippingAddressFromOrder(Mage_Sales_Model_Order $order) /** * Initialize creation data from existing order Item * - * @param Mage_Sales_Model_Order_Item $orderItem * @param int $qty * @return Mage_Sales_Model_Quote_Item | string */ @@ -808,7 +805,6 @@ public function addProduct($product, $config = 1) /** * Add multiple products to current order quote * - * @param array $products * @return Mage_Adminhtml_Model_Sales_Order_Create|Exception */ public function addProducts(array $products) @@ -889,7 +885,6 @@ public function updateQuoteItems($data) /** * Parse additional options and sync them with product options * - * @param Mage_Sales_Model_Quote_Item $item * @param array $additionalOptions * @return array */ @@ -956,7 +951,6 @@ protected function _parseOptions(Mage_Sales_Model_Quote_Item $item, $additionalO /** * Assign options to item * - * @param Mage_Sales_Model_Quote_Item $item * @param array $options * @return $this */ @@ -1079,8 +1073,6 @@ protected function _getCustomerAddressForm() * Set and validate Quote address * All errors added to _errors * - * @param Mage_Sales_Model_Quote_Address $address - * @param array $data * @return $this */ protected function _setQuoteAddress(Mage_Sales_Model_Quote_Address $address, array $data) @@ -1344,7 +1336,6 @@ protected function _customerIsInStore($store) /** * Set and validate Customer data * - * @param Mage_Customer_Model_Customer $customer * @return $this */ protected function _setCustomerData(Mage_Customer_Model_Customer $customer) diff --git a/app/code/core/Mage/Adminhtml/Model/Session/Quote.php b/app/code/core/Mage/Adminhtml/Model/Session/Quote.php index 07661a0fc4c..bca6746388a 100644 --- a/app/code/core/Mage/Adminhtml/Model/Session/Quote.php +++ b/app/code/core/Mage/Adminhtml/Model/Session/Quote.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -112,7 +112,6 @@ public function getQuote() /** * Set customer model object * To enable quick switch of preconfigured customer - * @param Mage_Customer_Model_Customer $customer * @return $this */ public function setCustomer(Mage_Customer_Model_Customer $customer) diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php index 3710f978b8e..66b887168ad 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,7 +30,7 @@ protected function _afterSave() $category = Mage::getSingleton('catalog/category'); $tree = $category->getTreeModel(); - // Create copy of categories attributes for choosed store + // Create copy of categories attributes for chosen store $tree->load(); $root = $tree->getNodeById($rootId); diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php index 09c7c452976..cae94bf3332 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -208,8 +208,6 @@ protected function _getAllowedExtensions() /** * Add validators for uploading - * - * @param Mage_Core_Model_File_Uploader $uploader */ protected function addValidators(Mage_Core_Model_File_Uploader $uploader) { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php index 245778e7b16..6d9f81c28ad 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,7 +32,6 @@ protected function _getAllowedExtensions() /** * Overwritten parent method for adding validators - * @param Mage_Core_Model_File_Uploader $uploader */ protected function addValidators(Mage_Core_Model_File_Uploader $uploader) { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php index 5deb862239a..b8f4e724369 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php index 8a127356fd3..5981fbb37a0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php index 785ccd48ce3..caee65e7e3a 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php index 75e0d2a2ed7..7e254387b07 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +41,7 @@ public function preDispatch() protected function _initAction() { $this->loadLayout(); - $this->_setActiveMenu('system/services/roles'); + $this->_setActiveMenu('system/api/roles'); $this->_addBreadcrumb($this->__('Web services'), $this->__('Web services')); $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions')); $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles')); diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php index cf8bf40f45e..a822c710b23 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php @@ -39,7 +39,7 @@ public function preDispatch() protected function _initAction() { $this->loadLayout() - ->_setActiveMenu('system/services/users') + ->_setActiveMenu('system/api/users') ->_addBreadcrumb($this->__('Web Services'), $this->__('Web Services')) ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions')) ->_addBreadcrumb($this->__('Users'), $this->__('Users')) diff --git a/app/code/core/Mage/Adminhtml/controllers/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/CacheController.php index 407caba728e..37de3175252 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CacheController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CacheController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +81,7 @@ public function flushSystemAction() } /** - * Mass action for cache enabeling + * Mass action for cache enabling */ public function massEnableAction() { @@ -103,7 +103,7 @@ public function massEnableAction() } /** - * Mass action for cache disabeling + * Mass action for cache disabling */ public function massDisableAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php index 78bb850604e..fbde5f4b93c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -318,7 +318,7 @@ public function saveAction() /** * Proceed with $_POST['use_config'] - * set into category model for proccessing through validation + * set into category model for processing through validation */ $category->setData('use_post_data_config', $this->getRequest()->getPost('use_config')); diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php index 58c0f9c5ced..f5ea6c57a94 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php index 6e8df72ded7..31063179e57 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -152,7 +152,6 @@ protected function _initProduct() * Create serializer block for a grid * * @param string $inputName - * @param Mage_Adminhtml_Block_Widget_Grid $gridBlock * @param array $productsArray * @return Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Ajax_Serializer */ @@ -972,7 +971,6 @@ public function massStatusAction() * Validate batch of products before theirs status will be set * * @throws Mage_Core_Exception - * @param array $productIds * @param int $status */ public function _validateMassStatus(array $productIds, $status) diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php index 6ba8ede730e..8d8e1aee4eb 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php index 7ff8117718a..e600d223e9d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php index 4cc278cdcd8..ae6c8398426 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -155,7 +155,7 @@ public function editAction() /** * Set active menu item */ - $this->_setActiveMenu('customer/new'); + $this->_setActiveMenu('customer/manage'); $this->renderLayout(); } @@ -345,7 +345,7 @@ public function saveAction() $customer->save(); // Send welcome email - if ($customer->getWebsiteId() && (isset($data['account']['sendemail']) || $sendPassToEmail)) { + if ($customer->getWebsiteId() && (isset($data['account']['sendemail']) && !$sendPassToEmail)) { $storeId = $customer->getSendemailStoreId(); if ($isNewCustomer) { $customer->sendNewAccountEmail('registered', '', $storeId); @@ -359,15 +359,18 @@ public function saveAction() $newPassword = trim($data['account']['new_password']); if ($newPassword === 'auto') { $newPassword = $customer->generatePassword(); + $customer->sendPasswordLinkEmail($isNewCustomer); } else { $minPasswordLength = Mage::getModel('customer/customer')->getMinPasswordLength(); if (Mage::helper('core/string')->strlen($newPassword) < $minPasswordLength) { Mage::throwException(Mage::helper('customer') ->__('The minimum password length is %s', $minPasswordLength)); } + $customer->changePassword($newPassword); + $customer->sendPasswordReminderEmail(); } - $customer->changePassword($newPassword); - $customer->sendPasswordReminderEmail(); + } elseif ($sendPassToEmail) { + $customer->sendPasswordLinkEmail($isNewCustomer); } Mage::getSingleton('adminhtml/session')->addSuccess( @@ -631,7 +634,7 @@ public function validateAction() # additional validate email if (!$response->getError()) { # Trying to load customer with the same email and return error message - # if customer with the same email address exisits + # if customer with the same email address exists $checkCustomer = Mage::getModel('customer/customer') ->setWebsiteId($websiteId); $checkCustomer->loadByEmail($accountData['email']); diff --git a/app/code/core/Mage/Adminhtml/controllers/IndexController.php b/app/code/core/Mage/Adminhtml/controllers/IndexController.php index 555e630f9b7..2e1b04e76f4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/IndexController.php +++ b/app/code/core/Mage/Adminhtml/controllers/IndexController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -287,7 +287,7 @@ public function resetPasswordAction() /** * Reset forgotten password * - * Used to handle data recieved from reset forgotten password form + * Used to handle data received from reset forgotten password form */ public function resetPasswordPostAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php index f3f4989046d..2a71cc58cea 100644 --- a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php +++ b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php @@ -26,7 +26,7 @@ public function indexAction() $this->_title($this->__('System'))->_title($this->__('Notifications')); $this->loadLayout() - ->_setActiveMenu('system/notification') + ->_setActiveMenu('system/adminnotification') ->_addBreadcrumb(Mage::helper('adminnotification')->__('Messages Inbox'), Mage::helper('adminhtml')->__('Messages Inbox')) ->_addContent($this->getLayout()->createBlock('adminhtml/notification_inbox')) ->renderLayout(); diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php index 6632cac2083..8ffb7d3c546 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php @@ -33,7 +33,7 @@ class Mage_Adminhtml_Permissions_BlockController extends Mage_Adminhtml_Controll protected function _initAction() { $this->loadLayout() - ->_setActiveMenu('system/acl') + ->_setActiveMenu('system/acl/blocks') ->_addBreadcrumb($this->__('System'), $this->__('System')) ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions')) ->_addBreadcrumb($this->__('Blocks'), $this->__('Blocks')); diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php index 3ca9ccece9e..7c3d53d8ef5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php @@ -28,7 +28,7 @@ class Mage_Adminhtml_Permissions_OrphanedResourceController extends Mage_Adminht protected function _initAction() { $this->loadLayout() - ->_setActiveMenu('system/acl') + ->_setActiveMenu('system/acl/orphaned_resources') ->_addBreadcrumb($this->__('System'), $this->__('System')) ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions')) ->_addBreadcrumb($this->__('Orphaned Resources'), $this->__('Orphaned Role Resources')); diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php index 852e56ec3b8..e8c42b4576e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php @@ -46,7 +46,7 @@ public function preDispatch() protected function _initAction() { $this->loadLayout(); - $this->_setActiveMenu('system/acl'); + $this->_setActiveMenu('system/acl/roles'); $this->_addBreadcrumb($this->__('System'), $this->__('System')); $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions')); $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles')); diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php index c2fa224a18f..ada91c84683 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php @@ -39,7 +39,7 @@ public function preDispatch() protected function _initAction() { $this->loadLayout() - ->_setActiveMenu('system/acl') + ->_setActiveMenu('system/acl/users') ->_addBreadcrumb($this->__('System'), $this->__('System')) ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions')) ->_addBreadcrumb($this->__('Users'), $this->__('Users')) diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php index 76a1465d5c8..f9d8800642a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php @@ -33,7 +33,7 @@ class Mage_Adminhtml_Permissions_VariableController extends Mage_Adminhtml_Contr protected function _initAction() { $this->loadLayout() - ->_setActiveMenu('system/acl') + ->_setActiveMenu('system/acl/variables') ->_addBreadcrumb($this->__('System'), $this->__('System')) ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions')) ->_addBreadcrumb($this->__('Variables'), $this->__('Variables')); diff --git a/app/code/core/Mage/Adminhtml/controllers/RatingController.php b/app/code/core/Mage/Adminhtml/controllers/RatingController.php index 64e01257890..d5972428ab8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/RatingController.php +++ b/app/code/core/Mage/Adminhtml/controllers/RatingController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php index 8453d0d3f5a..79a3d675f4f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php @@ -42,7 +42,7 @@ public function accountsAction() ->_title($this->__('New Accounts')); $this->_initAction() - ->_setActiveMenu('report/customer/accounts') + ->_setActiveMenu('report/customers/accounts') ->_addBreadcrumb(Mage::helper('adminhtml')->__('New Accounts'), Mage::helper('adminhtml')->__('New Accounts')) ->_addContent($this->getLayout()->createBlock('adminhtml/report_customer_accounts')) ->renderLayout(); @@ -79,7 +79,7 @@ public function ordersAction() ->_title($this->__('Customers by Number of Orders')); $this->_initAction() - ->_setActiveMenu('report/customer/orders') + ->_setActiveMenu('report/customers/orders') ->_addBreadcrumb( Mage::helper('reports')->__('Customers by Number of Orders'), Mage::helper('reports')->__('Customers by Number of Orders') @@ -119,7 +119,7 @@ public function totalsAction() ->_title($this->__('Customers by Orders Total')); $this->_initAction() - ->_setActiveMenu('report/customer/totals') + ->_setActiveMenu('report/customers/totals') ->_addBreadcrumb( Mage::helper('reports')->__('Customers by Orders Total'), Mage::helper('reports')->__('Customers by Orders Total') diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php index 3c2fc7a952c..daa7cb8dd75 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php @@ -73,7 +73,7 @@ public function soldAction() ->_title($this->__('Products Ordered')); $this->_initAction() - ->_setActiveMenu('report/product/sold') + ->_setActiveMenu('report/products/sold') ->_addBreadcrumb(Mage::helper('reports')->__('Products Ordered'), Mage::helper('reports')->__('Products Ordered')) ->_addContent($this->getLayout()->createBlock('adminhtml/report_product_sold')) ->renderLayout(); @@ -161,7 +161,7 @@ public function lowstockAction() ->_title($this->__('Low Stock')); $this->_initAction() - ->_setActiveMenu('report/product/lowstock') + ->_setActiveMenu('report/products/lowstock') ->_addBreadcrumb(Mage::helper('reports')->__('Low Stock'), Mage::helper('reports')->__('Low Stock')) ->_addContent($this->getLayout()->createBlock('adminhtml/report_product_lowstock')) ->renderLayout(); @@ -203,7 +203,7 @@ public function downloadsAction() ->_title($this->__('Downloads')); $this->_initAction() - ->_setActiveMenu('report/product/downloads') + ->_setActiveMenu('report/products/downloads') ->_addBreadcrumb(Mage::helper('reports')->__('Downloads'), Mage::helper('reports')->__('Downloads')) ->_addContent($this->getLayout()->createBlock('adminhtml/report_product_downloads')) ->renderLayout(); diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php index 43dbcd7fdfb..a73ef0963d7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php @@ -40,7 +40,7 @@ public function salesAction() $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_ORDER_FLAG_CODE, 'sales'); $this->_initAction() - ->_setActiveMenu('report/sales/sales') + ->_setActiveMenu('report/salesroot/sales') ->_addBreadcrumb(Mage::helper('adminhtml')->__('Sales Report'), Mage::helper('adminhtml')->__('Sales Report')); $gridBlock = $this->getLayout()->getBlock('report_sales_sales.grid'); @@ -159,7 +159,7 @@ public function taxAction() $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_TAX_FLAG_CODE, 'tax'); $this->_initAction() - ->_setActiveMenu('report/sales/tax') + ->_setActiveMenu('report/salesroot/tax') ->_addBreadcrumb(Mage::helper('adminhtml')->__('Tax'), Mage::helper('adminhtml')->__('Tax')); $gridBlock = $this->getLayout()->getBlock('report_sales_tax.grid'); @@ -202,7 +202,7 @@ public function shippingAction() $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_SHIPPING_FLAG_CODE, 'shipping'); $this->_initAction() - ->_setActiveMenu('report/sales/shipping') + ->_setActiveMenu('report/salesroot/shipping') ->_addBreadcrumb(Mage::helper('adminhtml')->__('Shipping'), Mage::helper('adminhtml')->__('Shipping')); $gridBlock = $this->getLayout()->getBlock('report_sales_shipping.grid'); @@ -245,7 +245,7 @@ public function invoicedAction() $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_INVOICE_FLAG_CODE, 'invoiced'); $this->_initAction() - ->_setActiveMenu('report/sales/invoiced') + ->_setActiveMenu('report/salesroot/invoiced') ->_addBreadcrumb(Mage::helper('adminhtml')->__('Total Invoiced'), Mage::helper('adminhtml')->__('Total Invoiced')); $gridBlock = $this->getLayout()->getBlock('report_sales_invoiced.grid'); @@ -288,7 +288,7 @@ public function refundedAction() $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_REFUNDED_FLAG_CODE, 'refunded'); $this->_initAction() - ->_setActiveMenu('report/sales/refunded') + ->_setActiveMenu('report/salesroot/refunded') ->_addBreadcrumb(Mage::helper('adminhtml')->__('Total Refunded'), Mage::helper('adminhtml')->__('Total Refunded')); $gridBlock = $this->getLayout()->getBlock('report_sales_refunded.grid'); @@ -331,7 +331,7 @@ public function couponsAction() $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_COUPONS_FLAG_CODE, 'coupons'); $this->_initAction() - ->_setActiveMenu('report/sales/coupons') + ->_setActiveMenu('report/salesroot/coupons') ->_addBreadcrumb(Mage::helper('adminhtml')->__('Coupons'), Mage::helper('adminhtml')->__('Coupons')); $gridBlock = $this->getLayout()->getBlock('report_sales_coupons.grid'); diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php index 2a3dd992164..d5d0f959fe5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php index 6438cd62fff..baac5e73753 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php index 36bacef02c7..fb24a661c89 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php index 2319d945f5e..4411a6b2971 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php index ae7a56568ec..103d199e9eb 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -492,7 +492,6 @@ protected function _needToAddDummy($item, $qtys) /** * Create shipping label for specific shipment with validation. * - * @param Mage_Sales_Model_Order_Shipment $shipment * @return bool */ protected function _createShippingLabel(Mage_Sales_Model_Order_Shipment $shipment) @@ -681,7 +680,6 @@ public function massPrintShippingLabelAction() /** * Combine array of labels as instance PDF * - * @param array $labelsContent * @return Zend_Pdf */ protected function _combineLabelsPdf(array $labelsContent) diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php index 8802e21b804..71c02bd943c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php @@ -57,7 +57,7 @@ protected function _initStatus() public function indexAction() { $this->_title($this->__('Sales'))->_title($this->__('Order Statuses')); - $this->loadLayout()->_setActiveMenu('system')->renderLayout(); + $this->loadLayout()->_setActiveMenu('system/order_statuses')->renderLayout(); } /** @@ -73,6 +73,7 @@ public function newAction() } $this->_title($this->__('Sales'))->_title($this->__('Create New Order Status')); $this->loadLayout() + ->_setActiveMenu('system/order_statuses') ->renderLayout(); } @@ -86,6 +87,7 @@ public function editAction() Mage::register('current_status', $status); $this->_title($this->__('Sales'))->_title($this->__('Edit Order Status')); $this->loadLayout() + ->_setActiveMenu('system/order_statuses') ->renderLayout(); } else { $this->_getSession()->addError( @@ -161,6 +163,7 @@ public function assignAction() { $this->_title($this->__('Sales'))->_title($this->__('Assign Order Status to State')); $this->loadLayout() + ->_setActiveMenu('system/order_statuses') ->renderLayout(); } diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php index 74dc1789a6c..49c9547e70b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -618,7 +618,7 @@ public function pdfdocsAction() } /** - * Atempt to void the order payment + * Attempt to void the order payment */ public function voidPaymentAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php index 73b2f894af3..f9692d27b8f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php index d55ca3c7084..5f94f81875a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,7 +32,7 @@ public function indexAction() $this->_title($this->__('System'))->_title($this->__('My Account')); $this->loadLayout(); - $this->_setActiveMenu('system/account'); + $this->_setActiveMenu('system/myaccount'); $this->_addContent($this->getLayout()->createBlock('adminhtml/system_account_edit')); $this->renderLayout(); } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php index a957e1846ad..1d64fd8818d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,7 +47,7 @@ public function indexAction() /** * Set active menu item */ - $this->_setActiveMenu('system/convert'); + $this->_setActiveMenu('system/convert/gui'); /** * Append profiles block to content @@ -89,7 +89,7 @@ public function editAction() $this->_title($profile->getId() ? $profile->getName() : $this->__('New Profile')); - $this->_setActiveMenu('system/convert'); + $this->_setActiveMenu('system/convert/gui'); $this->_addContent( $this->getLayout()->createBlock('adminhtml/system_convert_gui_edit') diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php index 5f636152eb5..9a3c12bdfc4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,7 +71,7 @@ public function indexAction() /** * Set active menu item */ - $this->_setActiveMenu('system/convert'); + $this->_setActiveMenu('system/convert/profiles'); /** * Append profiles block to content @@ -121,7 +121,7 @@ public function editAction() $this->_title($profile->getId() ? $profile->getName() : $this->__('New Profile')); - $this->_setActiveMenu('system/convert'); + $this->_setActiveMenu('system/convert/profiles'); $this->_addContent( $this->getLayout()->createBlock('adminhtml/system_convert_profile_edit') diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php index 2a042a75a5b..9b1e7beca0e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php @@ -50,7 +50,7 @@ public function indexAction() $this->_title($this->__('System'))->_title($this->__('Manage Currency Rates')); $this->loadLayout(); - $this->_setActiveMenu('system/currency'); + $this->_setActiveMenu('system/currency/rates'); $this->_addContent($this->getLayout()->createBlock('adminhtml/system_currency')); $this->renderLayout(); } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php index 780a432dbb0..5e38ff397d0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +41,7 @@ public function indexAction() $this->_title($this->__('System'))->_title($this->__('Design')); $this->loadLayout(); - $this->_setActiveMenu('system'); + $this->_setActiveMenu('system/design'); $this->_addContent($this->getLayout()->createBlock('adminhtml/system_design')); $this->renderLayout(); } @@ -61,7 +61,7 @@ public function editAction() $this->_title($this->__('System'))->_title($this->__('Design')); $this->loadLayout(); - $this->_setActiveMenu('system'); + $this->_setActiveMenu('system/design'); $this->getLayout()->getBlock('head')->setCanLoadExtJs(true); $id = (int) $this->getRequest()->getParam('id'); diff --git a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php index 07f04a18227..eff9fcaf866 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php index 0411a7f8709..b42a16e2573 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php index 5ff6f509ea5..a190b031353 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php index fc07f93bdd5..c1828e3e142 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php index 2740d0685a2..208e7f832fa 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml index 3d05467b27c..759cdd93c41 100644 --- a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml +++ b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php index 4616a2e6e1e..b86fd26b324 100644 --- a/app/code/core/Mage/Api/Helper/Data.php +++ b/app/code/core/Mage/Api/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php index 189c550dadc..088b4f3ee87 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,9 +24,6 @@ class Mage_Api_Model_Acl_Assert_Ip implements Zend_Acl_Assert_Interface /** * Check whether ip is allowed * - * @param Mage_Api_Model_Acl $acl - * @param Mage_Api_Model_Acl_Role|null $role - * @param Mage_Api_Model_Acl_Resource|null $resource * @param string|null $privilege * @return bool|null */ diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php index 903cbe17030..819743e046d 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,9 +24,6 @@ class Mage_Api_Model_Acl_Assert_Time implements Zend_Acl_Assert_Interface /** * Assert time * - * @param Mage_Api_Model_Acl $acl - * @param Mage_Api_Model_Acl_Role|null $role - * @param Mage_Api_Model_Acl_Resource|null $resource * @param string|null $privilege * @return bool|null */ diff --git a/app/code/core/Mage/Api/Model/Config.php b/app/code/core/Mage/Api/Model/Config.php index 21dc1b7e690..3086ea6c2ed 100644 --- a/app/code/core/Mage/Api/Model/Config.php +++ b/app/code/core/Mage/Api/Model/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -154,7 +154,6 @@ public function getResourcesAlias() /** * Load Acl resources from config * - * @param Mage_Api_Model_Acl $acl * @param Mage_Core_Model_Config_Element $resource * @param string $parentName * @return $this diff --git a/app/code/core/Mage/Api/Model/Resource/Abstract.php b/app/code/core/Mage/Api/Model/Resource/Abstract.php index dbf60c81e94..43a28f187f9 100644 --- a/app/code/core/Mage/Api/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Api/Model/Resource/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,7 +51,6 @@ protected function _getConfig() /** * Set configuration for api resource * - * @param Varien_Simplexml_Element $xml * @return $this */ public function setResourceConfig(Varien_Simplexml_Element $xml) diff --git a/app/code/core/Mage/Api/Model/Resource/Acl.php b/app/code/core/Mage/Api/Model/Resource/Acl.php index 0c37479a2bf..5ddc6e8f71b 100644 --- a/app/code/core/Mage/Api/Model/Resource/Acl.php +++ b/app/code/core/Mage/Api/Model/Resource/Acl.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -65,7 +65,6 @@ public function loadAcl() /** * Load roles * - * @param Mage_Api_Model_Acl $acl * @param array[] $rolesArr * @return $this */ @@ -96,8 +95,6 @@ public function loadRoles(Mage_Api_Model_Acl $acl, array $rolesArr) /** * Load rules * - * @param Mage_Api_Model_Acl $acl - * @param array $rulesArr * @return $this */ public function loadRules(Mage_Api_Model_Acl $acl, array $rulesArr) diff --git a/app/code/core/Mage/Api/Model/Resource/Acl/Role.php b/app/code/core/Mage/Api/Model/Resource/Acl/Role.php index 41b189bdc63..0d07eda429e 100644 --- a/app/code/core/Mage/Api/Model/Resource/Acl/Role.php +++ b/app/code/core/Mage/Api/Model/Resource/Acl/Role.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ protected function _construct() /** * Action before save * - * @param Mage_Core_Model_Abstract $object * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Api/Model/Resource/Role.php b/app/code/core/Mage/Api/Model/Resource/Role.php index f9543ec94dc..1c9998d95da 100644 --- a/app/code/core/Mage/Api/Model/Resource/Role.php +++ b/app/code/core/Mage/Api/Model/Resource/Role.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Action before save * - * @param Mage_Core_Model_Abstract|Mage_Api_Model_Role $object * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Api/Model/Resource/Roles.php b/app/code/core/Mage/Api/Model/Resource/Roles.php index f3db23689fd..ea6c5d61669 100644 --- a/app/code/core/Mage/Api/Model/Resource/Roles.php +++ b/app/code/core/Mage/Api/Model/Resource/Roles.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,6 @@ protected function _construct() /** * Process role before saving * - * @param Mage_Core_Model_Abstract|Mage_Api_Model_Roles $role * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $role) @@ -74,7 +73,6 @@ protected function _beforeSave(Mage_Core_Model_Abstract $role) /** * Action after save * - * @param Mage_Core_Model_Abstract $role * @return $this */ protected function _afterSave(Mage_Core_Model_Abstract $role) @@ -87,7 +85,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $role) /** * Action after delete * - * @param Mage_Core_Model_Abstract $role * @return $this */ protected function _afterDelete(Mage_Core_Model_Abstract $role) @@ -101,7 +98,6 @@ protected function _afterDelete(Mage_Core_Model_Abstract $role) /** * Get role users * - * @param Mage_Api_Model_Roles $role * @return array */ public function getRoleUsers(Mage_Api_Model_Roles $role) @@ -118,7 +114,6 @@ public function getRoleUsers(Mage_Api_Model_Roles $role) /** * Update role users * - * @param Mage_Api_Model_Roles $role * @return bool */ private function _updateRoleUsersAcl(Mage_Api_Model_Roles $role) diff --git a/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php b/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php index 66074b75dd4..ca5d55cb77a 100644 --- a/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Rules.php b/app/code/core/Mage/Api/Model/Resource/Rules.php index 37acd6032ad..cb708733693 100644 --- a/app/code/core/Mage/Api/Model/Resource/Rules.php +++ b/app/code/core/Mage/Api/Model/Resource/Rules.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,8 +28,6 @@ protected function _construct() /** * Save rule - * - * @param Mage_Api_Model_Rules $rule */ public function saveRel(Mage_Api_Model_Rules $rule) { diff --git a/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php b/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php index ed564251cff..b2565893571 100644 --- a/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/User.php b/app/code/core/Mage/Api/Model/Resource/User.php index 88c82fd809d..a5dd3997889 100644 --- a/app/code/core/Mage/Api/Model/Resource/User.php +++ b/app/code/core/Mage/Api/Model/Resource/User.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,7 +49,6 @@ protected function _initUniqueFields() /** * Authenticate user by $username and $password * - * @param Mage_Api_Model_User $user * @return $this */ public function recordLogin(Mage_Api_Model_User $user) @@ -65,7 +64,6 @@ public function recordLogin(Mage_Api_Model_User $user) /** * Record api user session * - * @param Mage_Api_Model_User $user * @return $this */ public function recordSession(Mage_Api_Model_User $user) @@ -101,7 +99,6 @@ public function recordSession(Mage_Api_Model_User $user) /** * Clean old session * - * @param Mage_Api_Model_User|null $user * @return $this */ public function cleanOldSessions(?Mage_Api_Model_User $user) @@ -209,7 +206,6 @@ public function hasAssigned2Role($user) /** * Action before save * - * @param Mage_Core_Model_Abstract|Mage_Api_Model_User $user * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $user) @@ -225,7 +221,6 @@ protected function _beforeSave(Mage_Core_Model_Abstract $user) /** * Delete the object * - * @param Mage_Core_Model_Abstract $user * @return $this * @throws Exception */ @@ -248,7 +243,6 @@ public function delete(Mage_Core_Model_Abstract $user) /** * Save user roles * - * @param Mage_Core_Model_Abstract|Mage_Api_Model_User $user * @return $this|Mage_Core_Model_Abstract */ public function _saveRelations(Mage_Core_Model_Abstract $user) @@ -299,7 +293,6 @@ public function _saveRelations(Mage_Core_Model_Abstract $user) /** * Retrieve roles data * - * @param Mage_Core_Model_Abstract $user * @return array */ public function _getRoles(Mage_Core_Model_Abstract $user) @@ -327,7 +320,6 @@ public function _getRoles(Mage_Core_Model_Abstract $user) /** * Add Role * - * @param Mage_Core_Model_Abstract|Mage_Api_Model_User $user * @return $this */ public function add(Mage_Core_Model_Abstract $user) @@ -363,7 +355,6 @@ public function add(Mage_Core_Model_Abstract $user) /** * Delete from role * - * @param Mage_Core_Model_Abstract|Mage_Api_Model_User $user * @return $this */ public function deleteFromRole(Mage_Core_Model_Abstract $user) @@ -390,7 +381,6 @@ public function deleteFromRole(Mage_Core_Model_Abstract $user) /** * Retrieve roles which exists for user * - * @param Mage_Core_Model_Abstract|Mage_Api_Model_User $user * @return array */ public function roleUserExists(Mage_Core_Model_Abstract $user) @@ -409,7 +399,6 @@ public function roleUserExists(Mage_Core_Model_Abstract $user) /** * Check if user not unique * - * @param Mage_Core_Model_Abstract|Mage_Api_Model_User $user * @return array */ public function userExists(Mage_Core_Model_Abstract $user) diff --git a/app/code/core/Mage/Api/Model/Roles.php b/app/code/core/Mage/Api/Model/Roles.php index 026564883ae..bc4b5712aa1 100644 --- a/app/code/core/Mage/Api/Model/Roles.php +++ b/app/code/core/Mage/Api/Model/Roles.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -99,7 +99,6 @@ public function getRoleUsers() } /** - * @param Varien_Simplexml_Element|null $resource * @param string|null $parentName * @param int $level * @param bool|null $represent2Darray diff --git a/app/code/core/Mage/Api/Model/Server.php b/app/code/core/Mage/Api/Model/Server.php index b7444712fa4..9ca7e2b1ed1 100644 --- a/app/code/core/Mage/Api/Model/Server.php +++ b/app/code/core/Mage/Api/Model/Server.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -61,7 +61,6 @@ public function getAdapterCodeByAlias($alias) /** * Initialize server components * - * @param Mage_Api_Controller_Action $controller * @param string $adapter Adapter name * @param string $handler Handler name * @return $this diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php index 625b9847cfc..0024f757a7a 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,7 +39,6 @@ public function getHandler(); /** * Set webservice api controller * - * @param Mage_Api_Controller_Action $controller * @return Mage_Api_Model_Server_Adapter_Interface */ public function setController(Mage_Api_Controller_Action $controller); diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Jsonrpc.php b/app/code/core/Mage/Api/Model/Server/Adapter/Jsonrpc.php index 6aa4d3f7756..84e13510f2b 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Jsonrpc.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Jsonrpc.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2023-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,6 @@ public function getHandler() /** * Set webservice api controller * - * @param Mage_Api_Controller_Action $controller * @return $this */ public function setController(Mage_Api_Controller_Action $controller) diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php index 36cafcc06e4..dfc8aba430c 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -87,7 +87,6 @@ public function getHandler() /** * Set webservice api controller * - * @param Mage_Api_Controller_Action $controller * @return $this */ public function setController(Mage_Api_Controller_Action $controller) diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php index 9ed16c81f41..54bf2cf8fbf 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,7 +53,6 @@ public function getHandler() /** * Set webservice api controller * - * @param Mage_Api_Controller_Action $controller * @return $this */ public function setController(Mage_Api_Controller_Action $controller) diff --git a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php index a3f55d0998b..3b28667f384 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php +++ b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -311,7 +311,6 @@ public function call($sessionId, $apiPath, $args = []) * Multiple calls of resource functionality * * @param string $sessionId - * @param array $calls * @param array $options * @return array|void */ diff --git a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php index 292f1741200..5e6611d6dbc 100644 --- a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php index 3a6796a80b7..2a2051c9eca 100644 --- a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Session.php b/app/code/core/Mage/Api/Model/Session.php index e91e6b71b02..c9a2716c4ef 100644 --- a/app/code/core/Mage/Api/Model/Session.php +++ b/app/code/core/Mage/Api/Model/Session.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -99,7 +99,6 @@ public function clear() /** * Flag login as HTTP Basic Auth. * - * @param bool $isInstaLogin * @return $this */ public function setIsInstaLogin(bool $isInstaLogin = true) @@ -110,8 +109,6 @@ public function setIsInstaLogin(bool $isInstaLogin = true) /** * Is insta-login? - * - * @return bool */ public function getIsInstaLogin(): bool { diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config.php b/app/code/core/Mage/Api/Model/Wsdl/Config.php index 0ff9b2903f8..f3895875a31 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php index 2aa6e659c9a..d6130f6b6b1 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -122,7 +122,7 @@ public function loadFile($file) /** * Set variable to be used in WSDL template processing * - * @param string $key Varible key + * @param string $key Variable key * @param string $value Variable value * @return $this */ diff --git a/app/code/core/Mage/Api/controllers/JsonrpcController.php b/app/code/core/Mage/Api/controllers/JsonrpcController.php index 3b5e154c4e0..cff1b201545 100644 --- a/app/code/core/Mage/Api/controllers/JsonrpcController.php +++ b/app/code/core/Mage/Api/controllers/JsonrpcController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/etc/api.xml b/app/code/core/Mage/Api/etc/api.xml index db925cba726..bcea39aab3d 100644 --- a/app/code/core/Mage/Api/etc/api.xml +++ b/app/code/core/Mage/Api/etc/api.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml index c23700d3c33..da16b55214f 100644 --- a/app/code/core/Mage/Api/etc/config.xml +++ b/app/code/core/Mage/Api/etc/config.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter.php b/app/code/core/Mage/Api2/Model/Acl/Filter.php index cefef4dd4f6..b1d53ceb7d3 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,8 +44,6 @@ class Mage_Api2_Model_Acl_Filter /** * Object constructor - * - * @param Mage_Api2_Model_Resource $resource */ public function __construct(Mage_Api2_Model_Resource $resource) { @@ -161,7 +159,6 @@ public function getAttributesToInclude() /** * Filter data for write operations * - * @param array $requestData * @return array */ public function in(array $requestData) @@ -174,7 +171,6 @@ public function in(array $requestData) /** * Filter data before output * - * @param array $retrievedData * @return array */ public function out(array $retrievedData) diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php index f58a244ca00..089bf66aa56 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Global.php b/app/code/core/Mage/Api2/Model/Acl/Global.php index 1d4bc75c11d..1472900a560 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Api2_Model_Acl_Global /** * Check if the operation is allowed on resources of given type type for given user type/role * - * @param Mage_Api2_Model_Auth_User_Abstract $apiUser * @param string $resourceType * @param string $operation * @return bool diff --git a/app/code/core/Mage/Api2/Model/Auth.php b/app/code/core/Mage/Api2/Model/Auth.php index 18e2cb01bf6..0b560916624 100644 --- a/app/code/core/Mage/Api2/Model/Auth.php +++ b/app/code/core/Mage/Api2/Model/Auth.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ class Mage_Api2_Model_Auth /** * Figure out API user type and create user model instance * - * @param Mage_Api2_Model_Request $request * @throws Exception * @return Mage_Api2_Model_Auth_User_Abstract */ diff --git a/app/code/core/Mage/Api2/Model/Auth/Adapter.php b/app/code/core/Mage/Api2/Model/Auth/Adapter.php index 0178ccb68c4..86439f692db 100644 --- a/app/code/core/Mage/Api2/Model/Auth/Adapter.php +++ b/app/code/core/Mage/Api2/Model/Auth/Adapter.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,7 +58,6 @@ protected function _initAdapters() * * Returns stdClass object with two properties: type and id * - * @param Mage_Api2_Model_Request $request * @return stdClass */ public function getUserParams(Mage_Api2_Model_Request $request) diff --git a/app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php b/app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php index 6d217f065ac..44328cf104d 100644 --- a/app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php +++ b/app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +26,6 @@ abstract class Mage_Api2_Model_Auth_Adapter_Abstract * * Returns stdClass object with two properties: type and id * - * @param Mage_Api2_Model_Request $request * @return stdClass */ abstract public function getUserParams(Mage_Api2_Model_Request $request); @@ -34,7 +33,6 @@ abstract public function getUserParams(Mage_Api2_Model_Request $request); /** * Check if request contains authentication info for adapter * - * @param Mage_Api2_Model_Request $request * @return bool */ abstract public function isApplicableToRequest(Mage_Api2_Model_Request $request); diff --git a/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php b/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php index b552cd17d68..a4f1dba5a8d 100644 --- a/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php +++ b/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +26,6 @@ class Mage_Api2_Model_Auth_Adapter_Oauth extends Mage_Api2_Model_Auth_Adapter_Ab * * Returns stdClass object with two properties: type and id * - * @param Mage_Api2_Model_Request $request * @return stdClass */ public function getUserParams(Mage_Api2_Model_Request $request) @@ -54,7 +53,6 @@ public function getUserParams(Mage_Api2_Model_Request $request) /** * Check if request contains authentication info for adapter * - * @param Mage_Api2_Model_Request $request * @return bool */ public function isApplicableToRequest(Mage_Api2_Model_Request $request) diff --git a/app/code/core/Mage/Api2/Model/Dispatcher.php b/app/code/core/Mage/Api2/Model/Dispatcher.php index 9af072cf80e..e1577105b08 100644 --- a/app/code/core/Mage/Api2/Model/Dispatcher.php +++ b/app/code/core/Mage/Api2/Model/Dispatcher.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,8 +36,6 @@ class Mage_Api2_Model_Dispatcher /** * Instantiate resource class, set parameters to the instance, run resource internal dispatch method * - * @param Mage_Api2_Model_Request $request - * @param Mage_Api2_Model_Response $response * @return $this * @throws Mage_Api2_Exception */ @@ -97,7 +95,6 @@ public static function loadResourceModel($model, $apiType, $userType, $version) /** * Set API user object * - * @param Mage_Api2_Model_Auth_User_Abstract $apiUser * @return $this */ public function setApiUser(Mage_Api2_Model_Auth_User_Abstract $apiUser) diff --git a/app/code/core/Mage/Api2/Model/Multicall.php b/app/code/core/Mage/Api2/Model/Multicall.php index b709d40316e..0bc1560ab13 100644 --- a/app/code/core/Mage/Api2/Model/Multicall.php +++ b/app/code/core/Mage/Api2/Model/Multicall.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,7 +36,6 @@ class Mage_Api2_Model_Multicall * * @param string $parentResourceId * @param string $parentResourceName - * @param Mage_Api2_Model_Request $parentCallRequest * @return Mage_Api2_Model_Response */ public function call($parentResourceId, $parentResourceName, Mage_Api2_Model_Request $parentCallRequest) @@ -231,8 +230,6 @@ protected function _getRequest() /** * Add internal call response to global response - * - * @param Mage_Api2_Model_Response $response */ protected function _aggregateResponse(Mage_Api2_Model_Response $response) { diff --git a/app/code/core/Mage/Api2/Model/Observer.php b/app/code/core/Mage/Api2/Model/Observer.php index 23497dcd7d2..1f15c00d09e 100644 --- a/app/code/core/Mage/Api2/Model/Observer.php +++ b/app/code/core/Mage/Api2/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ class Mage_Api2_Model_Observer { /** * Save relation of admin user to API2 role - * - * @param Varien_Event_Observer $observer */ public function saveAdminToRoleRelation(Varien_Event_Observer $observer) { @@ -47,7 +45,6 @@ public function saveAdminToRoleRelation(Varien_Event_Observer $observer) /** * After save attribute if it is not visible on front remove it from Attribute ACL * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogAttributeSaveAfter(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Api2/Model/Resource.php b/app/code/core/Mage/Api2/Model/Resource.php index 1ea75077f71..a3946e74493 100644 --- a/app/code/core/Mage/Api2/Model/Resource.php +++ b/app/code/core/Mage/Api2/Model/Resource.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -312,7 +312,6 @@ public function getRequest() /** * Set request * - * @param Mage_Api2_Model_Request $request * @return $this */ public function setRequest(Mage_Api2_Model_Request $request) @@ -417,8 +416,6 @@ public function getResponse() /** * Set response - * - * @param Mage_Api2_Model_Response $response */ public function setResponse(Mage_Api2_Model_Response $response) { @@ -442,8 +439,6 @@ public function getFilter() /** * Set filter - * - * @param Mage_Api2_Model_Acl_Filter $filter */ public function setFilter(Mage_Api2_Model_Acl_Filter $filter) { @@ -467,8 +462,6 @@ public function getRenderer() /** * Set renderer - * - * @param Mage_Api2_Model_Renderer_Interface $renderer */ public function setRenderer(Mage_Api2_Model_Renderer_Interface $renderer) { @@ -518,7 +511,6 @@ public function getApiUser() /** * Set API user * - * @param Mage_Api2_Model_Auth_User_Abstract $apiUser * @return $this */ public function setApiUser(Mage_Api2_Model_Auth_User_Abstract $apiUser) @@ -700,7 +692,6 @@ protected function _errorMessage($message, $code, $params = []) /** * Set navigation parameters and apply filters from URL params * - * @param Varien_Data_Collection_Db $collection * @return $this */ final protected function _applyCollectionModifiers(Varien_Data_Collection_Db $collection) @@ -738,7 +729,6 @@ final protected function _applyCollectionModifiers(Varien_Data_Collection_Db $co /** * Validate filter data and apply it to collection if possible * - * @param Varien_Data_Collection_Db $collection * @return $this */ protected function _applyFilter(Varien_Data_Collection_Db $collection) @@ -881,7 +871,7 @@ protected function _getLocation($resource) } /** - * Resource specific method to retrieve attributes' codes. May be overriden in child. + * Resource specific method to retrieve attributes' codes. May be overridden in child. * * @return array */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php index 6d375398988..ef7fc928e5c 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -88,7 +88,6 @@ public function deleteAdminToRoleRelation($adminId, $roleId) /** * Get users * - * @param Mage_Api2_Model_Acl_Global_Role $role * @return array */ public function getRoleUsers(Mage_Api2_Model_Acl_Global_Role $role) diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator.php b/app/code/core/Mage/Api2/Model/Resource/Validator.php index 7603f05ae39..594d2d6f185 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ abstract class Mage_Api2_Model_Resource_Validator /** * Set an array of errors * - * @param array $data * @return Mage_Api2_Model_Resource_Validator */ protected function _setErrors(array $data) diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php index 8d5b3aee797..cce87dda662 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -111,7 +111,6 @@ public function __construct($options) /** * Validate attribute value for attributes with source models * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param mixed $attrValue * @return array|bool */ @@ -152,7 +151,6 @@ protected function _validateAttributeWithSource(Mage_Eav_Model_Entity_Attribute_ /** * Filter request data. * - * @param array $data * @return array Filtered data */ public function filter(array $data) @@ -168,7 +166,6 @@ public function filter(array $data) * getErrors() will return an array of errors that explain why the * validation failed. * - * @param array $data * @param bool $partial * @return bool */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php index f22c15906a4..4435b307e7e 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -77,7 +77,6 @@ public function __construct($options) /** * Build validator chain with config data * - * @param array $validationConfig * @throws Exception If validator type is not set * @throws Exception If validator is not exist */ @@ -136,7 +135,6 @@ protected function _getValidatorInstance($type, $options) * getErrors() will return an array of errors that explain why the * validation failed. * - * @param array $data * @param bool $isPartial * @return bool */ diff --git a/app/code/core/Mage/Api2/Model/Response.php b/app/code/core/Mage/Api2/Model/Response.php index c8663a67a31..b326da33822 100644 --- a/app/code/core/Mage/Api2/Model/Response.php +++ b/app/code/core/Mage/Api2/Model/Response.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,7 +52,7 @@ public function setMimeType($mimeType) } /** - * Add message to responce + * Add message to response * * @param string $message * @param string $code diff --git a/app/code/core/Mage/Api2/Model/Route/Abstract.php b/app/code/core/Mage/Api2/Model/Route/Abstract.php index 6dad7263e66..12ce5088ca1 100644 --- a/app/code/core/Mage/Api2/Model/Route/Abstract.php +++ b/app/code/core/Mage/Api2/Model/Route/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,8 +45,6 @@ abstract class Mage_Api2_Model_Route_Abstract extends Zend_Controller_Router_Rou /** * Process construct param and call parent::__construct() with params - * - * @param array $arguments */ public function __construct(array $arguments) { @@ -63,7 +61,6 @@ public function __construct(array $arguments) * Retrieve argument value * * @param string $name argument name - * @param array $arguments * @return mixed */ protected function _getArgumentValue($name, array $arguments) diff --git a/app/code/core/Mage/Api2/Model/Route/ApiType.php b/app/code/core/Mage/Api2/Model/Route/ApiType.php index 6ffd07566bc..b5be739d300 100644 --- a/app/code/core/Mage/Api2/Model/Route/ApiType.php +++ b/app/code/core/Mage/Api2/Model/Route/ApiType.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Router.php b/app/code/core/Mage/Api2/Model/Router.php index f49948f58a1..075cc5383c9 100644 --- a/app/code/core/Mage/Api2/Model/Router.php +++ b/app/code/core/Mage/Api2/Model/Router.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ class Mage_Api2_Model_Router /** * Set routes * - * @param array $routes * @return $this */ public function setRoutes(array $routes) @@ -55,7 +54,6 @@ public function getRoutes() * Route the Request, the only responsibility of the class * Find route that match current URL, set parameters of the route to Request object * - * @param Mage_Api2_Model_Request $request * @return Mage_Api2_Model_Request * @throws Mage_Api2_Exception */ @@ -86,7 +84,6 @@ public function route(Mage_Api2_Model_Request $request) /** * Set API type to request as a result of one pass route * - * @param Mage_Api2_Model_Request $request * @param bool $trimApiTypePath OPTIONAL If TRUE - /api/:api_type part of request path info will be trimmed * @return $this * @throws Mage_Api2_Exception diff --git a/app/code/core/Mage/Api2/Model/Server.php b/app/code/core/Mage/Api2/Model/Server.php index 4f414a4b176..3407bbc32f3 100644 --- a/app/code/core/Mage/Api2/Model/Server.php +++ b/app/code/core/Mage/Api2/Model/Server.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -111,8 +111,6 @@ public function run() /** * Make internal call to api * - * @param Mage_Api2_Model_Request $request - * @param Mage_Api2_Model_Response $response * @throws Mage_Api2_Exception */ public function internalCall(Mage_Api2_Model_Request $request, Mage_Api2_Model_Response $response) @@ -127,7 +125,6 @@ public function internalCall(Mage_Api2_Model_Request $request, Mage_Api2_Model_R * Authenticate user * * @throws Exception - * @param Mage_Api2_Model_Request $request * @return Mage_Api2_Model_Auth_User_Abstract */ protected function _authenticate(Mage_Api2_Model_Request $request) @@ -143,7 +140,6 @@ protected function _authenticate(Mage_Api2_Model_Request $request) * Set auth user * * @throws Exception - * @param Mage_Api2_Model_Auth_User_Abstract $authUser * @return $this */ protected function _setAuthUser(Mage_Api2_Model_Auth_User_Abstract $authUser) @@ -171,7 +167,6 @@ protected function _getAuthUser() * Set all routes of the given api type to Route object * Find route that match current URL, set parameters of the route to Request object * - * @param Mage_Api2_Model_Request $request * @return $this */ protected function _route(Mage_Api2_Model_Request $request) @@ -189,8 +184,6 @@ protected function _route(Mage_Api2_Model_Request $request) /** * Global ACL processing * - * @param Mage_Api2_Model_Request $request - * @param Mage_Api2_Model_Auth_User_Abstract $apiUser * @return $this * @throws Mage_Api2_Exception */ @@ -209,9 +202,6 @@ protected function _allow(Mage_Api2_Model_Request $request, Mage_Api2_Model_Auth * Load class file, instantiate resource class, set parameters to the instance, run resource internal dispatch * method * - * @param Mage_Api2_Model_Request $request - * @param Mage_Api2_Model_Response $response - * @param Mage_Api2_Model_Auth_User_Abstract $apiUser * @return $this */ protected function _dispatch( @@ -240,9 +230,6 @@ protected function _getConfig() * Process thrown exception * Generate and set HTTP response code, error message to Response object * - * @param Exception $exception - * @param Mage_Api2_Model_Renderer_Interface $renderer - * @param Mage_Api2_Model_Response $response * @return $this */ protected function _renderException( diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php index 625c2e5f228..11f8b6ace35 100644 --- a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php +++ b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php @@ -47,7 +47,7 @@ public function indexAction() ->_title($this->__('Web Services')) ->_title($this->__('REST Attributes')); - $this->loadLayout()->_setActiveMenu('system/services/attributes'); + $this->loadLayout()->_setActiveMenu('system/api/rest_attributes'); $this->_addBreadcrumb($this->__('Web services'), $this->__('Web services')) ->_addBreadcrumb($this->__('REST Attributes'), $this->__('REST Attributes')) @@ -62,7 +62,7 @@ public function indexAction() public function editAction() { $this->loadLayout() - ->_setActiveMenu('system/services/attributes'); + ->_setActiveMenu('system/api/rest_attributes'); $type = $this->getRequest()->getParam('type'); diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php index c1ef897571d..4b33cca7072 100644 --- a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php +++ b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +41,7 @@ public function indexAction() ->_title($this->__('Web Services')) ->_title($this->__('REST Roles')); - $this->loadLayout()->_setActiveMenu('system/services/roles'); + $this->loadLayout()->_setActiveMenu('system/api/rest_roles'); $this->_addBreadcrumb($this->__('Web services'), $this->__('Web services')); $this->_addBreadcrumb($this->__('REST Roles'), $this->__('REST Roles')); $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles')); @@ -82,7 +82,7 @@ public function newAction() ->_title($this->__('Web Services')) ->_title($this->__('Rest Roles')); - $this->loadLayout()->_setActiveMenu('system/services/roles'); + $this->loadLayout()->_setActiveMenu('system/api/rest_roles'); $this->_addBreadcrumb($this->__('Web services'), $this->__('Web services')); $this->_addBreadcrumb($this->__('REST Roles'), $this->__('REST Roles')); $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles')); diff --git a/app/code/core/Mage/Authorizenet/Helper/Admin.php b/app/code/core/Mage/Authorizenet/Helper/Admin.php index 77dcbfb1abe..cefb8685cde 100644 --- a/app/code/core/Mage/Authorizenet/Helper/Admin.php +++ b/app/code/core/Mage/Authorizenet/Helper/Admin.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Authorizenet * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/Helper/Data.php b/app/code/core/Mage/Authorizenet/Helper/Data.php index aaf36ee138f..6f66c6d038f 100644 --- a/app/code/core/Mage/Authorizenet/Helper/Data.php +++ b/app/code/core/Mage/Authorizenet/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Authorizenet * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -126,8 +126,6 @@ public function getControllerName() /** * Update all child and parent order's edit increment numbers. * Needed for Admin area. - * - * @param Mage_Sales_Model_Order $order */ public function updateOrderEditIncrements(Mage_Sales_Model_Order $order) { diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost.php b/app/code/core/Mage/Authorizenet/Model/Directpost.php index 81b2b128033..4be1ca8875f 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Authorizenet * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,7 +54,6 @@ public function validate() /** * Send authorize request to gateway * - * @param Varien_Object $payment * @param float $amount * @return void * @throws Mage_Core_Exception @@ -67,7 +66,6 @@ public function authorize(Varien_Object $payment, $amount) /** * Send capture request to gateway * - * @param Varien_Object $payment * @param float $amount * @return $this * @throws Mage_Core_Exception @@ -127,7 +125,6 @@ public function canRefund() /** * Check void availability * - * @param Varien_Object $payment * @return bool */ public function canVoid(Varien_Object $payment) @@ -138,7 +135,6 @@ public function canVoid(Varien_Object $payment) /** * Void the payment through gateway * - * @param Varien_Object $payment * @return $this * @throws Mage_Core_Exception */ @@ -203,7 +199,6 @@ public function processCreditmemo($creditmemo, $payment) * Refund the amount * Need to decode Last 4 digits for request. * - * @param Varien_Object $payment * @param float $amount * @return $this * @throws Mage_Core_Exception @@ -225,7 +220,6 @@ public function refund(Varien_Object $payment, $amount) /** * refund the amount with transaction id * - * @param Varien_Object $payment * @param string $amount * @return $this * @throws Mage_Core_Exception @@ -370,7 +364,6 @@ public function generateRequestFromOrder(Mage_Sales_Model_Order $order) /** * Fill response with data. * - * @param array $postData * @return $this */ public function setResponseData(array $postData) @@ -457,8 +450,6 @@ public function process(array $responseData) /** * Fill payment with credit card data from response from Authorize.net. - * - * @param Varien_Object $payment */ protected function _fillPaymentByResponse(Varien_Object $payment) { @@ -525,7 +516,6 @@ protected function _matchAmount($amount) * Operate with order using information from Authorize.net. * Authorize order or authorize and capture it. * - * @param Mage_Sales_Model_Order $order * * @throws Exception */ @@ -589,7 +579,6 @@ protected function _authOrder(Mage_Sales_Model_Order $order) /** * Register order cancellation. Return money to customer if needed. * - * @param Mage_Sales_Model_Order $order * @param string $message * @param bool $voidPayment */ @@ -616,8 +605,6 @@ protected function _declineOrder(Mage_Sales_Model_Order $order, $message = '', $ /** * Capture order's payment using AIM. - * - * @param Mage_Sales_Model_Order $order */ protected function _captureOrder(Mage_Sales_Model_Order $order) { diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php index 03633893580..3171b1f115f 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Authorizenet * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Authorizenet_Model_Directpost_Observer /** * Save order into registry to use it in the overloaded controller. * - * @param Varien_Event_Observer $observer * @return $this */ public function saveOrderAfterSubmit(Varien_Event_Observer $observer) @@ -39,7 +38,6 @@ public function saveOrderAfterSubmit(Varien_Event_Observer $observer) /** * Set data for response of frontend saveOrder action * - * @param Varien_Event_Observer $observer * @return $this */ public function addAdditionalFieldsToResponseFrontend(Varien_Event_Observer $observer) @@ -82,7 +80,6 @@ public function addAdditionalFieldsToResponseFrontend(Varien_Event_Observer $obs * Update all edit increments for all orders if module is enabled. * Needed for correct work of edit orders in Admin area. * - * @param Varien_Event_Observer $observer * @return $this */ public function updateAllEditIncrements(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php index 7c2de8885f6..97884c5d402 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Authorizenet * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -80,7 +80,6 @@ public function generateRequestSign($merchantApiLoginId, $merchantTransactionKey /** * Set paygate data to request. * - * @param Mage_Authorizenet_Model_Directpost $paymentMethod * @return $this */ public function setConstantData(Mage_Authorizenet_Model_Directpost $paymentMethod) @@ -104,8 +103,6 @@ public function setConstantData(Mage_Authorizenet_Model_Directpost $paymentMetho /** * Set entity data to request * - * @param Mage_Sales_Model_Order $order - * @param Mage_Authorizenet_Model_Directpost $paymentMethod * @return $this */ public function setDataFromOrder(Mage_Sales_Model_Order $order, Mage_Authorizenet_Model_Directpost $paymentMethod) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php index 1dd2fb4eddd..1541f63e406 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php @@ -9,12 +9,12 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Bundle Extended Attribures Block + * Bundle Extended Attributes Block * * @category Mage * @package Mage_Bundle diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php index 458fb492161..d287f71f72d 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -98,7 +98,6 @@ public function getProduct() } /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) @@ -108,7 +107,6 @@ public function render(Varien_Data_Form_Element_Abstract $element) } /** - * @param Varien_Data_Form_Element_Abstract $element * @return $this */ public function setElement(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php index 22ae9d96f4b..9b6fe9af8da 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Bundle_Block_Adminhtml_Sales_Order_Items_Renderer extends Mage_Adminhtml_Block_Sales_Items_Renderer_Default { /** - * Getting all available childs for Invoice, Shipmen or Creditmemo item + * Getting all available children for Invoice, Shipmen or Credit memo item * * @param Varien_Object $item * @return array diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php index 6da0573e4a7..307a71f2c7e 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php index c8d1fe26e47..d172cb89421 100644 --- a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -79,7 +79,7 @@ public function getMessages() $messages = []; $quoteItem = $this->getItem(); - // Add basic messages occuring during this page load + // Add basic messages occurring during this page load $baseMessages = $quoteItem->getMessage(false); if ($baseMessages) { foreach ($baseMessages as $message) { diff --git a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php index 94bcd32ccf8..47a42ebfe62 100644 --- a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -140,7 +140,7 @@ public function getValueHtml($item) } /** - * Getting all available childs for Invoice, Shipmen or Creditmemo item + * Getting all available children for Invoice, Shipment or Credit Memo item * * @param Varien_Object $item * @return array diff --git a/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php b/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php index 883da69d5db..a9cf92e09ad 100644 --- a/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php +++ b/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,7 +43,6 @@ public function getSelectionQty($product, $selectionId) /** * Obtain final price of selection in a bundle product * - * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item * @param Mage_Catalog_Model_Product $selectionProduct * @return float */ @@ -68,7 +67,6 @@ public function getSelectionFinalPrice( * Returns array of options objects. * Each option object will contain array of selections objects * - * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item * @return array */ public function getBundleOptions(Mage_Catalog_Model_Product_Configuration_Item_Interface $item) @@ -131,7 +129,6 @@ public function getBundleOptions(Mage_Catalog_Model_Product_Configuration_Item_I /** * Retrieves product options list * - * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item * @return array */ public function getOptions(Mage_Catalog_Model_Product_Configuration_Item_Interface $item) diff --git a/app/code/core/Mage/Bundle/Model/Observer.php b/app/code/core/Mage/Bundle/Model/Observer.php index 1f114332797..ddb00771eec 100644 --- a/app/code/core/Mage/Bundle/Model/Observer.php +++ b/app/code/core/Mage/Bundle/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -251,7 +251,6 @@ public function setAttributeTabBlock($observer) /** * Initialize product options renderer with bundle specific params * - * @param Varien_Event_Observer $observer * @return $this */ public function initOptionRenderer(Varien_Event_Observer $observer) @@ -267,7 +266,6 @@ public function initOptionRenderer(Varien_Event_Observer $observer) * * @deprecated since 1.4.0.0 * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductLoadAfter(Varien_Event_Observer $observer) @@ -288,7 +286,6 @@ public function catalogProductLoadAfter(Varien_Event_Observer $observer) * @deprecated since 1.4.0.0 * @see Mage_Bundle_Model_Resource_Indexer_Price * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogIndexPlainReindexAfter(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php index d72b304e9d6..a9fae1a14ea 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Type.php +++ b/app/code/core/Mage/Bundle/Model/Product/Type.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -420,7 +420,6 @@ public function getSelectionsCollection($optionIds, $product = null) * so need to change quote item qty option value too. * * @param array $options - * @param Varien_Object|Mage_Sales_Model_Quote_Item_Option $option * @param mixed $value * @param Mage_Catalog_Model_Product $product * @return Mage_Bundle_Model_Product_Type @@ -511,7 +510,6 @@ public function isSalable($product = null) * Prepare product and its configuration to be added to some products list. * Perform standard preparation process and then prepare of bundle selections options. * - * @param Varien_Object $buyRequest * @param Mage_Catalog_Model_Product $product * @param string $processMode * @return array|string diff --git a/app/code/core/Mage/Bundle/Model/Resource/Bundle.php b/app/code/core/Mage/Bundle/Model/Resource/Bundle.php index db383b6f25d..3fa76563700 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Bundle.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php index 9b149f29ef9..92c1d7a6018 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Resource/Option.php b/app/code/core/Mage/Bundle/Model/Resource/Option.php index bca07036eb9..8e9f1166d37 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Option.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Option.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,7 +27,6 @@ protected function _construct() } /** - * @param Mage_Core_Model_Abstract|Mage_Bundle_Model_Option $object * @return $this */ protected function _afterSave(Mage_Core_Model_Abstract $object) @@ -65,7 +64,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) /** * After delete process * - * @param Mage_Core_Model_Abstract $object * @return $this */ protected function _afterDelete(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php index b0521501e39..3feef734a95 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -316,7 +316,6 @@ public function getSelections($productId) * Retrieve salable product statuses * * @param int|array $products - * @param Mage_Core_Model_Website $website * @return array * @throws Mage_Core_Exception */ @@ -421,7 +420,6 @@ public function getProductsPriceFromIndex($productIds) * Retrieve product(s) price data * * @param int|array $products - * @param Mage_Core_Model_Website $website * @return array * @throws Zend_Db_Adapter_Exception|Zend_Db_Statement_Exception */ @@ -454,9 +452,7 @@ public function getProductsPriceData($products, Mage_Core_Model_Website $website /** * Add attribute data to select * - * @param Varien_Db_Select $select * @param string $attributeCode - * @param Mage_Core_Model_Website $website * @return $this * @throws Mage_Core_Exception */ @@ -508,7 +504,6 @@ protected function _addAttributeDataToSelect( * Retrieve fixed bundle base price (with special price and rules) * * @param int $productId - * @param array $priceData * @param Mage_Core_Model_Website $website * @param Mage_Customer_Model_Group $customerGroup * @return float @@ -533,7 +528,6 @@ protected function _getBasePrice($productId, array $priceData, $website, $custom * Retrieve custom options for product * * @param int $productId - * @param Mage_Core_Model_Website $website * @return array * @throws Zend_Db_Adapter_Exception|Zend_Db_Statement_Exception */ @@ -677,7 +671,6 @@ public function getCustomOptions($productId, Mage_Core_Model_Website $website) * Calculate custom options price * Return array with indexes(0 -> min_price, 1 -> max_price) * - * @param array $options * @param float $basePrice * @param float $minPrice * @param float $maxPrice @@ -719,8 +712,6 @@ public function _calculateCustomOptions(array $options, $basePrice, $minPrice, $ * Calculate minimal and maximal price for bundle selections * Return array with prices (0 -> min_price, 1 -> max_price) * - * @param array $options - * @param array $salableStatus * @param int $productId * @param int $priceType * @param float $basePrice @@ -816,8 +807,6 @@ public function _calculateBundleSelections( * Apply special price * * @param float $finalPrice - * @param array $priceData - * @param Mage_Core_Model_Website $website * @return float */ public function _calculateSpecialPrice($finalPrice, array $priceData, Mage_Core_Model_Website $website) diff --git a/app/code/core/Mage/Bundle/Model/Resource/Selection.php b/app/code/core/Mage/Bundle/Model/Resource/Selection.php index c1dd98ca4fe..6ad64702b16 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Selection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php index e5fc2e4cf09..c7e66a4ecfd 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php index cb2045b153f..c9342d58b22 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Helper/Data.php b/app/code/core/Mage/Captcha/Helper/Data.php index 65571045883..8a20a69f879 100644 --- a/app/code/core/Mage/Captcha/Helper/Data.php +++ b/app/code/core/Mage/Captcha/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Captcha * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,7 +50,6 @@ class Mage_Captcha_Helper_Data extends Mage_Core_Helper_Abstract protected $_captcha = []; /** - * @return bool * @since 19.4.19 / 20.0.17 */ public function isEnabled(): bool diff --git a/app/code/core/Mage/Captcha/Model/Observer.php b/app/code/core/Mage/Captcha/Model/Observer.php index 8e4341020a9..bf90cd03657 100644 --- a/app/code/core/Mage/Captcha/Model/Observer.php +++ b/app/code/core/Mage/Captcha/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Captcha * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -73,7 +73,6 @@ public function checkUserLogin($observer) /** * Check Captcha On Register User Page * - * @param Varien_Event_Observer $observer * @return $this */ public function checkUserCreate(Varien_Event_Observer $observer) @@ -95,7 +94,6 @@ public function checkUserCreate(Varien_Event_Observer $observer) /** * Check Captcha On Checkout as Guest Page * - * @param Varien_Event_Observer $observer * @return $this */ public function checkGuestCheckout(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Catalog/Block/Product/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Abstract.php index d156b682def..d92a6421c9d 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -271,7 +271,6 @@ public function addPriceBlockType($type, $block = '', $template = '') /** * Get product reviews summary * - * @param Mage_Catalog_Model_Product $product * @param bool $templateType * @param bool $displayIfNoReviews * @return string @@ -452,7 +451,6 @@ public function getTierPrices($product = null) * to get correct values in different products lists. * E.g. crosssells, upsells, new products, recently viewed * - * @param Mage_Catalog_Model_Resource_Product_Collection $collection * @return Mage_Catalog_Model_Resource_Product_Collection */ protected function _addProductAttributesAndPrices(Mage_Catalog_Model_Resource_Product_Collection $collection) diff --git a/app/code/core/Mage/Catalog/Block/Product/List.php b/app/code/core/Mage/Catalog/Block/Product/List.php index 8e6a05a1228..a8fb118e5b4 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List.php +++ b/app/code/core/Mage/Catalog/Block/Product/List.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php index 0a4ed2870cd..8dc1a68d2ff 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -153,7 +153,7 @@ public function getIterableItem() /** * Set how many items we need to show in upsell block - * Notice: this parametr will be also applied + * Notice: this parameter will be also applied * * @param string $type * @param int $limit diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php index 37bd94d9821..5f1c1f6f03a 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ public function getProduct() * $excludeAttr is optional array of attribute codes to * exclude them from additional data array * - * @param array $excludeAttr * @return array */ public function getAdditionalData(array $excludeAttr = []) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options.php b/app/code/core/Mage/Catalog/Block/Product/View/Options.php index ab9cecd8499..a4ce89dbbc3 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,7 +58,6 @@ public function getProduct() /** * Set product object * - * @param Mage_Catalog_Model_Product|null $product * @return $this */ public function setProduct(?Mage_Catalog_Model_Product $product = null) @@ -177,7 +176,6 @@ public function getJsonConfig() /** * Get option html block * - * @param Mage_Catalog_Model_Product_Option $option * @return string */ public function getOptionHtml(Mage_Catalog_Model_Product_Option $option) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php index 559c59b6495..e08ff962dd9 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ abstract class Mage_Catalog_Block_Product_View_Options_Abstract extends Mage_Cor /** * Set Product object * - * @param Mage_Catalog_Model_Product|null $product * @return $this */ public function setProduct(?Mage_Catalog_Model_Product $product = null) @@ -60,7 +59,6 @@ public function getProduct() /** * Set option * - * @param Mage_Catalog_Model_Product_Option $option * @return Mage_Catalog_Block_Product_View_Options_Abstract */ public function setOption(Mage_Catalog_Model_Product_Option $option) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php index 6201403b42a..03bc030f045 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -117,7 +117,7 @@ public function getCurrentStore() } /** - * Returns additional values for js config, con be overriden by descedants + * Returns additional values for js config, con be overridden by descendants * * @return array */ diff --git a/app/code/core/Mage/Catalog/Block/Widget/Link.php b/app/code/core/Mage/Catalog/Block/Widget/Link.php index 658bdc1829a..ebcc2a235e3 100644 --- a/app/code/core/Mage/Catalog/Block/Widget/Link.php +++ b/app/code/core/Mage/Catalog/Block/Widget/Link.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Category.php b/app/code/core/Mage/Catalog/Helper/Category.php index 5ec837a85b1..97dac42da46 100644 --- a/app/code/core/Mage/Catalog/Helper/Category.php +++ b/app/code/core/Mage/Catalog/Helper/Category.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -138,7 +138,7 @@ public function getCategoryUrlSuffix($storeId = null) } /** - * Retrieve clear url for category as parrent + * Retrieve clear url for category as parent * * @param string $urlPath * @param bool $slash diff --git a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php index c15d83e9609..cc3e8483a06 100644 --- a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php +++ b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,8 +37,6 @@ class Mage_Catalog_Helper_Category_Url_Rewrite implements Mage_Catalog_Helper_Ca /** * Initialize resource and connection instances - * - * @param array $args */ public function __construct(array $args = []) { @@ -50,7 +48,6 @@ public function __construct(array $args = []) /** * Join url rewrite table to eav collection * - * @param Mage_Eav_Model_Entity_Collection_Abstract $collection * @param int $storeId * @return $this */ @@ -72,7 +69,6 @@ public function joinTableToEavCollection(Mage_Eav_Model_Entity_Collection_Abstra /** * Join url rewrite table to collection * - * @param Mage_Catalog_Model_Resource_Category_Flat_Collection $collection * @param int $storeId * @return $this|Mage_Catalog_Helper_Category_Url_Rewrite_Interface */ @@ -92,7 +88,6 @@ public function joinTableToCollection(Mage_Catalog_Model_Resource_Category_Flat_ /** * Join url rewrite to select * - * @param Varien_Db_Select $select * @param int $storeId * @return $this */ diff --git a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php index 37352922de6..27232abbf63 100644 --- a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php +++ b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ interface Mage_Catalog_Helper_Category_Url_Rewrite_Interface /** * Join url rewrite table to eav collection * - * @param Mage_Eav_Model_Entity_Collection_Abstract $collection * @param int $storeId * @return Mage_Catalog_Helper_Category_Url_Rewrite */ @@ -33,7 +32,6 @@ public function joinTableToEavCollection(Mage_Eav_Model_Entity_Collection_Abstra /** * Join url rewrite table to flat collection * - * @param Mage_Catalog_Model_Resource_Category_Flat_Collection $collection * @param int $storeId * @return Mage_Catalog_Helper_Category_Url_Rewrite_Interface */ @@ -42,7 +40,6 @@ public function joinTableToCollection(Mage_Catalog_Model_Resource_Category_Flat_ /** * Join url rewrite to select * - * @param Varien_Db_Select $select * @param int $storeId * @return Mage_Catalog_Helper_Category_Url_Rewrite */ diff --git a/app/code/core/Mage/Catalog/Helper/Data.php b/app/code/core/Mage/Catalog/Helper/Data.php index 24ada49f41b..efe6e11db43 100644 --- a/app/code/core/Mage/Catalog/Helper/Data.php +++ b/app/code/core/Mage/Catalog/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +56,7 @@ class Mage_Catalog_Helper_Data extends Mage_Core_Helper_Abstract protected $_mapApplyToProductType = null; /** - * Currenty selected store ID if applicable + * Currently selected store ID if applicable * * @var int */ @@ -332,7 +332,7 @@ public function getMsrpExplanationMessage() } /** - * Return MAP explanation message for "Whats This" window + * Return MAP explanation message for "What's This" window * * @return string */ diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php index 3939a00d2a6..500c9f99a23 100644 --- a/app/code/core/Mage/Catalog/Helper/Image.php +++ b/app/code/core/Mage/Catalog/Helper/Image.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -127,7 +127,6 @@ protected function _reset() /** * Initialize Helper to work with Image * - * @param Mage_Catalog_Model_Product $product * @param string $attributeName * @param mixed $imageFile * @return $this diff --git a/app/code/core/Mage/Catalog/Helper/Product.php b/app/code/core/Mage/Catalog/Helper/Product.php index c334c99052b..09aacc9e8f6 100644 --- a/app/code/core/Mage/Catalog/Helper/Product.php +++ b/app/code/core/Mage/Catalog/Helper/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Compare.php b/app/code/core/Mage/Catalog/Helper/Product/Compare.php index bbb419dafec..2a09255d755 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Compare.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Compare.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -83,7 +83,6 @@ class Mage_Catalog_Helper_Product_Compare extends Mage_Core_Helper_Url /** * Mage_Catalog_Helper_Product_Compare constructor. - * @param array $data */ public function __construct(array $data = []) { diff --git a/app/code/core/Mage/Catalog/Helper/Product/Configuration.php b/app/code/core/Mage/Catalog/Helper/Product/Configuration.php index 104aea171e6..8367dd73092 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Configuration.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Configuration.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,7 +28,6 @@ class Mage_Catalog_Helper_Product_Configuration extends Mage_Core_Helper_Abstrac /** * Retrieves product configuration options * - * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item * @return array */ public function getCustomOptions(Mage_Catalog_Model_Product_Configuration_Item_Interface $item) @@ -84,7 +83,6 @@ public function getCustomOptions(Mage_Catalog_Model_Product_Configuration_Item_I /** * Retrieves configuration options for configurable product * - * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item * @return array */ public function getConfigurableOptions(Mage_Catalog_Model_Product_Configuration_Item_Interface $item) @@ -103,7 +101,6 @@ public function getConfigurableOptions(Mage_Catalog_Model_Product_Configuration_ /** * Retrieves configuration options for grouped product * - * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item * @return array */ public function getGroupedOptions(Mage_Catalog_Model_Product_Configuration_Item_Interface $item) @@ -145,7 +142,6 @@ public function getGroupedOptions(Mage_Catalog_Model_Product_Configuration_Item_ /** * Retrieves product options list * - * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item * @return array */ public function getOptions(Mage_Catalog_Model_Product_Configuration_Item_Interface $item) diff --git a/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php b/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php index 30c0c53ea77..af33272eb9b 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ interface Mage_Catalog_Helper_Product_Configuration_Interface /** * Retrieves product options list * - * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item * @return array */ public function getOptions(Mage_Catalog_Model_Product_Configuration_Item_Interface $item); diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url.php b/app/code/core/Mage/Catalog/Helper/Product/Url.php index 428f8a537ec..b94dafe19c6 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,7 +85,7 @@ class Mage_Catalog_Helper_Product_Url extends Mage_Core_Helper_Url ]; /** - * Check additional instruction for convertation table in configuration + * Check additional instruction for conversion table in configuration */ public function __construct() { @@ -98,7 +98,7 @@ public function __construct() } /** - * Get chars convertation table + * Get chars conversion table * * @return array */ @@ -108,7 +108,7 @@ public function getConvertTable() } /** - * Process string based on convertation table + * Process string based on conversion table * * @param string $string * @return string diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php index a3e2e76060d..5bdca5a7be6 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,8 +37,6 @@ class Mage_Catalog_Helper_Product_Url_Rewrite implements Mage_Catalog_Helper_Pro /** * Initialize resource and connection instances - * - * @param array $args */ public function __construct(array $args = []) { @@ -50,7 +48,6 @@ public function __construct(array $args = []) /** * Prepare and return select * - * @param array $productIds * @param int $categoryId * @param int $storeId * @return Varien_Db_Select @@ -69,7 +66,6 @@ public function getTableSelect(array $productIds, $categoryId, $storeId) /** * Prepare url rewrite left join statement for given select instance and store_id parameter. * - * @param Varien_Db_Select $select * @param int $storeId * @return Mage_Catalog_Helper_Product_Url_Rewrite_Interface */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php index 7391a1c731c..c210f8028df 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ interface Mage_Catalog_Helper_Product_Url_Rewrite_Interface /** * Prepare and return select * - * @param array $productIds * @param int $categoryId * @param int $storeId * @return Varien_Db_Select @@ -34,7 +33,6 @@ public function getTableSelect(array $productIds, $categoryId, $storeId); /** * Prepare url rewrite left join statement for given select instance and store_id parameter. * - * @param Varien_Db_Select $select * @param int $storeId * @return Mage_Catalog_Helper_Product_Url_Rewrite_Interface */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product.php b/app/code/core/Mage/Catalog/Model/Api2/Product.php index f757413be4b..64f20fa68a1 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,7 +57,6 @@ public function getAvailableAttributes($userType, $operation) /** * Define if attribute should be visible for passed user type * - * @param Mage_Catalog_Model_Resource_Eav_Attribute $attribute * @param string $userType * @return bool */ diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php index a9fdba9d979..e609704fcc0 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ abstract class Mage_Catalog_Model_Api2_Product_Category_Rest extends Mage_Catalo { /** * Product category assign is not available - * - * @param array $data */ protected function _create(array $data) { @@ -33,8 +31,6 @@ protected function _create(array $data) /** * Product category update is not available - * - * @param array $data */ protected function _update(array $data) { diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php index 7328f4cf405..81c7f7634e9 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Catalog_Model_Api2_Product_Category_Rest_Admin_V1 extends Mage_Catalo /** * Product category assign * - * @param array $data * @return string */ protected function _create(array $data) diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php index c7ef04b3bfe..4cf3b398939 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,9 +25,7 @@ class Mage_Catalog_Model_Api2_Product_Image_Rest_Admin_V1 extends Mage_Catalog_M * Product image add * * @throws Mage_Api2_Exception - * @param array $data * @return string|void - * * @SuppressWarnings(PHPMD.ErrorControlOperator) */ protected function _create(array $data) @@ -142,7 +140,6 @@ protected function _retrieve() /** * Update product image * - * @param array $data * @throws Mage_Api2_Exception */ protected function _update(array $data) diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php index 8af0c2da19a..f85777fe409 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,7 +25,6 @@ class Mage_Catalog_Model_Api2_Product_Image_Validator_Image extends Mage_Api2_Mo * Validate data. In case of validation failure return false, * getErrors() could be used to retrieve list of validation error messages * - * @param array $data * @return bool */ public function isValidData(array $data) diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php index 8bb551dcb00..b11f97c0971 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,8 +81,6 @@ protected function _retrieveCollection() /** * Apply filter by category id - * - * @param Mage_Catalog_Model_Resource_Product_Collection $collection */ protected function _applyCategoryFilter(Mage_Catalog_Model_Resource_Product_Collection $collection) { @@ -98,8 +96,6 @@ protected function _applyCategoryFilter(Mage_Catalog_Model_Resource_Product_Coll /** * Add special fields to product get response - * - * @param Mage_Catalog_Model_Product $product */ protected function _prepareProductForResponse(Mage_Catalog_Model_Product $product) { @@ -153,8 +149,6 @@ protected function _prepareProductForResponse(Mage_Catalog_Model_Product $produc /** * Product create only available for admin - * - * @param array $data */ protected function _create(array $data) { @@ -163,8 +157,6 @@ protected function _create(array $data) /** * Product update only available for admin - * - * @param array $data */ protected function _update(array $data) { @@ -217,8 +209,6 @@ protected function _getProduct() /** * Set product - * - * @param Mage_Catalog_Model_Product $product */ protected function _setProduct(Mage_Catalog_Model_Product $product) { @@ -239,7 +229,7 @@ protected function _getCategoryById($categoryId) /** * Get product price with all tax settings processing * - * @param float $price inputed product price + * @param float $price inputted product price * @param bool $includingTax return price include tax flag * @param null|Mage_Customer_Model_Address $shippingAddress * @param null|Mage_Customer_Model_Address $billingAddress diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php index 9b9d0a7c3fe..5bc07c71f0a 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,8 +28,6 @@ class Mage_Catalog_Model_Api2_Product_Rest_Admin_V1 extends Mage_Catalog_Model_A /** * Add special fields to product get response - * - * @param Mage_Catalog_Model_Product $product */ protected function _prepareProductForResponse(Mage_Catalog_Model_Product $product) { @@ -51,8 +49,6 @@ protected function _prepareProductForResponse(Mage_Catalog_Model_Product $produc /** * Remove specified keys from associative or indexed array * - * @param array $array - * @param array $keys * @param bool $dropOrigKeys if true - return array as indexed array * @return array */ @@ -116,7 +112,6 @@ protected function _delete() /** * Create product * - * @param array $data * @return string */ protected function _create(array $data) @@ -177,8 +172,6 @@ protected function _create(array $data) /** * Update product by its ID - * - * @param array $data */ protected function _update(array $data) { diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php index e9f0197a4ff..9dc0b74e070 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -84,7 +84,6 @@ protected function _isUpdate() /** * Validate product data * - * @param array $data * @return bool */ public function isValidData(array $data) @@ -557,7 +556,7 @@ protected function _validateSource($data, $fieldSet, $field, $sourceModelName, $ } /** - * Validate bolean fields value + * Validate boolean fields value * * @param array $data * @param string $fieldSet @@ -583,7 +582,6 @@ protected function _validateBoolean($data, $fieldSet, $field, $skipIfConfigValue /** * Retrieve all attribute allowed values from source model in plain array format * - * @param array $options * @return array */ protected function _getAttributeAllowedValues(array $options) diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php index 9273c981555..84b5a47b915 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,6 @@ protected function _retrieveCollection() /** * Product website assign * - * @param array $data * @return string */ protected function _create(array $data) @@ -95,8 +94,6 @@ protected function _create(array $data) /** * Product website assign - * - * @param array $data */ protected function _multiCreate(array $data) { @@ -175,8 +172,6 @@ protected function _multiCreate(array $data) /** * Product websites update is not available - * - * @param array $data */ protected function _update(array $data) { diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php index 9a14062b4ef..5b43caf0e52 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,8 +27,6 @@ class Mage_Catalog_Model_Api2_Product_Website_Validator_Admin_Website extends Ma * getErrors() will return an array of errors that explain why the * validation failed. * - * @param Mage_Catalog_Model_Product $product - * @param array $data * @return bool */ public function isValidDataForWebsiteAssignmentToProduct(Mage_Catalog_Model_Product $product, array $data) @@ -163,8 +161,6 @@ protected function _checkStoreTo($website, $storeData) * getErrors() will return an array of errors that explain why the * validation failed. * - * @param Mage_Core_Model_Website $website - * @param Mage_Catalog_Model_Product $product * @return bool */ public function isWebsiteAssignedToProduct(Mage_Core_Model_Website $website, Mage_Catalog_Model_Product $product) diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php index 5ff10b609dc..ebf7d20cc44 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -687,7 +687,7 @@ public function getPathInStore() } /** - * Check category id exising + * Check category id existing * * @param int $id * @return bool @@ -729,7 +729,6 @@ public function getLevel() /** * Verify category ids * - * @param array $ids * @return array */ public function verifyIds(array $ids) diff --git a/app/code/core/Mage/Catalog/Model/Category/Api.php b/app/code/core/Mage/Catalog/Model/Category/Api.php index 8fb3120484b..5d24aa77acb 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Api.php +++ b/app/code/core/Mage/Catalog/Model/Category/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -145,7 +145,6 @@ public function tree($parentId = null, $store = null) /** * Convert node to array * - * @param Varien_Data_Tree_Node $node * @return array */ protected function _nodeToArray(Varien_Data_Tree_Node $node) @@ -168,7 +167,7 @@ protected function _nodeToArray(Varien_Data_Tree_Node $node) } /** - * Initilize and return category model + * Initialize and return category model * * @param int $categoryId * @param string|int $store diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php index 858e7fcecc6..3e449fc9d25 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -21,9 +21,6 @@ */ class Mage_Catalog_Model_Category_Attribute_Backend_Image extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { - /** - * @return array - */ public function getAllowedExtensions(): array { return Varien_Io_File::ALLOWED_IMAGES_EXTENSIONS; diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php index 08f3277bfc1..31f1a09fabe 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php index 98b3997d819..1245122ddb1 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -96,7 +96,6 @@ protected function _getIndexer() * Overwrote for check is flat catalog category is enabled and specific save * category, store, store_group * - * @param Event $event * @return bool */ public function matchEvent(Event $event) @@ -154,8 +153,6 @@ public function matchEvent(Event $event) /** * Register data required by process in event object - * - * @param Event $event */ protected function _registerEvent(Event $event) { @@ -182,7 +179,6 @@ protected function _registerEvent(Event $event) /** * Register data required by catalog category process in event object * - * @param Event $event * @return $this */ protected function _registerCatalogCategoryEvent(Event $event) @@ -210,7 +206,6 @@ protected function _registerCatalogCategoryEvent(Event $event) /** * Register core store delete process * - * @param Event $event * @return $this */ protected function _registerCoreStoreEvent(Event $event) @@ -225,8 +220,6 @@ protected function _registerCoreStoreEvent(Event $event) /** * Process event - * - * @param Event $event */ protected function _processEvent(Event $event) { diff --git a/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php index bc0205653b9..99a0b4110f3 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php +++ b/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -100,7 +100,6 @@ public function getDescription() * Check if event can be matched by process. * Overwrote for specific config save, store and store groups save matching * - * @param Mage_Index_Model_Event $event * @return bool */ public function matchEvent(Mage_Index_Model_Event $event) @@ -140,7 +139,6 @@ public function matchEvent(Mage_Index_Model_Event $event) * Register data required by process in event object * Check if category ids was changed * - * @param Mage_Index_Model_Event $event * @return Mage_Catalog_Model_Category_Indexer_Product */ protected function _registerEvent(Mage_Index_Model_Event $event) @@ -171,8 +169,6 @@ protected function _registerEvent(Mage_Index_Model_Event $event) /** * Register event data during product save process - * - * @param Mage_Index_Model_Event $event */ protected function _registerProductEvent(Mage_Index_Model_Event $event) { @@ -218,8 +214,6 @@ protected function _registerProductEvent(Mage_Index_Model_Event $event) /** * Register event data during category save process - * - * @param Mage_Index_Model_Event $event */ protected function _registerCategoryEvent(Mage_Index_Model_Event $event) { @@ -240,8 +234,6 @@ protected function _registerCategoryEvent(Mage_Index_Model_Event $event) /** * Process event data and save to index - * - * @param Mage_Index_Model_Event $event */ protected function _processEvent(Mage_Index_Model_Event $event) { diff --git a/app/code/core/Mage/Catalog/Model/Category/Url.php b/app/code/core/Mage/Catalog/Model/Category/Url.php index a046a5f5eb7..1a5a74b7058 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Url.php +++ b/app/code/core/Mage/Catalog/Model/Category/Url.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,8 +44,6 @@ class Mage_Catalog_Model_Category_Url /** * Initialize Url model - * - * @param array $args */ public function __construct(array $args = []) { @@ -55,7 +53,6 @@ public function __construct(array $args = []) /** * Retrieve Url for specified category * - * @param Mage_Catalog_Model_Category $category * @return string */ public function getCategoryUrl(Mage_Catalog_Model_Category $category) @@ -89,7 +86,6 @@ public function getCategoryUrl(Mage_Catalog_Model_Category $category) /** * Returns category URL by which it can be accessed - * @param Mage_Catalog_Model_Category $category * @return string */ protected function _getDirectUrl(Mage_Catalog_Model_Category $category) @@ -100,7 +96,6 @@ protected function _getDirectUrl(Mage_Catalog_Model_Category $category) /** * Retrieve request path * - * @param Mage_Catalog_Model_Category $category * @return bool|string */ protected function _getRequestPath(Mage_Catalog_Model_Category $category) diff --git a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php index c3ab65a4e3a..931a500dc90 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -268,7 +268,6 @@ public function getProductTypes() /** * ReDefine Product Type Instance to Product * - * @param Mage_Catalog_Model_Product $product * @return $this */ public function setProductTypeInstance(Mage_Catalog_Model_Product $product) @@ -438,7 +437,6 @@ protected function _getCollectionForLoad($entityType) } /** - * @param Mage_Catalog_Model_Product $object * @throws Mage_Core_Exception * @throws Varien_Exception */ @@ -458,7 +456,6 @@ public function getProduct() } /** - * @param Mage_CatalogInventory_Model_Stock_Item $object * @throws Mage_Core_Exception * @throws Varien_Exception */ @@ -631,7 +628,6 @@ public function saveImageDataRow($product, $importData) /** * Save product (import) * - * @param array $importData * @throws Mage_Core_Exception * @return bool */ @@ -872,7 +868,6 @@ public function saveRow(array $importData) /** * Silently save product (import) * - * @param array $importData * @return bool */ public function saveRowSilently(array $importData) diff --git a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php index 71843b923bf..7d2476422f7 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -209,7 +209,6 @@ public function getStoreId() /** * ReDefine Product Type Instance to Product * - * @param Mage_Catalog_Model_Product $product * @return $this */ public function setProductTypeInstance(Mage_Catalog_Model_Product $product) diff --git a/app/code/core/Mage/Catalog/Model/Design.php b/app/code/core/Mage/Catalog/Model/Design.php index 49007b18f80..b35268ee55a 100644 --- a/app/code/core/Mage/Catalog/Model/Design.php +++ b/app/code/core/Mage/Catalog/Model/Design.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -151,7 +151,6 @@ protected function _isApplyFor($applyForObject, $applyTo, $pass = 0) * Check and apply design * * @param string $design - * @param array $date * @return bool * @deprecated after 1.4.2.0-beta1 * diff --git a/app/code/core/Mage/Catalog/Model/Indexer/Url.php b/app/code/core/Mage/Catalog/Model/Indexer/Url.php index a6f5b42bb67..b3065fc10c3 100644 --- a/app/code/core/Mage/Catalog/Model/Indexer/Url.php +++ b/app/code/core/Mage/Catalog/Model/Indexer/Url.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -89,7 +89,6 @@ public function getDescription() * Check if event can be matched by process. * Overwrote for specific config save, store and store groups save matching * - * @param Mage_Index_Model_Event $event * @return bool */ public function matchEvent(Mage_Index_Model_Event $event) @@ -135,7 +134,6 @@ public function matchEvent(Mage_Index_Model_Event $event) /** * Register data required by process in event object * - * @param Mage_Index_Model_Event $event * @return Mage_Catalog_Model_Indexer_Url */ protected function _registerEvent(Mage_Index_Model_Event $event) @@ -167,8 +165,6 @@ protected function _registerEvent(Mage_Index_Model_Event $event) /** * Register event data during product save process - * - * @param Mage_Index_Model_Event $event */ protected function _registerProductEvent(Mage_Index_Model_Event $event) { @@ -184,8 +180,6 @@ protected function _registerProductEvent(Mage_Index_Model_Event $event) /** * Register event data during category save process - * - * @param Mage_Index_Model_Event $event */ protected function _registerCategoryEvent(Mage_Index_Model_Event $event) { @@ -205,8 +199,6 @@ protected function _registerCategoryEvent(Mage_Index_Model_Event $event) /** * Process event - * - * @param Mage_Index_Model_Event $event */ protected function _processEvent(Mage_Index_Model_Event $event) { diff --git a/app/code/core/Mage/Catalog/Model/Layer.php b/app/code/core/Mage/Catalog/Model/Layer.php index 3d9ba78d9bb..b281988bfc0 100644 --- a/app/code/core/Mage/Catalog/Model/Layer.php +++ b/app/code/core/Mage/Catalog/Model/Layer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -66,7 +66,6 @@ public function getStateKey() /** * Get default tags for current layer state * - * @param array $additionalTags * @return array */ public function getStateTags(array $additionalTags = []) diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php index 42ecfb145f6..27b1d92f994 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -80,7 +80,6 @@ public function getCleanValue() /** * Apply filter to collection * - * @param Zend_Controller_Request_Abstract $request * @param null $filterBlock deprecated * @return $this */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php index 5037bbb133f..2bb28a7c648 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,7 +67,6 @@ protected function _getOptionText($optionId) /** * Apply attribute option filter to product collection * - * @param Zend_Controller_Request_Abstract $request * @param Varien_Object $filterBlock * @return Mage_Catalog_Model_Layer_Filter_Attribute */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php index ec2b9ab2211..481819b87ac 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,7 +67,6 @@ public function getResetValue() /** * Apply category filter to layer * - * @param Zend_Controller_Request_Abstract $request * @param null $filterBlock * @return Mage_Catalog_Model_Layer_Filter_Category */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php index 65f93332872..bbdcb0be523 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,7 +58,6 @@ protected function _getResource() /** * Apply decimal range filter to product collection * - * @param Zend_Controller_Request_Abstract $request * @param Mage_Catalog_Block_Layer_Filter_Decimal $filterBlock * @return $this */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php index 79c11d72b0c..acdfd905ae5 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -356,9 +356,7 @@ protected function _validateFilter($filter) /** * Apply price range filter * - * @param Zend_Controller_Request_Abstract $request * @param null $filterBlock deprecated - * * @return $this */ public function apply(Zend_Controller_Request_Abstract $request, $filterBlock) diff --git a/app/code/core/Mage/Catalog/Model/Observer.php b/app/code/core/Mage/Catalog/Model/Observer.php index 1c584c79ce0..5be4da30dbd 100644 --- a/app/code/core/Mage/Catalog/Model/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Catalog_Model_Observer /** * Process catalog ata related with store data changes * - * @param Varien_Event_Observer $observer * @return Mage_Catalog_Model_Observer */ public function storeEdit(Varien_Event_Observer $observer) @@ -46,7 +45,6 @@ public function storeEdit(Varien_Event_Observer $observer) /** * Process catalog data related with new store * - * @param Varien_Event_Observer $observer * @return Mage_Catalog_Model_Observer */ public function storeAdd(Varien_Event_Observer $observer) @@ -67,7 +65,6 @@ public function storeAdd(Varien_Event_Observer $observer) /** * Process catalog data related with store group root category * - * @param Varien_Event_Observer $observer * @return Mage_Catalog_Model_Observer */ public function storeGroupSave(Varien_Event_Observer $observer) @@ -90,7 +87,6 @@ public function storeGroupSave(Varien_Event_Observer $observer) /** * Process delete of store * - * @param Varien_Event_Observer $observer * @return $this */ public function storeDelete(Varien_Event_Observer $observer) @@ -107,7 +103,6 @@ public function storeDelete(Varien_Event_Observer $observer) /** * Process catalog data after category move * - * @param Varien_Event_Observer $observer * @return Mage_Catalog_Model_Observer */ public function categoryMove(Varien_Event_Observer $observer) @@ -126,7 +121,6 @@ public function categoryMove(Varien_Event_Observer $observer) /** * Process catalog data after products import * - * @param Varien_Event_Observer $observer * @return Mage_Catalog_Model_Observer */ public function catalogProductImportAfter(Varien_Event_Observer $observer) @@ -139,7 +133,6 @@ public function catalogProductImportAfter(Varien_Event_Observer $observer) /** * Catalog Product Compare Items Clean * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductCompareClean(Varien_Event_Observer $observer) @@ -151,7 +144,6 @@ public function catalogProductCompareClean(Varien_Event_Observer $observer) /** * After save event of category * - * @param Varien_Event_Observer $observer * @return $this */ public function categorySaveAfter(Varien_Event_Observer $observer) @@ -167,8 +159,6 @@ public function categorySaveAfter(Varien_Event_Observer $observer) /** * Checking whether the using static urls in WYSIWYG allowed event - * - * @param Varien_Event_Observer $observer */ public function catalogCheckIsUsingStaticUrlsAllowed(Varien_Event_Observer $observer) { @@ -179,8 +169,6 @@ public function catalogCheckIsUsingStaticUrlsAllowed(Varien_Event_Observer $obse /** * Cron job method for product prices to reindex - * - * @param Mage_Cron_Model_Schedule $schedule */ public function reindexProductPrices(Mage_Cron_Model_Schedule $schedule) { @@ -192,8 +180,6 @@ public function reindexProductPrices(Mage_Cron_Model_Schedule $schedule) /** * Adds catalog categories to top menu - * - * @param Varien_Event_Observer $observer */ public function addCatalogToTopmenuItems(Varien_Event_Observer $observer) { @@ -275,7 +261,6 @@ protected function _isActiveMenuCategory($category) /** * Checks whether attribute_code by current module is reserved * - * @param Varien_Event_Observer $observer * @throws Mage_Core_Exception */ public function checkReservedAttributeCodes(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php index 0f72908b9ce..34bfefa3a8f 100644 --- a/app/code/core/Mage/Catalog/Model/Product.php +++ b/app/code/core/Mage/Catalog/Model/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2015-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2015-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -699,7 +699,7 @@ public function getStockItem() */ public function hasStockItem() { - return !!$this->_stockItem; + return (bool) $this->_stockItem; } /** @@ -812,7 +812,7 @@ protected function _afterSave() } /** - * Clear chache related with product and protect delete from not admin + * Clear cache related with product and protect delete from not admin * Register indexing event before delete product * * @inheritDoc @@ -1835,7 +1835,7 @@ public function getSku() } /** - * Retrieve weight throught type instance + * Retrieve weight through type instance * * @return float */ @@ -1871,7 +1871,6 @@ public function getProductOptionsCollection() /** * Add option to array of product options * - * @param Mage_Catalog_Model_Product_Option $option * @return $this */ public function addOption(Mage_Catalog_Model_Product_Option $option) @@ -2153,7 +2152,6 @@ public function cleanModelCache() /** * Check for empty SKU on each product * - * @param array $productIds * @return bool|null */ public function isProductsHasSku(array $productIds) @@ -2173,7 +2171,6 @@ public function isProductsHasSku(array $productIds) /** * Parse buyRequest into options values used by product * - * @param Varien_Object $buyRequest * @return Varien_Object */ public function processBuyRequest(Varien_Object $buyRequest) diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php index 2071491219e..db66a86a03c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -178,7 +178,6 @@ public function validate($object) /** * Prepare group prices data for website * - * @param array $priceData * @param string $productTypeId * @param int $websiteId * @return array diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php index 9bbd405d247..a6fcf308277 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -110,6 +110,10 @@ public function beforeSave($object) $value['images'] = Mage::helper('core')->jsonDecode($value['images']); } + if (!isset($value['values'])) { + $value['values'] = []; + } + if (!is_array($value['values']) && strlen($value['values']) > 0) { $value['values'] = Mage::helper('core')->jsonDecode($value['values']); } @@ -275,7 +279,6 @@ public function afterSave($object) /** * Add image to media gallery and return new filename * - * @param Mage_Catalog_Model_Product $product * @param string $file file path of image in file system * @param string|array $mediaAttribute code of attribute with type 'media_image', * leave blank if image should be only in gallery @@ -380,7 +383,6 @@ public function addImage( * Add images with different media attributes. * Image will be added only once if the same image is used with different media attributes * - * @param Mage_Catalog_Model_Product $product * @param array $fileAndAttributesArray array of arrays of filename and corresponding media attribute * @param string $filePath path, where image cand be found * @param bool $move if true, it will move source file @@ -419,7 +421,6 @@ public function addImagesWithDifferentMediaAttributes( /** * Update image in gallery * - * @param Mage_Catalog_Model_Product $product * @param string $file * @param array $data * @return $this @@ -458,7 +459,6 @@ public function updateImage(Mage_Catalog_Model_Product $product, $file, $data) /** * Remove image from gallery * - * @param Mage_Catalog_Model_Product $product * @param string $file * @return $this */ @@ -486,7 +486,6 @@ public function removeImage(Mage_Catalog_Model_Product $product, $file) /** * Retrieve image from gallery * - * @param Mage_Catalog_Model_Product $product * @param string $file * @return array|bool */ @@ -510,7 +509,6 @@ public function getImage(Mage_Catalog_Model_Product $product, $file) /** * Clear media attribute value * - * @param Mage_Catalog_Model_Product $product * @param string|array $mediaAttribute * @return $this */ @@ -534,7 +532,6 @@ public function clearMediaAttribute(Mage_Catalog_Model_Product $product, $mediaA /** * Set media attribute value * - * @param Mage_Catalog_Model_Product $product * @param string|array $mediaAttribute * @param string $value * @return $this diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php index 2a2995f27c7..c092746edd3 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php index f7d95c4748e..c79123f1dc4 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -93,7 +93,6 @@ public function save() /** * Add customer data from customer object * - * @param Mage_Customer_Model_Customer $customer * @return $this */ public function addCustomerData(Mage_Customer_Model_Customer $customer) @@ -174,7 +173,6 @@ public function bindCustomerLogin() /** * Customer logout bind process * - * @param Varien_Event_Observer|null $observer * @return $this */ public function bindCustomerLogout(?Varien_Event_Observer $observer = null) diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php index cbd31eace13..e74b24d69c5 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,7 +51,7 @@ class Mage_Catalog_Model_Product_Flat_Indexer extends Mage_Core_Model_Abstract public const EVENT_TYPE_REBUILD = 'catalog_product_flat_rebuild'; /** - * Standart model resource initialization + * Standard model resource initialization * */ protected function _construct() diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php index 561443bb19e..a5d37f4c142 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,7 +44,6 @@ protected function _getIndexer() /** * Catalog Entity attribute after save process * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogEntityAttributeSaveAfter(Varien_Event_Observer $observer) @@ -82,7 +81,6 @@ public function catalogEntityAttributeSaveAfter(Varien_Event_Observer $observer) /** * Catalog Product Status Update * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductStatusUpdate(Varien_Event_Observer $observer) @@ -104,7 +102,6 @@ public function catalogProductStatusUpdate(Varien_Event_Observer $observer) /** * Catalog Product Website(s) update * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductWebsiteUpdate(Varien_Event_Observer $observer) @@ -133,7 +130,6 @@ public function catalogProductWebsiteUpdate(Varien_Event_Observer $observer) /** * Catalog Product After Save * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductSaveAfter(Varien_Event_Observer $observer) @@ -153,7 +149,6 @@ public function catalogProductSaveAfter(Varien_Event_Observer $observer) /** * Add new store flat process * - * @param Varien_Event_Observer $observer * @return $this */ public function storeAdd(Varien_Event_Observer $observer) @@ -172,7 +167,6 @@ public function storeAdd(Varien_Event_Observer $observer) /** * Store edit action, check change store group * - * @param Varien_Event_Observer $observer * @return $this */ public function storeEdit(Varien_Event_Observer $observer) @@ -193,7 +187,6 @@ public function storeEdit(Varien_Event_Observer $observer) /** * Store delete after process * - * @param Varien_Event_Observer $observer * @return $this */ public function storeDelete(Varien_Event_Observer $observer) @@ -213,7 +206,6 @@ public function storeDelete(Varien_Event_Observer $observer) /** * Store Group Save process * - * @param Varien_Event_Observer $observer * @return $this */ public function storeGroupSave(Varien_Event_Observer $observer) @@ -238,7 +230,6 @@ public function storeGroupSave(Varien_Event_Observer $observer) /** * Catalog Product Import After process * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductImportAfter(Varien_Event_Observer $observer) @@ -255,7 +246,6 @@ public function catalogProductImportAfter(Varien_Event_Observer $observer) /** * Customer Group save after process * - * @param Varien_Event_Observer $observer * @return $this */ public function customerGroupSaveAfter(Varien_Event_Observer $observer) @@ -278,7 +268,6 @@ public function customerGroupSaveAfter(Varien_Event_Observer $observer) * Update category ids in flat * * @deprecated 1.3.2.2 - * @param Varien_Event_Observer $observer * @return $this */ public function catalogCategoryChangeProducts(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Catalog/Model/Product/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php index e4ae6c3e381..1a2b5ec54c0 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Image.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -198,7 +198,6 @@ public function setConstrainOnly($flag) } /** - * @param array $rgbArray * @return $this */ public function setBackgroundColor(array $rgbArray) @@ -739,7 +738,7 @@ public function getWatermarkWidth() } /** - * Set watermark heigth + * Set watermark height * * @param int $heigth * @return $this @@ -751,7 +750,7 @@ public function setWatermarkHeigth($heigth) } /** - * Get watermark heigth + * Get watermark height * * @return string */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php index b07a40b0bac..fb8bbe21aa3 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php +++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -87,8 +87,6 @@ protected function _construct() /** * Register data required by process in event object - * - * @param Mage_Index_Model_Event $event */ protected function _registerEvent(Mage_Index_Model_Event $event) { @@ -161,7 +159,6 @@ protected function _attributeIsDependent($attribute) /** * Register data required by process in event object * - * @param Mage_Index_Model_Event $event * @return $this */ protected function _registerCatalogProductSaveEvent(Mage_Index_Model_Event $event) @@ -190,7 +187,6 @@ protected function _registerCatalogProductSaveEvent(Mage_Index_Model_Event $even /** * Register data required by process in event object * - * @param Mage_Index_Model_Event $event * @return $this */ protected function _registerCatalogProductDeleteEvent(Mage_Index_Model_Event $event) @@ -209,7 +205,6 @@ protected function _registerCatalogProductDeleteEvent(Mage_Index_Model_Event $ev /** * Register data required by process in event object * - * @param Mage_Index_Model_Event $event * @return $this */ protected function _registerCatalogProductMassActionEvent(Mage_Index_Model_Event $event) @@ -249,7 +244,6 @@ protected function _registerCatalogProductMassActionEvent(Mage_Index_Model_Event /** * Register data required by process attribute save in event object * - * @param Mage_Index_Model_Event $event * @return $this */ protected function _registerCatalogAttributeSaveEvent(Mage_Index_Model_Event $event) @@ -276,8 +270,6 @@ protected function _registerCatalogAttributeSaveEvent(Mage_Index_Model_Event $ev /** * Process event - * - * @param Mage_Index_Model_Event $event */ protected function _processEvent(Mage_Index_Model_Event $event) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php index e20f5fc4d47..5bd35d8b70f 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -100,7 +100,6 @@ protected function _getIndexer() * Overwrote for check is flat catalog product is enabled and specific save * attribute, store, store_group * - * @param Mage_Index_Model_Event $event * @return bool */ public function matchEvent(Mage_Index_Model_Event $event) @@ -176,8 +175,6 @@ public function matchEvent(Mage_Index_Model_Event $event) /** * Register data required by process in event object - * - * @param Mage_Index_Model_Event $event */ protected function _registerEvent(Mage_Index_Model_Event $event) { @@ -213,7 +210,6 @@ protected function _registerEvent(Mage_Index_Model_Event $event) /** * Register data required by catalog product process in event object * - * @param Mage_Index_Model_Event $event * @return $this */ protected function _registerCatalogProductEvent(Mage_Index_Model_Event $event) @@ -272,7 +268,6 @@ protected function _registerCatalogProductEvent(Mage_Index_Model_Event $event) /** * Register core store delete process * - * @param Mage_Index_Model_Event $event * @return $this */ protected function _registerCoreStoreEvent(Mage_Index_Model_Event $event) @@ -287,8 +282,6 @@ protected function _registerCoreStoreEvent(Mage_Index_Model_Event $event) /** * Process event - * - * @param Mage_Index_Model_Event $event */ protected function _processEvent(Mage_Index_Model_Event $event) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php index dc3cd328b6c..bd9a98dfbab 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -122,9 +122,8 @@ protected function _getDependentAttributes() /** * Check if event can be matched by process. - * Rewrited for checking configuration settings save (like price scope). + * Rewritten for checking configuration settings save (like price scope). * - * @param Mage_Index_Model_Event $event * @return bool */ public function matchEvent(Mage_Index_Model_Event $event) @@ -154,8 +153,6 @@ public function matchEvent(Mage_Index_Model_Event $event) /** * Register data required by catalog product delete process - * - * @param Mage_Index_Model_Event $event */ protected function _registerCatalogProductDeleteEvent(Mage_Index_Model_Event $event) { @@ -170,8 +167,6 @@ protected function _registerCatalogProductDeleteEvent(Mage_Index_Model_Event $ev /** * Register data required by catalog product save process - * - * @param Mage_Index_Model_Event $event */ protected function _registerCatalogProductSaveEvent(Mage_Index_Model_Event $event) { @@ -193,9 +188,6 @@ protected function _registerCatalogProductSaveEvent(Mage_Index_Model_Event $even } } - /** - * @param Mage_Index_Model_Event $event - */ protected function _registerCatalogProductMassActionEvent(Mage_Index_Model_Event $event) { $actionObject = $event->getDataObject(); @@ -226,8 +218,6 @@ protected function _registerCatalogProductMassActionEvent(Mage_Index_Model_Event /** * Register data required by process in event object - * - * @param Mage_Index_Model_Event $event */ protected function _registerEvent(Mage_Index_Model_Event $event) { @@ -267,8 +257,6 @@ protected function _registerEvent(Mage_Index_Model_Event $event) /** * Process event - * - * @param Mage_Index_Model_Event $event */ protected function _processEvent(Mage_Index_Model_Event $event) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Option.php b/app/code/core/Mage/Catalog/Model/Product/Option.php index edf72c02fa6..2110503689e 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -158,7 +158,6 @@ protected function _construct() /** * Add value of option to values array * - * @param Mage_Catalog_Model_Product_Option_Value $value * @return $this */ public function addValue(Mage_Catalog_Model_Product_Option_Value $value) @@ -259,7 +258,6 @@ public function getProduct() /** * Set product instance * - * @param Mage_Catalog_Model_Product|null $product * @return $this */ public function setProduct(?Mage_Catalog_Model_Product $product = null) @@ -444,7 +442,6 @@ public function deleteTitles($option_id) /** * get Product Option Collection * - * @param Mage_Catalog_Model_Product $product * @return Mage_Catalog_Model_Resource_Product_Option_Collection */ public function getProductOptionCollection(Mage_Catalog_Model_Product $product) diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php index 364b8c9a7c2..fc551983d47 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php index 2ce092c7311..e03007a61be 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -86,7 +86,6 @@ public function unsetValues() } /** - * @param Mage_Catalog_Model_Product_Option $option * @return $this */ public function setOption(Mage_Catalog_Model_Product_Option $option) @@ -179,7 +178,6 @@ public function getPrice($flag = false) } /** - * @param Mage_Catalog_Model_Product_Option $option * @return Mage_Catalog_Model_Resource_Product_Option_Value_Collection */ public function getValuesCollection(Mage_Catalog_Model_Product_Option $option) diff --git a/app/code/core/Mage/Catalog/Model/Product/Status.php b/app/code/core/Mage/Catalog/Model/Product/Status.php index 0088037d0e8..6a38573b42d 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Product/Status.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,7 +60,6 @@ public function getProductAttribute($attributeCode) * Add visible filter to Product Collection * * @deprecated remove on new builds - * @param Mage_Eav_Model_Entity_Collection_Abstract $collection * @return $this */ public function addVisibleFilterToCollection(Mage_Eav_Model_Entity_Collection_Abstract $collection) @@ -72,7 +71,6 @@ public function addVisibleFilterToCollection(Mage_Eav_Model_Entity_Collection_Ab * Add saleable filter to Product Collection * * @deprecated remove on new builds - * @param Mage_Eav_Model_Entity_Collection_Abstract $collection * @return $this */ public function addSaleableFilterToCollection(Mage_Eav_Model_Entity_Collection_Abstract $collection) diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php index 69b72222482..05e68872e2b 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -297,7 +297,6 @@ public function isSalable($product = null) * Prepare product and its configuration to be added to some products list. * Perform standard preparation process and then prepare options belonging to specific product type. * - * @param Varien_Object $buyRequest * @param Mage_Catalog_Model_Product $product * @param string $processMode * @return array|string @@ -367,7 +366,6 @@ protected function _prepareProduct(Varien_Object $buyRequest, $product, $process /** * Process product configuration * - * @param Varien_Object $buyRequest * @param Mage_Catalog_Model_Product $product * @param string $processMode * @return array|string @@ -388,7 +386,6 @@ public function processConfiguration( * Initialize product(s) for add to cart process. * Advanced version of func to prepare product for cart - processMode can be specified there. * - * @param Varien_Object $buyRequest * @param Mage_Catalog_Model_Product $product * @param null|string $processMode * @return array|string @@ -406,7 +403,6 @@ public function prepareForCartAdvanced(Varien_Object $buyRequest, $product = nul /** * Initialize product(s) for add to cart process * - * @param Varien_Object $buyRequest * @param Mage_Catalog_Model_Product $product * @return array|string */ @@ -505,7 +501,6 @@ public function getSpecifyOptionMessage() /** * Process custom defined options for product * - * @param Varien_Object $buyRequest * @param Mage_Catalog_Model_Product $product * @param string $processMode * @return array @@ -544,7 +539,6 @@ protected function _prepareOptions(Varien_Object $buyRequest, $product, $process * @deprecated after 1.4.2.0 * @see _prepareOptions() * - * @param Varien_Object $buyRequest * @param Mage_Catalog_Model_Product $product * @return array */ @@ -567,7 +561,7 @@ public function checkProductBuyState($product = null) if ($option->getIsRequire()) { $customOption = $this->getProduct($product) ->getCustomOption(self::OPTION_PREFIX . $option->getId()); - if (!$customOption || $customOption->getValue() === null || strlen($customOption->getValue()) === 0) { + if (!$customOption || $customOption->getValue() === null || (string) $customOption->getValue() === '') { $this->getProduct($product)->setSkipCheckRequiredOption(true); Mage::throwException( Mage::helper('catalog')->__('The product has required options') @@ -791,7 +785,6 @@ public function hasOptions($product = null) * so need to change configuration item qty option value too. * * @param array $options - * @param Varien_Object $option * @param mixed $value * @param Mage_Catalog_Model_Product $product * @return $this diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php index e1a45efb24a..743b3133c45 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -154,7 +154,6 @@ public function getEditableAttributes($product = null) /** * Checkin attribute availability for create superproduct * - * @param Mage_Eav_Model_Entity_Attribute $attribute * @return bool */ public function canUseAttribute(Mage_Eav_Model_Entity_Attribute $attribute) @@ -565,7 +564,6 @@ public function getSelectedAttributesInfo($product = null) * Prepare product and its configuration to be added to some products list. * Perform standard preparation process and then add Configurable specific options. * - * @param Varien_Object $buyRequest * @param Mage_Catalog_Model_Product $product * @param string $processMode * @return array|string diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php index 161b2e475db..6f9438c7ef4 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -287,7 +287,6 @@ public function save($product = null) * Prepare product and its configuration to be added to some products list. * Perform standard preparation process and add logic specific to Grouped product type. * - * @param Varien_Object $buyRequest * @param Mage_Catalog_Model_Product $product * @param string $processMode * @return array|string diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php index df7d7f731c9..beb2d6e5c68 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Url.php b/app/code/core/Mage/Catalog/Model/Product/Url.php index e26c7fddead..8ea075620cb 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Url.php +++ b/app/code/core/Mage/Catalog/Model/Product/Url.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,8 +51,6 @@ class Mage_Catalog_Model_Product_Url extends Varien_Object /** * Initialize Url model - * - * @param array $args */ public function __construct(array $args = []) { @@ -103,7 +101,6 @@ protected function _validImage($image) /** * Retrieve URL in current store * - * @param Mage_Catalog_Model_Product $product * @param array $params the URL route params * @return string */ @@ -175,7 +172,6 @@ public function getUrlPath($product, $category = null) /** * Retrieve Product URL using UrlDataObject * - * @param Mage_Catalog_Model_Product $product * @param array $params * @return string */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Visibility.php b/app/code/core/Mage/Catalog/Model/Product/Visibility.php index 08529e81524..a9e5b0e8853 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Visibility.php +++ b/app/code/core/Mage/Catalog/Model/Product/Visibility.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,7 +47,6 @@ public function __construct() * Add visible in catalog filter to collection * * @deprecated - * @param Mage_Catalog_Model_Resource_Product_Collection $collection * @return $this */ public function addVisibleInCatalogFilterToCollection(Mage_Catalog_Model_Resource_Product_Collection $collection) @@ -59,7 +58,6 @@ public function addVisibleInCatalogFilterToCollection(Mage_Catalog_Model_Resourc * Add visibility in searchfilter to collection * * @deprecated - * @param Mage_Catalog_Model_Resource_Product_Collection $collection * @return $this */ public function addVisibleInSearchFilterToCollection(Mage_Catalog_Model_Resource_Product_Collection $collection) @@ -71,7 +69,6 @@ public function addVisibleInSearchFilterToCollection(Mage_Catalog_Model_Resource * Add visibility in site filter to collection * * @deprecated - * @param Mage_Catalog_Model_Resource_Product_Collection $collection * @return $this */ public function addVisibleInSiteFilterToCollection(Mage_Catalog_Model_Resource_Product_Collection $collection) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Abstract.php index 504ad543b1e..782561cc3d7 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -152,7 +152,6 @@ protected function _addLoadAttributesSelectFields($select, $table, $type) /** * Prepare select object for loading entity attributes values * - * @param array $selects * @return Varien_Db_Select */ protected function _prepareLoadSelect(array $selects) @@ -511,7 +510,6 @@ protected function _collectOrigData($object) /** * Check is attribute value empty * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param mixed $value * @return bool */ @@ -525,9 +523,7 @@ protected function _isAttributeValueEmpty(Mage_Eav_Model_Entity_Attribute_Abstra * Checks also attribute's store scope: * We should insert on duplicate key update values if we unchecked 'STORE VIEW' checkbox in store view. * - * @param Mage_Eav_Model_Entity_Attribute_Abstract|Mage_Catalog_Model_Resource_Eav_Attribute $attribute * @param mixed $value New value of the attribute. - * @param array $origData * @return bool */ protected function _canUpdateAttribute( @@ -552,7 +548,6 @@ protected function _canUpdateAttribute( * Prepare value for save * * @param mixed $value - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return mixed */ protected function _prepareValueForSave($value, Mage_Eav_Model_Entity_Attribute_Abstract $attribute) @@ -569,7 +564,7 @@ protected function _prepareValueForSave($value, Mage_Eav_Model_Entity_Attribute_ * Retrieve attribute's raw value from DB. * * @param int $entityId - * @param int|string|array $attribute atrribute's ids or codes + * @param int|string|array $attribute attribute's ids or codes * @param int|Mage_Core_Model_Store $store * @return bool|string|null|array */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Attribute.php index a04f785fcb0..c70d786c4bc 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Attribute.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -77,7 +77,6 @@ protected function _clearUselessAttributeValues(Mage_Core_Model_Abstract $object /** * Delete entity * - * @param Mage_Core_Model_Abstract $object * @return $this */ public function deleteEntity(Mage_Core_Model_Abstract $object) @@ -122,7 +121,6 @@ public function deleteEntity(Mage_Core_Model_Abstract $object) /** * Defines is Attribute used by super products * - * @param Mage_Core_Model_Abstract $object * @param int $attributeSet * @return int */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Category.php index 658fa1dccbd..d56be287cd2 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -105,7 +105,6 @@ protected function _getTree() * update children count for parent category * delete child categories * - * @param Varien_Object|Mage_Catalog_Model_Category $object * @return $this */ protected function _beforeDelete(Varien_Object $object) @@ -129,7 +128,6 @@ protected function _beforeDelete(Varien_Object $object) /** * Delete children categories of specific category * - * @param Varien_Object|Mage_Catalog_Model_Category $object * @return $this */ public function deleteChildren(Varien_Object $object) @@ -162,7 +160,6 @@ public function deleteChildren(Varien_Object $object) * Process category data before saving * prepare path and increment children count for parent categories * - * @param Varien_Object|Mage_Catalog_Model_Category $object * @return $this */ protected function _beforeSave(Varien_Object $object) @@ -413,7 +410,6 @@ public function checkId($entityId) /** * Check array of category identifiers * - * @param array $ids * @return array */ public function verifyIds(array $ids) @@ -789,8 +785,6 @@ public function getCategoryPathById($categoryId) /** * Move category to another parent node * - * @param Mage_Catalog_Model_Category $category - * @param Mage_Catalog_Model_Category $newParent * @param null|int $afterCategoryId * @return $this */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php index f05cd3aa442..e88afb1c19a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +81,6 @@ class Mage_Catalog_Model_Resource_Category_Collection extends Mage_Catalog_Model * Initialize factory * * @param Mage_Core_Model_Resource_Abstract $resource - * @param array $args */ public function __construct($resource = null, array $args = []) { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php index 5209f23b5cc..644eba73fa5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -114,8 +114,6 @@ class Mage_Catalog_Model_Resource_Category_Flat extends Mage_Index_Model_Resourc /** * Initialize factory instance - * - * @param array $args */ public function __construct(array $args = []) { @@ -545,7 +543,7 @@ protected function _prepareValuesToInsert($data) } /** - * Create Flate Table(s) + * Create Flat Table(s) * * @param array|int $stores * @return $this @@ -996,7 +994,6 @@ public function removeStores($stores) /** * Synchronize flat category data after move by affected category ids * - * @param array $affectedCategoryIds * @return $this */ public function move(array $affectedCategoryIds) @@ -1422,7 +1419,6 @@ public function getDesignUpdateData($category) /** * Retrieve anchors above * - * @param array $filterIds * @param int $storeId * @return array */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php index 49172db47c0..9c2238fe318 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,7 +49,6 @@ class Mage_Catalog_Model_Resource_Category_Flat_Collection extends Mage_Core_Mod * Initialize factory * * @param Mage_Core_Model_Resource_Abstract $resource - * @param array $args */ public function __construct($resource = null, array $args = []) { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php index cc6cd8b9fb1..9b34af6b110 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -78,7 +78,6 @@ protected function _construct() * Method is responsible for index support * when product was saved and assigned categories was changed. * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductSave(Mage_Index_Model_Event $event) @@ -132,7 +131,6 @@ public function catalogProductSave(Mage_Index_Model_Event $event) /** * Process Catalog Product mass action * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductMassAction(Mage_Index_Model_Event $event) @@ -205,8 +203,6 @@ protected function _getRootCategories() /** * Process category index after category save - * - * @param Mage_Index_Model_Event $event */ public function catalogCategorySave(Mage_Index_Model_Event $event) { @@ -307,7 +303,6 @@ public function catalogCategorySave(Mage_Index_Model_Event $event) /** * Reindex not anchor root categories * - * @param array|null $categoryIds * @return $this * @throws Zend_Db_Adapter_Exception */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php index eef89b9b8ad..343403da8f9 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php index fd0a48f2f39..4eec5001894 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Product.php index ddf51e2899b..32a7579c2ed 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -233,7 +233,6 @@ protected function _saveWebsiteIds($product) /** * Save product category relations * - * @param Varien_Object|Mage_Catalog_Model_Product $object * @return $this */ protected function _saveCategories(Varien_Object $object) @@ -610,7 +609,6 @@ public function duplicate($oldId, $newId) /** * Get SKU through product identifiers * - * @param array $productIds * @return array */ public function getProductsSku(array $productIds) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php index 098dd4aa066..41a8f38c4bb 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Catalog_Model_Resource_Product_Action extends Mage_Catalog_Model_Resource_Abstract { /** - * Intialize connection + * Initialize connection * */ protected function _construct() @@ -87,8 +87,6 @@ public function updateAttributes($entityIds, $attrData, $storeId) /** * Update the "updated_at" field for all entity_ids passed * - * @param array $entityIds - * @return void * @throws Zend_Db_Adapter_Exception */ protected function _updateUpdatedAt(array $entityIds): void diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php index 01d93dd4cd5..74d73f718b1 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -113,7 +113,6 @@ public function deletePriceData($productId, $websiteId = null, $priceId = null) /** * Save tier price object * - * @param Varien_Object $priceObject * @return $this */ public function savePriceData(Varien_Object $priceObject) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php index 0dfc2be9d02..fe9ad304bae 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -21,9 +21,6 @@ */ class Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { - /** - * @return array - */ public function getAllowedExtensions(): array { return Varien_Io_File::ALLOWED_IMAGES_EXTENSIONS; diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php index 132e619b72e..e5b72d0a491 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -209,7 +209,6 @@ public function duplicate($object, $newFiles, $originalProductId, $newProductId) * Get select to retrieve media gallery images * for given product IDs. * - * @param array $productIds * @param int $storeId * @param int $attributeId * @return Varien_Db_Select @@ -264,7 +263,6 @@ protected function _getAttributeId() /** * Get media gallery set for given product IDs * - * @param array $productIds * @param int $storeId * @return array */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php index 1eedf9b2469..01464eab97a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -207,7 +207,6 @@ class Mage_Catalog_Model_Resource_Product_Collection extends Mage_Catalog_Model_ * Initialize factory * * @param Mage_Core_Model_Resource_Abstract $resource - * @param array $args */ public function __construct($resource = null, array $args = []) { @@ -354,7 +353,7 @@ protected function _initTables() } /** - * Standard resource collection initalization + * Standard resource collection initialization * * @inheritDoc */ @@ -689,7 +688,6 @@ public function getLimitationFilters() /** * Specify category filter for product collection * - * @param Mage_Catalog_Model_Category $category * @return $this */ public function addCategoryFilter(Mage_Catalog_Model_Category $category) @@ -750,7 +748,7 @@ public function getMaxAttributeValue($attribute) } /** - * Retrieve ranging product count for arrtibute range + * Retrieve ranging product count for attribute range * * @param string $attribute * @param int $range @@ -1194,7 +1192,7 @@ public function addMinimalPrice() /** * Add minimal price to product collection * - * @deprecated sinse 1.3.2.2 + * @deprecated since 1.3.2.2 * @see Mage_Catalog_Model_Resource_Product_Collection::addPriceData * * @return $this diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php index 87842c267f7..fa5ac32b0a6 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Load object by product * - * @param Mage_Catalog_Model_Product_Compare_Item $object * @param mixed $product * @return bool */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php index f2522a00c09..7ece0d26cf4 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -141,7 +141,7 @@ public function _addJoinToSelect() } /** - * Retrieve comapre products attribute set ids + * Retrieve compare products attribute set ids * * @return array */ @@ -189,7 +189,6 @@ protected function _getAttributeSetIds() /** * Retrieve attribute ids by set ids * - * @param array $setIds * @return array */ protected function _getAttributeIdsBySetIds(array $setIds) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php index 268a451d3d0..1a4cefd765a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -151,7 +151,7 @@ public function getAllTableColumns() /** * Check whether the attribute is a real field in entity table - * Rewrited for EAV Collection + * Rewritten for EAV Collection * * @param int|string|Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return bool @@ -180,7 +180,7 @@ public function isAttributeStatic($attribute) /** * Retrieve entity id field name in entity table - * Rewrited for EAV collection compatible + * Rewritten for EAV collection compatible * * @return string */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php index 08aad3aceac..d43840b6a01 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -747,7 +747,7 @@ public function prepareFlatTable($storeId) 'on_delete' => Varien_Db_Ddl_Table::ACTION_CASCADE ]; - // Additional data from childs + // Additional data from children $isAddChildData = $this->getFlatHelper()->isAddChildData(); if (!$isAddChildData && isset($describe['is_child'])) { $adapter->delete($tableName, ['is_child = ?' => 1]); @@ -1355,7 +1355,6 @@ protected function _isFlatTableExists($storeId) /** * Retrieve previous key from array by key * - * @param array $array * @param mixed $key * @return mixed */ @@ -1374,7 +1373,6 @@ protected function _arrayPrevKey(array $array, $key) /** * Retrieve next key from array by key * - * @param array $array * @param mixed $key * @return mixed */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php index 30c5d691764..78a977d5e7f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,7 +74,6 @@ public function getIndexer($type) * Method is responsible for index support * when product was saved and assigned categories was changed. * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductSave(Mage_Index_Model_Event $event) @@ -100,7 +99,6 @@ public function catalogProductSave(Mage_Index_Model_Event $event) /** * Process Product Delete * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductDelete(Mage_Index_Model_Event $event) @@ -121,7 +119,6 @@ public function catalogProductDelete(Mage_Index_Model_Event $event) /** * Process Product Mass Update * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductMassAction(Mage_Index_Model_Event $event) @@ -142,7 +139,6 @@ public function catalogProductMassAction(Mage_Index_Model_Event $event) /** * Process Catalog Eav Attribute Save * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogEavAttributeSave(Mage_Index_Model_Event $event) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php index 507c503b28e..0f0e497c734 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -256,7 +256,6 @@ protected function _prepareMultiselectIndex($entityIds = null, $attributeId = nu /** * Save a data to temporary source index table * - * @param array $data * @return $this */ protected function _saveIndexData(array $data) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php index 0831d0aa0f8..ea634f9fa15 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -70,7 +70,6 @@ public function getProductParentsByChild($childId) * Process produce delete * If the deleted product was found in a composite product(s) update it * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductDelete(Mage_Index_Model_Event $event) @@ -135,7 +134,6 @@ protected function _copyIndexDataToMainTable($processIds) * Method is responsible for index support * when product was saved and changed attribute(s) has an effect on price. * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductSave(Mage_Index_Model_Event $event) @@ -193,7 +191,6 @@ public function catalogProductSave(Mage_Index_Model_Event $event) /** * Process product mass update action * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductMassAction(Mage_Index_Model_Event $event) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php index 34d4ee12d57..472a75190d5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php index eed78fc54a3..c06d8c7dd0a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -594,8 +594,6 @@ protected function _getGroupPriceIndexTable() /** * Register data required by product type process in event object - * - * @param Mage_Index_Model_Event $event */ public function registerEvent(Mage_Index_Model_Event $event) { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php index f889124e0ad..df33ed02deb 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,8 +36,6 @@ public function reindexEntity($entityIds); /** * Register data required by product type process in event object - * - * @param Mage_Index_Model_Event $event */ public function registerEvent(Mage_Index_Model_Event $event); } diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php index 787786233e8..30835a2f4d2 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,7 +50,6 @@ protected function _construct() /** * Declare link model and initialize type attributes join * - * @param Mage_Catalog_Model_Product_Link $linkModel * @return $this */ public function setLinkModel(Mage_Catalog_Model_Product_Link $linkModel) @@ -75,7 +74,6 @@ public function getLinkModel() /** * Initialize collection parent product and add limitation join * - * @param Mage_Catalog_Model_Product $product * @return $this */ public function setProduct(Mage_Catalog_Model_Product $product) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php index b6cb97b005d..0b95ef8d2fb 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +59,6 @@ class Mage_Catalog_Model_Resource_Product_Link_Product_Collection extends Mage_C /** * Declare link model and initialize type attributes join * - * @param Mage_Catalog_Model_Product_Link $linkModel * @return $this */ public function setLinkModel(Mage_Catalog_Model_Product_Link $linkModel) @@ -95,7 +94,6 @@ public function getLinkModel() /** * Initialize collection parent product and add limitation join * - * @param Mage_Catalog_Model_Product $product * @return $this */ public function setProduct(Mage_Catalog_Model_Product $product) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php index c3ef5e754a6..fbb0775758b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Save options store data * - * @param Mage_Core_Model_Abstract $object * @return Mage_Core_Model_Resource_Db_Abstract */ protected function _afterSave(Mage_Core_Model_Abstract $object) @@ -43,7 +42,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) /** * Save value prices * - * @param Mage_Core_Model_Abstract|Mage_Catalog_Model_Product_Option $object * @return $this */ protected function _saveValuePrices(Mage_Core_Model_Abstract $object) @@ -186,7 +184,6 @@ protected function _saveValuePrices(Mage_Core_Model_Abstract $object) /** * Save titles * - * @param Mage_Core_Model_Abstract|Mage_Catalog_Model_Product_Option $object * @throws Zend_Db_Adapter_Exception */ protected function _saveValueTitles(Mage_Core_Model_Abstract $object) @@ -325,7 +322,6 @@ public function deleteTitles($optionId) /** * Duplicate custom options for product * - * @param Mage_Catalog_Model_Product_Option $object * @param int $oldProductId * @param int $newProductId * @return Mage_Catalog_Model_Product_Option diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php index 6bbc85dd21b..45861835574 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +27,9 @@ protected function _construct() } /** - * Proceeed operations after object is saved + * Proceed operations after object is saved * Save options store data * - * @param Mage_Core_Model_Abstract $object * @return Mage_Core_Model_Resource_Db_Abstract */ protected function _afterSave(Mage_Core_Model_Abstract $object) @@ -43,8 +42,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) /** * Save option value price data - * - * @param Mage_Core_Model_Abstract $object */ protected function _saveValuePrices(Mage_Core_Model_Abstract $object) { @@ -148,8 +145,6 @@ protected function _saveValuePrices(Mage_Core_Model_Abstract $object) /** * Save option value title data - * - * @param Mage_Core_Model_Abstract $object */ protected function _saveValueTitles(Mage_Core_Model_Abstract $object) { @@ -269,7 +264,6 @@ public function deleteValues($optionTypeId) /** * Duplicate product options value * - * @param Mage_Catalog_Model_Product_Option_Value $object * @param int $oldOptionId * @param int $newOptionId * @return Mage_Catalog_Model_Product_Option_Value diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php index e32bc463e1f..c7927efff86 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Catalog_Model_Resource_Product_Status extends Mage_Core_Model_Resource_Db_Abstract { /** - * Product atrribute cache + * Product attribute cache * * @var array */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php index 50574a2b9eb..1a22d421888 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -273,7 +273,7 @@ protected function _loadPrices() }); foreach ($pricings[0] as $pricing) { - // Addding pricing to options + // Adding pricing to options $valueKey = $pricing['product_super_attribute_id'] . ':' . $pricing['value_index']; if (isset($values[$valueKey])) { $values[$valueKey]['pricing_value'] = $pricing['pricing_value']; diff --git a/app/code/core/Mage/Catalog/Model/Resource/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Setup.php index 5552aec4665..767fd49fd25 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Setup.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Setup.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,7 +57,7 @@ protected function _prepareValues($attr) } /** - * Default entites and attributes + * Default entities and attributes * * @return array */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Url.php index 6e15bccce99..b72db8f572d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Url.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Url.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -333,7 +333,6 @@ public function saveRewriteHistory($rewriteData) /** * Save category attribute * - * @param Varien_Object|Mage_Catalog_Model_Category $category * @param string $attributeCode * @return $this */ @@ -487,7 +486,6 @@ protected function _getCategoryAttribute($attributeCode, $categoryIds, $storeId) /** * Save product attribute * - * @param Varien_Object|Mage_Catalog_Model_Product $product * @param string $attributeCode * @return $this */ @@ -629,7 +627,6 @@ public function _getProductAttribute($attributeCode, $productIds, $storeId) /** * Prepare category parentId * - * @param Varien_Object|Mage_Catalog_Model_Category $category * @return $this */ protected function _prepareCategoryParentId(Varien_Object $category) @@ -808,9 +805,8 @@ public function getCategories($categoryIds, $storeId) } /** - * Retrieve category childs data objects + * Retrieve category children data objects * - * @param Varien_Object $category * @return Varien_Object */ public function loadCategoryChilds(Varien_Object $category) @@ -880,7 +876,6 @@ public function getRootChildrenIds($categoryId, $categoryPath, $includeStart = t /** * Retrieve category parent path * - * @param Varien_Object $category * @return string */ public function getCategoryParentPath(Varien_Object $category) @@ -1025,7 +1020,6 @@ public function getProductsByStore($storeId, &$lastEntityId) /** * Retrieve Product data objects in category * - * @param Varien_Object $category * @param int $lastEntityId * @return array */ @@ -1236,7 +1230,6 @@ public function deleteCategoryProductStoreRewrites($categoryId, $productIds = nu * visibility int; visibility for store * url_rewrite string; rewrite URL for store * - * @param array $products * @return array */ public function getRewriteByProductStore(array $products) @@ -1294,7 +1287,7 @@ public function getRewriteByProductStore(array $products) * * @param string $requestPath * @param int $storeId - * @param array $_checkedPaths internal varible to prevent infinite loops. + * @param array $_checkedPaths internal variable to prevent infinite loops. * @return string | bool */ public function findFinalTargetPath($requestPath, $storeId, &$_checkedPaths = []) diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php index 8c8b784c29f..7fe943684dc 100644 --- a/app/code/core/Mage/Catalog/Model/Url.php +++ b/app/code/core/Mage/Catalog/Model/Url.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -86,7 +86,7 @@ class Mage_Catalog_Model_Url protected $_categoryUrlSuffix = []; /** - * Flag to overwrite config settings for Catalog URL rewrites history maintainance + * Flag to overwrite config settings for Catalog URL rewrites history maintenance * * @var bool */ @@ -246,7 +246,6 @@ public function refreshRewrites($storeId = null) /** * Refresh category rewrite * - * @param Varien_Object|Mage_Catalog_Model_Category $category * @param string $parentPath * @param bool $refreshProducts * @return $this @@ -309,8 +308,6 @@ protected function _refreshCategoryRewrites(Varien_Object $category, $parentPath /** * Refresh product rewrite * - * @param Varien_Object|Mage_Catalog_Model_Product $product - * @param Varien_Object|Mage_Catalog_Model_Category $category * @return $this */ protected function _refreshProductRewrite(Varien_Object $product, Varien_Object $category) @@ -366,7 +363,6 @@ protected function _refreshProductRewrite(Varien_Object $product, Varien_Object /** * Refresh products for catwgory * - * @param Varien_Object|Mage_Catalog_Model_Category $category * @return $this */ protected function _refreshCategoryProductRewrites(Varien_Object $category) @@ -433,7 +429,7 @@ public function refreshCategoryRewrite($categoryId, $storeId = null, $refreshPro return $this; } - // Load all childs and refresh all categories + // Load all children and refresh all categories $category = $this->getResource()->loadCategoryChilds($category); $categoryIds = [$category->getId()]; if ($category->getAllChilds()) { diff --git a/app/code/core/Mage/Catalog/controllers/CategoryController.php b/app/code/core/Mage/Catalog/controllers/CategoryController.php index c4d0508411a..9e9ed4e2e25 100644 --- a/app/code/core/Mage/Catalog/controllers/CategoryController.php +++ b/app/code/core/Mage/Catalog/controllers/CategoryController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -77,7 +77,7 @@ protected function _initCatagory() /** * Recursively apply custom design settings to category if it's option - * custom_use_parent_settings is setted to 1 while parent option is not + * custom_use_parent_settings is set to 1 while parent option is not * * @deprecated after 1.4.2.0-beta1, functionality moved to Mage_Catalog_Model_Design * @param Mage_Catalog_Model_Category $category diff --git a/app/code/core/Mage/Catalog/controllers/ProductController.php b/app/code/core/Mage/Catalog/controllers/ProductController.php index b7d74cfde6a..2a74964971b 100644 --- a/app/code/core/Mage/Catalog/controllers/ProductController.php +++ b/app/code/core/Mage/Catalog/controllers/ProductController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,8 +59,8 @@ protected function _initProductLayout($product) /** * Recursively apply custom design settings to product if it's container - * category custom_use_for_products option is setted to 1. - * If not or product shows not in category - applyes product's internal settings + * category custom_use_for_products option is set to 1. + * If not or product shows not in category - applies product's internal settings * * @deprecated after 1.4.2.0-beta1, functionality moved to Mage_Catalog_Model_Design * @param Mage_Catalog_Model_Category|Mage_Catalog_Model_Product $object diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php index a8716e73bbb..03edc562ac3 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/etc/config.xml b/app/code/core/Mage/Catalog/etc/config.xml index c2d63d39cd8..73f95fb4ffd 100644 --- a/app/code/core/Mage/Catalog/etc/config.xml +++ b/app/code/core/Mage/Catalog/etc/config.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php index 558e59023a2..a8d852ea284 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php index f1ad75bdbbe..dbebb394665 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php index ed1bd60efd0..67dbb4e7328 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php index 78ad1ea7f92..c30f714c523 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php index 803ab65522c..8e1106a37f1 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php index 425e24d471f..030e448597e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,7 +58,7 @@ ['entity_type_id','used_in_product_listing'] ); -// Add frontent input renderer +// Add frontend input renderer $installer->getConnection()->addColumn( $installer->getTable('eav/attribute'), 'frontend_input_renderer', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php index 6b80c3facb3..7fd73cd3793 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php index 242350b0c9e..db4b1e4e19c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.6-1.6.0.0.19.1.7.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Indexer.php index fa015083699..6c7972d17ca 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +48,7 @@ class Mage_CatalogIndex_Model_Indexer extends Mage_Core_Model_Abstract /** * Set of available indexers - * Each indexer type is responsable for index data storage + * Each indexer type is responsible for index data storage * * @var array */ @@ -769,7 +769,6 @@ protected function _addFilterableAttributesToCollection($collection) /** * Prepare Catalog Product Flat Columns * - * @param Varien_Object $object * @return $this */ public function prepareCatalogProductFlatColumns(Varien_Object $object) @@ -782,7 +781,6 @@ public function prepareCatalogProductFlatColumns(Varien_Object $object) /** * Prepare Catalog Product Flat Indexes * - * @param Varien_Object $object * @return $this */ public function prepareCatalogProductFlatIndexes(Varien_Object $object) diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php index 6e0a8680859..efa8392fe74 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +26,6 @@ abstract class Mage_CatalogIndex_Model_Indexer_Abstract extends Mage_Core_Model_ protected $_runOnce = false; /** - * @param Mage_Catalog_Model_Product $object * @param int|string $forceId */ public function processAfterSave(Mage_Catalog_Model_Product $object, $forceId = null) @@ -103,7 +102,6 @@ public function saveIndex($data, $storeId, $productId) } /** - * @param array $data * @param int $storeId * @param int $productId */ @@ -113,7 +111,6 @@ public function saveIndices(array $data, $storeId, $productId) } /** - * @param Mage_Catalog_Model_Product $object * @return bool */ protected function _isObjectIndexable(Mage_Catalog_Model_Product $object) @@ -132,7 +129,6 @@ protected function _isObjectIndexable(Mage_Catalog_Model_Product $object) } /** - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return bool */ public function isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) @@ -141,7 +137,6 @@ public function isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstract $a } /** - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return bool */ protected function _isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php index bb59b2a7712..df1a926ad59 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,8 +38,6 @@ protected function _construct() } /** - * @param Mage_Catalog_Model_Product $object - * @param Mage_Eav_Model_Entity_Attribute_Abstract|null $attribute * @return array */ public function createIndexData(Mage_Catalog_Model_Product $object, ?Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null) @@ -68,7 +66,6 @@ public function createIndexData(Mage_Catalog_Model_Product $object, ?Mage_Eav_Mo } /** - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return bool */ protected function _isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php index 82b4cf55a92..baf41d2dd53 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,8 +20,6 @@ interface Mage_CatalogIndex_Model_Indexer_Interface { /** - * @param Mage_Catalog_Model_Product $object - * @param Mage_Eav_Model_Entity_Attribute_Abstract|null $attribute * @return mixed */ public function createIndexData(Mage_Catalog_Model_Product $object, ?Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null); diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php index 07fd53d56d0..d8144806f02 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -86,8 +86,6 @@ public function getPriceAttribute() } /** - * @param Mage_Catalog_Model_Product $object - * @param Mage_Eav_Model_Entity_Attribute_Abstract|null $attribute * @return array|bool */ public function createIndexData(Mage_Catalog_Model_Product $object, ?Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null) @@ -144,7 +142,6 @@ public function isAttributeIdUsed() } /** - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return bool */ protected function _isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php index 04715b9e455..7d817e60479 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,8 +51,6 @@ protected function _construct() } /** - * @param Mage_Catalog_Model_Product $object - * @param Mage_Eav_Model_Entity_Attribute_Abstract|null $attribute * @return array */ public function createIndexData(Mage_Catalog_Model_Product $object, ?Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null) @@ -81,7 +79,6 @@ public function createIndexData(Mage_Catalog_Model_Product $object, ?Mage_Eav_Mo } /** - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return bool */ protected function _isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php index f3f4fd3edb7..1f8f3733ff4 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -64,8 +64,6 @@ protected function _construct() } /** - * @param Mage_Catalog_Model_Product $object - * @param Mage_Eav_Model_Entity_Attribute_Abstract|null $attribute * @return array */ public function createIndexData(Mage_Catalog_Model_Product $object, ?Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null) @@ -105,7 +103,6 @@ public function createIndexData(Mage_Catalog_Model_Product $object, ?Mage_Eav_Mo } /** - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return bool */ protected function _isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) diff --git a/app/code/core/Mage/CatalogIndex/Model/Observer.php b/app/code/core/Mage/CatalogIndex/Model/Observer.php index de9f42b04b3..7a3400edd24 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Observer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -78,7 +78,6 @@ public function reindexDaily() /** * Process product after save * - * @param Varien_Event_Observer $observer * @return Mage_CatalogIndex_Model_Observer */ public function processAfterSaveEvent(Varien_Event_Observer $observer) @@ -109,7 +108,6 @@ public function processAfterSaveEvent(Varien_Event_Observer $observer) /** * Reindex price data after attribute scope change * - * @param Varien_Event_Observer $observer * @return Mage_CatalogIndex_Model_Observer */ public function processPriceScopeChange(Varien_Event_Observer $observer) @@ -128,7 +126,6 @@ public function processPriceScopeChange(Varien_Event_Observer $observer) /** * Process catalog index after price rules were applied * - * @param Varien_Event_Observer $observer * @return Mage_CatalogIndex_Model_Observer */ public function processPriceRuleApplication(Varien_Event_Observer $observer) @@ -150,7 +147,6 @@ public function processPriceRuleApplication(Varien_Event_Observer $observer) /** * Cleanup product index after product delete * - * @param Varien_Event_Observer $observer * @return Mage_CatalogIndex_Model_Observer */ public function processAfterDeleteEvent(Varien_Event_Observer $observer) @@ -170,7 +166,6 @@ public function processAfterDeleteEvent(Varien_Event_Observer $observer) /** * Process index data after attribute information was changed * - * @param Varien_Event_Observer $observer * @return Mage_CatalogIndex_Model_Observer */ public function processAttributeChangeEvent(Varien_Event_Observer $observer) @@ -199,7 +194,6 @@ public function processAttributeChangeEvent(Varien_Event_Observer $observer) /** * Create index for new store * - * @param Varien_Event_Observer $observer * @return Mage_CatalogIndex_Model_Observer */ public function processStoreAdd(Varien_Event_Observer $observer) @@ -212,7 +206,6 @@ public function processStoreAdd(Varien_Event_Observer $observer) /** * Rebuild index after catalog import * - * @param Varien_Event_Observer $observer * @return Mage_CatalogIndex_Model_Observer */ public function catalogProductImportAfter(Varien_Event_Observer $observer) @@ -223,7 +216,7 @@ public function catalogProductImportAfter(Varien_Event_Observer $observer) } /** - * Run planed reindex + * Run planned reindex * * @return $this */ @@ -240,7 +233,6 @@ public function runQueuedIndexing() /** * Clear aggregated layered navigation data * - * @param Varien_Event_Observer $observer * @return Mage_CatalogIndex_Model_Observer */ public function cleanCache(Varien_Event_Observer $observer) @@ -257,7 +249,6 @@ public function cleanCache(Varien_Event_Observer $observer) /** * Process index data after category save * - * @param Varien_Event_Observer $observer * @return Mage_CatalogIndex_Model_Observer */ public function catalogCategorySaveAfter(Varien_Event_Observer $observer) @@ -303,7 +294,6 @@ public function clearSearchLayerCache() /** * Load parent ids for products before deleting * - * @param Varien_Event_Observer $observer * @return Mage_CatalogIndex_Model_Observer */ public function registerParentIds(Varien_Event_Observer $observer) @@ -320,7 +310,6 @@ public function registerParentIds(Varien_Event_Observer $observer) /** * Reindex producs after change websites associations * - * @param Varien_Event_Observer $observer * @return Mage_CatalogIndex_Model_Observer */ public function processProductsWebsitesChange(Varien_Event_Observer $observer) @@ -334,7 +323,6 @@ public function processProductsWebsitesChange(Varien_Event_Observer $observer) /** * Prepare columns for catalog product flat * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductFlatPrepareColumns(Varien_Event_Observer $observer) @@ -349,7 +337,6 @@ public function catalogProductFlatPrepareColumns(Varien_Event_Observer $observer /** * Prepare indexes for catalog product flat * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductFlatPrepareIndexes(Varien_Event_Observer $observer) @@ -364,7 +351,6 @@ public function catalogProductFlatPrepareIndexes(Varien_Event_Observer $observer /** * Rebuild catalog product flat * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductFlatRebuild(Varien_Event_Observer $observer) @@ -380,7 +366,6 @@ public function catalogProductFlatRebuild(Varien_Event_Observer $observer) /** * Catalog Product Flat update product(s) * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductFlatUpdateProduct(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/CatalogIndex/Model/Price.php b/app/code/core/Mage/CatalogIndex/Model/Price.php index e198c4f9142..e3bd1f3a26e 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -94,9 +94,6 @@ public function applyFilterToCollection($collection, $attribute, $range, $index) return $this->_getResource()->applyFilterToCollection($collection, $attribute, $range, $index); } - /** - * @param Mage_Catalog_Model_Resource_Product_Collection $collection - */ public function addMinimalPrices(Mage_Catalog_Model_Resource_Product_Collection $collection) { $minimalPrices = $this->_getResource()->getMinimalPrices($collection->getLoadedIds()); diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php index 56a8f89cdd3..63c03364cf5 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php index d230138cc6a..2e4dd902273 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -230,7 +230,6 @@ public function getTierPrices($products, $website) /** * Add attribute filter to select * - * @param Varien_Db_Select $select * @param string $attributeCode * @param string $table the main table name or alias * @param string $field entity_id field name diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php index 3d7ccd361f8..bcb9c1f8e2f 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -562,7 +562,6 @@ protected function _insert($table, $data) /** * Add price columns for catalog product flat table * - * @param Varien_Object $object * @return $this */ public function prepareCatalogProductFlatColumns(Varien_Object $object) @@ -589,7 +588,6 @@ public function prepareCatalogProductFlatColumns(Varien_Object $object) /** * Add price indexes for catalog product flat table * - * @param Varien_Object $object * @return $this */ public function prepareCatalogProductFlatIndexes(Varien_Object $object) diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php index 9a783279ad6..ce13be66eaa 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +56,6 @@ public function saveIndex($data, $storeId, $productId) } /** - * @param array $data * @param int $storeId * @param int $productId */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php index 21ce51840e3..ce98df406fe 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php b/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php index e597d47e4c4..71fc346b449 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php +++ b/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -64,8 +64,6 @@ protected function _prepareToRender() /** * Prepare existing row data object - * - * @param Varien_Object $row */ protected function _prepareArrayRow(Varien_Object $row) { diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php index b159750842e..fc0cda98cb3 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php b/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php index e24613dc55b..fc6c66a21fc 100644 --- a/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php +++ b/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -107,7 +107,6 @@ protected function _isEncodedArrayFieldValue($value) /** * Encode value to be used in Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract * - * @param array $value * @return array */ protected function _encodeArrayFieldValue(array $value) @@ -126,7 +125,6 @@ protected function _encodeArrayFieldValue(array $value) /** * Decode value from used in Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract * - * @param array $value * @return array */ protected function _decodeArrayFieldValue(array $value) diff --git a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php index 2cc7bbe01ef..78beb084b94 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php +++ b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,7 +60,6 @@ protected function _getCollectionForRetrieve() /** * Update specified stock item * - * @param array $data * @throws Mage_Api2_Exception */ protected function _update(array $data) @@ -92,8 +91,6 @@ protected function _update(array $data) /** * Update specified stock items - * - * @param array $data */ protected function _multiUpdate(array $data) { diff --git a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php index bb2aab23216..d02015af9ea 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,7 +27,6 @@ class Mage_CatalogInventory_Model_Api2_Stock_Item_Validator_Item extends Mage_Ap * getErrors() will return an array of errors that explain why the * validation failed. * - * @param array $data * @return bool */ public function isValidSingleItemDataForMultiUpdate(array $data) diff --git a/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php index 9985907363f..65fcfba4c50 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -104,7 +104,6 @@ public function getDescription() * Check if event can be matched by process. * Overwrote for specific config save, store and store groups save matching * - * @param Mage_Index_Model_Event $event * @return bool */ public function matchEvent(Mage_Index_Model_Event $event) @@ -149,8 +148,6 @@ public function matchEvent(Mage_Index_Model_Event $event) /** * Register data required by process in event object - * - * @param Mage_Index_Model_Event $event */ protected function _registerEvent(Mage_Index_Model_Event $event) { @@ -190,8 +187,6 @@ protected function _registerEvent(Mage_Index_Model_Event $event) /** * Register data required by catalog product processes in event object - * - * @param Mage_Index_Model_Event $event */ protected function _registerCatalogProductEvent(Mage_Index_Model_Event $event) { @@ -215,8 +210,6 @@ protected function _registerCatalogProductEvent(Mage_Index_Model_Event $event) /** * Register data required by cataloginventory stock item processes in event object - * - * @param Mage_Index_Model_Event $event */ protected function _registerCatalogInventoryStockItemEvent(Mage_Index_Model_Event $event) { @@ -230,7 +223,6 @@ protected function _registerCatalogInventoryStockItemEvent(Mage_Index_Model_Even /** * Register data required by stock item save process in event object * - * @param Mage_Index_Model_Event $event * @return $this */ protected function _registerStockItemSaveEvent(Mage_Index_Model_Event $event) @@ -260,7 +252,6 @@ protected function _registerStockItemSaveEvent(Mage_Index_Model_Event $event) /** * Register data required by product delete process in event object * - * @param Mage_Index_Model_Event $event * @return $this */ protected function _registerCatalogProductDeleteEvent(Mage_Index_Model_Event $event) @@ -279,7 +270,6 @@ protected function _registerCatalogProductDeleteEvent(Mage_Index_Model_Event $ev /** * Register data required by product mass action process in event object * - * @param Mage_Index_Model_Event $event * @return $this */ protected function _registerCatalogProductMassActionEvent(Mage_Index_Model_Event $event) @@ -316,8 +306,6 @@ protected function _registerCatalogProductMassActionEvent(Mage_Index_Model_Event /** * Process event - * - * @param Mage_Index_Model_Event $event */ protected function _processEvent(Mage_Index_Model_Event $event) { diff --git a/app/code/core/Mage/CatalogInventory/Model/Observer.php b/app/code/core/Mage/CatalogInventory/Model/Observer.php index 4f81339936c..2ec5cc30c7b 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Observer.php +++ b/app/code/core/Mage/CatalogInventory/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -603,7 +603,6 @@ protected function _getQuoteItemQtyForCheck($productId, $quoteItemId, $itemQty) /** * Subtract qtys of quote item products after multishipping checkout * - * @param Varien_Event_Observer $observer * @return $this */ public function checkoutAllSubmitAfter(Varien_Event_Observer $observer) @@ -623,7 +622,6 @@ public function checkoutAllSubmitAfter(Varien_Event_Observer $observer) * Used before order placing to make order save/place transaction smaller * Also called after every successful order placement to ensure subtraction of inventory * - * @param Varien_Event_Observer $observer * @return Mage_CatalogInventory_Model_Observer|void */ public function subtractQuoteInventory(Varien_Event_Observer $observer) @@ -860,7 +858,6 @@ public function updateItemsStockUponConfigChange($observer) /** * Update Only product status observer * - * @param Varien_Event_Observer $observer * @return $this */ public function productStatusUpdate(Varien_Event_Observer $observer) @@ -874,7 +871,6 @@ public function productStatusUpdate(Varien_Event_Observer $observer) /** * Catalog Product website update * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductWebsiteUpdate(Varien_Event_Observer $observer) @@ -895,7 +891,6 @@ public function catalogProductWebsiteUpdate(Varien_Event_Observer $observer) /** * Add stock status to prepare index select * - * @param Varien_Event_Observer $observer * @return $this */ public function addStockStatusToPrepareIndexSelect(Varien_Event_Observer $observer) @@ -912,7 +907,6 @@ public function addStockStatusToPrepareIndexSelect(Varien_Event_Observer $observ /** * Add stock status limitation to catalog product price index select object * - * @param Varien_Event_Observer $observer * @return $this */ public function prepareCatalogProductIndexSelect(Varien_Event_Observer $observer) @@ -930,7 +924,6 @@ public function prepareCatalogProductIndexSelect(Varien_Event_Observer $observer /** * Add stock status filter to select * - * @param Varien_Event_Observer $observer * @return $this */ public function addStockStatusFilterToSelect(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php index fe4fe2ddafd..127c4f44a2e 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,7 +44,6 @@ protected function _construct() /** * Process stock item save action * - * @param Mage_Index_Model_Event $event * @return $this */ public function cataloginventoryStockItemSave(Mage_Index_Model_Event $event) @@ -110,7 +109,6 @@ public function reindexProducts($productIds) /** * Processing parent products after child product deleted * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductDelete(Mage_Index_Model_Event $event) @@ -144,7 +142,6 @@ public function catalogProductDelete(Mage_Index_Model_Event $event) /** * Process product mass update action * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductMassAction(Mage_Index_Model_Event $event) diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php index e93eaca91af..7f743cde86a 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -335,7 +335,6 @@ public function updateLowStockDate() /** * Add low stock filter to product collection * - * @param Mage_Catalog_Model_Resource_Product_Collection $collection * @param array $fields * @return $this */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php index b23ad90d025..ee8878750f3 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Loading stock item data by product * - * @param Mage_CatalogInventory_Model_Stock_Item $item * @param int $productId * @return $this */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php index 625f9c1a5c9..d3d790428b6 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Save Product Status per website * - * @param Mage_CatalogInventory_Model_Stock_Status $object * @param int $productId * @param int $status * @param int|float $qty @@ -190,8 +189,6 @@ public function getProductCollection($lastEntityId = 0, $limit = 1000) /** * Add stock status to prepare index select * - * @param Varien_Db_Select $select - * @param Mage_Core_Model_Website $website * @return $this */ public function addStockStatusToSelect(Varien_Db_Select $select, Mage_Core_Model_Website $website) @@ -209,7 +206,6 @@ public function addStockStatusToSelect(Varien_Db_Select $select, Mage_Core_Model /** * Add stock status limitation to catalog product price index select object * - * @param Varien_Db_Select $select * @param string|Zend_Db_Expr $entityField * @param string|Zend_Db_Expr $websiteField * @return $this diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Stock.php index 449506fd087..18a9c6bc09b 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -163,7 +163,6 @@ public function revertProductsSale($items) /** * Subtract ordered qty for product * - * @param Varien_Object $item * @return Mage_CatalogInventory_Model_Stock */ public function registerItemSale(Varien_Object $item) diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php index abc109a3bd4..0b3e2a52c06 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -157,7 +157,7 @@ protected function _construct() * Init mapping array of short fields to * its full names * - * @resturn Varien_Object + * @return void */ protected function _initOldFieldsMap() { @@ -267,7 +267,6 @@ public function getStoreId() /** * Adding stock data to product * - * @param Mage_Catalog_Model_Product $product * @return $this */ public function assignProduct(Mage_Catalog_Model_Product $product) @@ -721,7 +720,6 @@ public function addCatalogInventoryToProductCollection($productCollection) /** * Add error to Quote Item * - * @param Mage_Sales_Model_Quote_Item $item * @param string $itemError * @param string $quoteError * @param string $errorIndex diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php index 61bc6b67114..9e02252c34f 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -158,7 +158,6 @@ public function getProductStatusEnabled() /** * Change Stock Item status process * - * @param Mage_CatalogInventory_Model_Stock_Item $item * @return $this */ public function changeItemStatus(Mage_CatalogInventory_Model_Stock_Item $item) @@ -180,7 +179,6 @@ public function changeItemStatus(Mage_CatalogInventory_Model_Stock_Item $item) /** * Assign Stock Status to Product * - * @param Mage_Catalog_Model_Product $product * @param int $stockId * @param int $stockStatus * @return $this @@ -481,8 +479,6 @@ public function addStockStatusToProducts($productCollection, $websiteId = null, /** * Add stock status to prepare index select * - * @param Varien_Db_Select $select - * @param Mage_Core_Model_Website $website * @return $this */ public function addStockStatusToSelect(Varien_Db_Select $select, Mage_Core_Model_Website $website) @@ -494,7 +490,6 @@ public function addStockStatusToSelect(Varien_Db_Select $select, Mage_Core_Model /** * Add stock status limitation to catalog product price index select object * - * @param Varien_Db_Select $select * @param string|Zend_Db_Expr $entityField * @param string|Zend_Db_Expr $websiteField * @return $this diff --git a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php index 5172a163e60..de244f6c8a6 100644 --- a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php +++ b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,8 +56,6 @@ class Mage_CatalogRule_Model_Action_Index_Refresh * - 'factory' Mage_Core_Model_Factory * - 'resource' Mage_Core_Model_Resource_Db_Abstract * - 'app' Mage_Core_Model_App - * - * @param array $args */ public function __construct(array $args) { @@ -69,8 +67,6 @@ public function __construct(array $args) /** * Set connection - * - * @param Varien_Db_Adapter_Interface $connection */ protected function _setConnection(Varien_Db_Adapter_Interface $connection) { @@ -79,8 +75,6 @@ protected function _setConnection(Varien_Db_Adapter_Interface $connection) /** * Set factory - * - * @param Mage_Core_Model_Factory $factory */ protected function _setFactory(Mage_Core_Model_Factory $factory) { @@ -89,8 +83,6 @@ protected function _setFactory(Mage_Core_Model_Factory $factory) /** * Set resource - * - * @param Mage_Core_Model_Resource_Db_Abstract $resource */ protected function _setResource(Mage_Core_Model_Resource_Db_Abstract $resource) { @@ -253,7 +245,6 @@ protected function _createTemporaryTable() /** * Prepare temporary data * - * @param Mage_Core_Model_Website $website * @return Varien_Db_Select */ protected function _prepareTemporarySelect(Mage_Core_Model_Website $website) @@ -455,7 +446,6 @@ protected function _calculatePrice() /** * Prepare index select * - * @param Mage_Core_Model_Website $website * @param int|Zend_Db_Expr $time * @return Varien_Db_Select */ @@ -553,8 +543,6 @@ protected function _prepareIndexSelect(Mage_Core_Model_Website $website, $time) /** * Remove old index data - * - * @param Mage_Core_Model_Website $website */ protected function _removeOldIndexData(Mage_Core_Model_Website $website) { @@ -567,7 +555,6 @@ protected function _removeOldIndexData(Mage_Core_Model_Website $website) /** * Fill Index Data * - * @param Mage_Core_Model_Website $website * @param int $time */ protected function _fillIndexData(Mage_Core_Model_Website $website, $time) @@ -585,7 +572,6 @@ protected function _fillIndexData(Mage_Core_Model_Website $website, $time) /** * Reindex catalog prices by website for timestamp * - * @param Mage_Core_Model_Website $website * @param int $timestamp */ protected function _reindex(Mage_Core_Model_Website $website, $timestamp) diff --git a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php index 62014f63999..1b6bcaad61e 100644 --- a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php +++ b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,8 +36,6 @@ class Mage_CatalogRule_Model_Action_Index_Refresh_Row extends Mage_CatalogRule_M * - 'resource' Mage_Core_Model_Resource_Db_Abstract * - 'app' Mage_Core_Model_App * - 'value' int|Mage_Catalog_Model_Product - * - * @param array $args */ public function __construct(array $args) { @@ -58,7 +56,6 @@ protected function _prepareGroupWebsite($timestamp) /** * Prepare temporary data * - * @param Mage_Core_Model_Website $website * @return Varien_Db_Select */ protected function _prepareTemporarySelect(Mage_Core_Model_Website $website) @@ -69,8 +66,6 @@ protected function _prepareTemporarySelect(Mage_Core_Model_Website $website) /** * Remove old index data - * - * @param Mage_Core_Model_Website $website */ protected function _removeOldIndexData(Mage_Core_Model_Website $website) { diff --git a/app/code/core/Mage/CatalogRule/Model/Observer.php b/app/code/core/Mage/CatalogRule/Model/Observer.php index bdcfa10c6b3..3ab25d6e141 100644 --- a/app/code/core/Mage/CatalogRule/Model/Observer.php +++ b/app/code/core/Mage/CatalogRule/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -96,7 +96,6 @@ public function applyAllRules($observer) /** * Preload all price rules for all items in quote * - * @param Varien_Event_Observer $observer * * @return $this */ @@ -221,7 +220,6 @@ public function processAdminFinalPrice($observer) /** * Calculate price using catalog price rules of configurable product * - * @param Varien_Event_Observer $observer * * @return $this */ @@ -272,7 +270,6 @@ public function flushPriceCache() /** * Calculate minimal final price with catalog rule price * - * @param Varien_Event_Observer $observer * @return $this */ public function prepareCatalogProductPriceIndexTable(Varien_Event_Observer $observer) @@ -361,7 +358,6 @@ protected function _removeAttributeFromConditions($combine, $attributeCode) /** * After save attribute if it is not used for promo rules already check rules for containing this attribute * - * @param Varien_Event_Observer $observer * * @return $this */ @@ -379,7 +375,6 @@ public function catalogAttributeSaveAfter(Varien_Event_Observer $observer) /** * After delete attribute check rules that contains deleted attribute * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogAttributeDeleteAfter(Varien_Event_Observer $observer) @@ -394,7 +389,6 @@ public function catalogAttributeDeleteAfter(Varien_Event_Observer $observer) } /** - * @param Varien_Event_Observer $observer * @return $this * @throws Mage_Core_Model_Store_Exception */ @@ -444,8 +438,6 @@ public function prepareCatalogProductCollectionPrices(Varien_Event_Observer $obs /** * Create catalog rule relations for imported products - * - * @param Varien_Event_Observer $observer */ public function createCatalogRulesRelations(Varien_Event_Observer $observer) { @@ -469,8 +461,6 @@ public function createCatalogRulesRelations(Varien_Event_Observer $observer) /** * Runs Catalog Product Price Reindex - * - * @param Varien_Event_Observer $observer */ public function runCatalogProductPriceReindex(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php index 4d734d40210..7d7c46830ba 100644 --- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php +++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,8 +67,6 @@ class Mage_CatalogRule_Model_Resource_Rule extends Mage_Rule_Model_Resource_Abst * Constructor with parameters * Array of arguments with keys * - 'factory' Mage_Core_Model_Factory - * - * @param array $args */ public function __construct(array $args = []) { @@ -89,7 +87,6 @@ protected function _construct() /** * Add customer group ids and website ids to rule data after load * - * @param Mage_Core_Model_Abstract $object * * @inheritDoc */ @@ -105,7 +102,6 @@ protected function _afterLoad(Mage_Core_Model_Abstract $object) * Bind catalog rule to customer group(s) and website(s). * Update products which are matched for rule. * - * @param Mage_Core_Model_Abstract $object * * @return $this */ @@ -135,7 +131,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) * Deletes records in catalogrule/product_data by rule ID and product IDs * * @param int $ruleId - * @param array $productIds */ public function cleanProductData($ruleId, array $productIds = []) { @@ -154,8 +149,6 @@ public function cleanProductData($ruleId, array $productIds = []) /** * Return whether the product fits the rule * - * @param Mage_CatalogRule_Model_Rule $rule - * @param Varien_Object $product * @param array $websiteIds * @return bool */ @@ -182,10 +175,6 @@ public function validateProduct(Mage_CatalogRule_Model_Rule $rule, Varien_Object /** * Inserts rule data into catalogrule/rule_product table - * - * @param Mage_CatalogRule_Model_Rule $rule - * @param array $websiteIds - * @param array $productIds */ public function insertRuleData(Mage_CatalogRule_Model_Rule $rule, array $websiteIds, array $productIds = []) { @@ -314,7 +303,6 @@ public function insertRuleData(Mage_CatalogRule_Model_Rule $rule, array $website /** * Update products which are matched for rule * - * @param Mage_CatalogRule_Model_Rule $rule * * @throws Exception * @return $this diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php index a81cf39c7d6..8afa2eefed8 100644 --- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php +++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Apply price rule price to price index table * - * @param Varien_Db_Select $select * @param array|string $indexTable * @param string $entityId * @param string $customerGroupId diff --git a/app/code/core/Mage/CatalogRule/Model/Rule.php b/app/code/core/Mage/CatalogRule/Model/Rule.php index 053c08db9bf..7ca7d9bb2ce 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -125,8 +125,6 @@ class Mage_CatalogRule_Model_Rule extends Mage_Rule_Model_Abstract * - 'factory' Mage_Core_Model_Factory * - 'config' Mage_Core_Model_Config * - 'app' Mage_Core_Model_App - * - * @param array $args */ public function __construct(array $args = []) { @@ -348,7 +346,6 @@ public function applyAllRulesToProduct($product) /** * Calculate price using catalog price rule of product * - * @param Mage_Catalog_Model_Product $product * @param float $price * @return float|null */ @@ -475,7 +472,6 @@ public function toArray(array $arrAttributes = []) /** * Load matched product rules to the product * - * @param Mage_Catalog_Model_Product $product * @return $this */ public function loadProductRules(Mage_Catalog_Model_Product $product) diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php index 5221799f144..05d228ff38c 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_CatalogRule_Model_Rule_Condition_Product extends Mage_Rule_Model_Cond /** * Validate product attribute value for condition * - * @param Varien_Object $object * @return bool */ public function validate(Varien_Object $object) diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php index a3852c08e4f..01098165bef 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,6 @@ protected function _construct() /** * Apply price rule price to price index table * - * @param Varien_Db_Select $select * @param array|string $indexTable * @param string $entityId * @param string $customerGroupId diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php index 6bec3f765ec..cd9d826a31b 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php index a501404c9af..cd3a4a08604 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Term.php b/app/code/core/Mage/CatalogSearch/Block/Term.php index 10503bc18ab..7b4fb04b5ce 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Term.php +++ b/app/code/core/Mage/CatalogSearch/Block/Term.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Helper/Data.php b/app/code/core/Mage/CatalogSearch/Helper/Data.php index df69af30c39..029c0f9da35 100644 --- a/app/code/core/Mage/CatalogSearch/Helper/Data.php +++ b/app/code/core/Mage/CatalogSearch/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -257,7 +257,6 @@ public function addNoteMessage($message) /** * Set Note messages * - * @param array $messages * @return $this */ public function setNoteMessages(array $messages) diff --git a/app/code/core/Mage/CatalogSearch/Model/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Advanced.php index 458e7f58bdf..c716905d802 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Advanced.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -283,7 +283,7 @@ protected function _addSearchCriteria($attribute, $value) } /** - * Returns prepared search criterias in text + * Returns prepared search criteria in text * * @return array */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php b/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php index 6a1f8092998..69908b00ded 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php +++ b/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,7 +34,6 @@ protected function _getFulltextModel() /** * Update product index when product data updated * - * @param Varien_Event_Observer $observer * @return $this */ public function refreshProductIndex(Varien_Event_Observer $observer) @@ -52,7 +51,6 @@ public function refreshProductIndex(Varien_Event_Observer $observer) /** * Clean product index when product deleted or marked as unsearchable/invisible * - * @param Varien_Event_Observer $observer * @return $this */ public function cleanProductIndex(Varien_Event_Observer $observer) @@ -68,9 +66,8 @@ public function cleanProductIndex(Varien_Event_Observer $observer) } /** - * Update all attribute-dependant index + * Update all attribute-dependent index * - * @param Varien_Event_Observer $observer * @return $this */ public function eavAttributeChange(Varien_Event_Observer $observer) @@ -123,7 +120,6 @@ public function refreshIndexAfterImport() /** * Refresh fulltext index when we add new store * - * @param Varien_Event_Observer $observer * @return Mage_CatalogSearch_Model_Fulltext_Observer */ public function refreshStoreIndex(Varien_Event_Observer $observer) @@ -136,7 +132,6 @@ public function refreshStoreIndex(Varien_Event_Observer $observer) /** * Catalog Product mass website update * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductWebsiteUpdate(Varien_Event_Observer $observer) @@ -165,7 +160,6 @@ public function catalogProductWebsiteUpdate(Varien_Event_Observer $observer) /** * Store delete processing * - * @param Varien_Event_Observer $observer * @return $this */ public function cleanStoreIndex(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php index 7b39be94926..6667a51f9b3 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -120,7 +120,6 @@ public function getDescription() * Overwrote for check is flat catalog product is enabled and specific save * attribute, store, store_group * - * @param Mage_Index_Model_Event $event * @return bool */ public function matchEvent(Mage_Index_Model_Event $event) @@ -182,8 +181,6 @@ public function matchEvent(Mage_Index_Model_Event $event) /** * Register data required by process in event object - * - * @param Mage_Index_Model_Event $event */ protected function _registerEvent(Mage_Index_Model_Event $event) { @@ -214,7 +211,6 @@ protected function _registerEvent(Mage_Index_Model_Event $event) /** * Get data required for category'es products reindex * - * @param Mage_Index_Model_Event $event * @return Mage_CatalogSearch_Model_Indexer_Fulltext */ protected function _registerCatalogCategoryEvent(Mage_Index_Model_Event $event) @@ -243,7 +239,6 @@ protected function _registerCatalogCategoryEvent(Mage_Index_Model_Event $event) /** * Register data required by catatalog product process in event object * - * @param Mage_Index_Model_Event $event * @return Mage_CatalogSearch_Model_Indexer_Fulltext */ protected function _registerCatalogProductEvent(Mage_Index_Model_Event $event) @@ -345,8 +340,6 @@ protected function _isProductComposite($productId) /** * Process event - * - * @param Mage_Index_Model_Event $event */ protected function _processEvent(Mage_Index_Model_Event $event) { diff --git a/app/code/core/Mage/CatalogSearch/Model/Layer.php b/app/code/core/Mage/CatalogSearch/Model/Layer.php index 4295ba7b663..65ebf82fc7d 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Layer.php +++ b/app/code/core/Mage/CatalogSearch/Model/Layer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -76,7 +76,6 @@ public function getStateKey() /** * Get default tags for current layer state * - * @param array $additionalTags * @return array */ public function getStateTags(array $additionalTags = []) diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php index c958c6874d9..7408ff2dcc9 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -224,7 +224,6 @@ protected function _rebuildStoreIndex($storeId, $productIds = null) * Retrieve searchable products per store * * @param int $storeId - * @param array $staticFields * @param array|int $productIds * @param int $lastProductId * @param int $limit @@ -477,7 +476,7 @@ protected function _getSearchableAttribute($attribute) } /** - * Returns expresion for field unification + * Returns expression for field unification * * @param string $field * @param string $backendType @@ -502,8 +501,6 @@ protected function _unifyField($field, $backendType = 'varchar') * Load product(s) attributes * * @param int $storeId - * @param array $productIds - * @param array $attributeTypes * @return array */ protected function _getProductAttributes($storeId, array $productIds, array $attributeTypes) diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php index 9b867b0e5f5..a5a797252a8 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -175,7 +175,7 @@ public function isLeyeredNavigationAllowed() } /** - * Define if engine is avaliable + * Define if engine is available * * @return bool */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php index 3e98281efd7..ca24183ab55 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_CatalogSearch_Model_Resource_Helper_Mysql4 extends Mage_Eav_Model_Resource_Helper_Mysql4 { /** - * Join information for usin full text search + * Join information for using full text search * * @param string $table * @param string $alias @@ -112,7 +112,6 @@ public function insertOnDuplicate($table, array $data, array $fields = []) * Get field expression for order by * * @param string $fieldName - * @param array $orderedIds * * @return string */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Query.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Query.php index c41d3ddab21..3f9dbf5e69b 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Query.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Query.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +33,6 @@ protected function _construct() /** * Custom load model by search query string * - * @param Mage_Core_Model_Abstract $object * @param string $value * @return $this */ @@ -68,7 +67,6 @@ public function loadByQuery(Mage_Core_Model_Abstract $object, $value) /** * Custom load model only by query text (skip synonym for) * - * @param Mage_Core_Model_Abstract $object * @param string $value * @return $this */ @@ -104,7 +102,6 @@ public function load(Mage_Core_Model_Abstract $object, $value, $field = null) } /** - * @param Mage_Core_Model_Abstract $object * @return $this */ public function _beforeSave(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php index c492cb21fcb..d9959b0a99e 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/Api.php b/app/code/core/Mage/Centinel/Model/Api.php index 4a797cbd520..79c79665b69 100644 --- a/app/code/core/Mage/Centinel/Model/Api.php +++ b/app/code/core/Mage/Centinel/Model/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Centinel * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -88,7 +88,7 @@ protected function _getVersion() } /** - * Return transaction type. according centinel documetation it should be "C" + * Return transaction type. according centinel documentation it should be "C" * * @return string "C" */ diff --git a/app/code/core/Mage/Centinel/Model/Api/Client.php b/app/code/core/Mage/Centinel/Model/Api/Client.php index b173b4a8d91..4644b5838a7 100644 --- a/app/code/core/Mage/Centinel/Model/Api/Client.php +++ b/app/code/core/Mage/Centinel/Model/Api/Client.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Centinel * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +56,7 @@ public function sendHttp($url, $connectTimeout, $timeout) $result = $this->setErrorResponse(CENTINEL_ERROR_CODE_8030, CENTINEL_ERROR_CODE_8030_DESC); } - // Assert that we received an expected Centinel Message in reponse. + // Assert that we received an expected Centinel Message in response. if (strpos($result, '') === false) { $result = $this->setErrorResponse(CENTINEL_ERROR_CODE_8010, CENTINEL_ERROR_CODE_8010_DESC); } diff --git a/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php b/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php index f132f818e7c..8dba4874521 100644 --- a/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php +++ b/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Centinel * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,7 +53,7 @@ public function validatePaymentDataAction() } /** - * Process autentication start action + * Process authentication start action * */ public function authenticationStartAction() @@ -65,7 +65,7 @@ public function authenticationStartAction() } /** - * Process autentication complete action + * Process authentication complete action * */ public function authenticationCompleteAction() diff --git a/app/code/core/Mage/Centinel/controllers/IndexController.php b/app/code/core/Mage/Centinel/controllers/IndexController.php index e17692c0b54..f6553f0ab6f 100644 --- a/app/code/core/Mage/Centinel/controllers/IndexController.php +++ b/app/code/core/Mage/Centinel/controllers/IndexController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Centinel * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Centinel_IndexController extends Mage_Core_Controller_Front_Action { /** - * Process autentication start action + * Process authentication start action * */ public function authenticationStartAction() @@ -34,7 +34,7 @@ public function authenticationStartAction() } /** - * Process autentication complete action + * Process authentication complete action * */ public function authenticationCompleteAction() diff --git a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php index 21a8b999421..bfc36d291dd 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -149,7 +149,6 @@ public function getItems() /** * Get item row html * - * @param Mage_Sales_Model_Quote_Item $item * @return string */ public function getItemHtml(Mage_Sales_Model_Quote_Item $item) diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php index 6be51c7ce34..61d9795c8ac 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,7 +50,6 @@ class Mage_Checkout_Block_Cart_Item_Renderer extends Mage_Core_Block_Template /** * Set item for render * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return $this */ public function setItem(Mage_Sales_Model_Quote_Item_Abstract $item) diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php index 5c8f1201cd4..24fcb0b6f89 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -327,7 +327,6 @@ public function addRowItemRender($type, $block, $template) /** * Return row-level item html * - * @param Varien_Object $item * @return string */ public function getRowItemHtml(Varien_Object $item) diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php index c8aea60c55e..dee6612ffc8 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Checkout_Block_Onepage_Billing extends Mage_Checkout_Block_Onepage_Abstract { /** - * Sales Qoute Billing Address instance + * Sales Quote Billing Address instance * * @var Mage_Sales_Model_Quote_Address|null */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php index 7cb8ec3e184..ddb7cc9f592 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,7 +55,6 @@ public function getSelectedMethodCode() /** * Payment method form html getter - * @param Mage_Payment_Model_Method_Abstract $method * @return string */ public function getPaymentMethodFormHtml(Mage_Payment_Model_Method_Abstract $method) @@ -66,7 +65,6 @@ public function getPaymentMethodFormHtml(Mage_Payment_Model_Method_Abstract $met /** * Return method title for payment selection page * - * @param Mage_Payment_Model_Method_Abstract $method * @return string */ public function getMethodTitle(Mage_Payment_Model_Method_Abstract $method) @@ -80,7 +78,6 @@ public function getMethodTitle(Mage_Payment_Model_Method_Abstract $method) /** * Payment method additional label part getter - * @param Mage_Payment_Model_Method_Abstract $method * @return string */ public function getMethodLabelAfterHtml(Mage_Payment_Model_Method_Abstract $method) diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php index 5a91416fca6..aaf21d465b6 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Checkout_Block_Onepage_Shipping extends Mage_Checkout_Block_Onepage_Abstract { /** - * Sales Qoute Shipping Address instance + * Sales Quote Shipping Address instance * * @var Mage_Sales_Model_Quote_Address|null */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Success.php b/app/code/core/Mage/Checkout/Block/Onepage/Success.php index 2b007bb2ee7..5dba4fffd0c 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Success.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Success.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,7 +68,6 @@ public function isOrderVisible() /** * Getter for recurring profile view page * - * @param Varien_Object|Mage_Sales_Model_Recurring_Profile $profile * @return string */ public function getProfileUrl(Varien_Object $profile) diff --git a/app/code/core/Mage/Checkout/Block/Total/Nominal.php b/app/code/core/Mage/Checkout/Block/Total/Nominal.php index a9bc5c5105b..1343e329f92 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Nominal.php +++ b/app/code/core/Mage/Checkout/Block/Total/Nominal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,7 +32,6 @@ class Mage_Checkout_Block_Total_Nominal extends Mage_Checkout_Block_Total_Defaul /** * Getter for a quote item name * - * @param Mage_Sales_Model_Quote_Item_Abstract $quoteItem * @return string */ public function getItemName(Mage_Sales_Model_Quote_Item_Abstract $quoteItem) @@ -43,7 +42,6 @@ public function getItemName(Mage_Sales_Model_Quote_Item_Abstract $quoteItem) /** * Getter for a quote item row total * - * @param Mage_Sales_Model_Quote_Item_Abstract $quoteItem * @return float */ public function getItemRowTotal(Mage_Sales_Model_Quote_Item_Abstract $quoteItem) @@ -54,7 +52,6 @@ public function getItemRowTotal(Mage_Sales_Model_Quote_Item_Abstract $quoteItem) /** * Getter for nominal total item details * - * @param Mage_Sales_Model_Quote_Item_Abstract $quoteItem * @return array */ public function getTotalItemDetails(Mage_Sales_Model_Quote_Item_Abstract $quoteItem) @@ -65,7 +62,6 @@ public function getTotalItemDetails(Mage_Sales_Model_Quote_Item_Abstract $quoteI /** * Getter for details row label * - * @param Varien_Object $row * @return string */ public function getItemDetailsRowLabel(Varien_Object $row) @@ -76,7 +72,6 @@ public function getItemDetailsRowLabel(Varien_Object $row) /** * Getter for details row amount * - * @param Varien_Object $row * @return string */ public function getItemDetailsRowAmount(Varien_Object $row) @@ -87,7 +82,6 @@ public function getItemDetailsRowAmount(Varien_Object $row) /** * Getter for details row compounded state * - * @param Varien_Object $row * @return bool */ public function getItemDetailsRowIsCompounded(Varien_Object $row) diff --git a/app/code/core/Mage/Checkout/Helper/Cart.php b/app/code/core/Mage/Checkout/Helper/Cart.php index 057c966ffbf..745d427b433 100644 --- a/app/code/core/Mage/Checkout/Helper/Cart.php +++ b/app/code/core/Mage/Checkout/Helper/Cart.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -132,7 +132,7 @@ public function getSummaryCount() } /** - * Check qoute for virtual products only + * Check quote for virtual products only * * @return bool */ diff --git a/app/code/core/Mage/Checkout/Helper/Data.php b/app/code/core/Mage/Checkout/Helper/Data.php index cd660c35133..a8d3f212a83 100644 --- a/app/code/core/Mage/Checkout/Helper/Data.php +++ b/app/code/core/Mage/Checkout/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -298,7 +298,6 @@ public function isMultishippingCheckoutAvailable() * Check is allowed Guest Checkout * Use config settings and observer * - * @param Mage_Sales_Model_Quote $quote * @param int|Mage_Core_Model_Store $store * @return bool */ diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource.php b/app/code/core/Mage/Checkout/Model/Api/Resource.php index 92751f397f2..b42ba5a8513 100644 --- a/app/code/core/Mage/Checkout/Model/Api/Resource.php +++ b/app/code/core/Mage/Checkout/Model/Api/Resource.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -141,7 +141,6 @@ protected function _getStoreIdFromQuote($quoteId) * @param array $data * @param Mage_Core_Model_Abstract $object * @param string $type - * @param array|null $attributes * @return $this */ protected function _updateAttributes($data, $object, $type, ?array $attributes = null) @@ -160,7 +159,6 @@ protected function _updateAttributes($data, $object, $type, ?array $attributes = * * @param Mage_Core_Model_Abstract $object * @param string $type - * @param array|null $attributes * @return array */ protected function _getAttributes($object, $type, ?array $attributes = null) @@ -199,7 +197,6 @@ protected function _getAttributes($object, $type, ?array $attributes = null) * * @param string $attributeCode * @param string $type - * @param array|null $attributes * @return bool */ protected function _isAllowedAttribute($attributeCode, $type, ?array $attributes = null) diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php b/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php index 7fcb973f825..91b9df5466d 100644 --- a/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php +++ b/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -72,7 +72,6 @@ protected function _getCustomerAddress($addressId) } /** - * @param Mage_Sales_Model_Quote $quote * @return bool */ public function prepareCustomerForQuote(Mage_Sales_Model_Quote $quote) @@ -97,7 +96,6 @@ public function prepareCustomerForQuote(Mage_Sales_Model_Quote $quote) /** * Prepare quote for guest checkout order submit * - * @param Mage_Sales_Model_Quote $quote * @return $this */ protected function _prepareGuestQuote(Mage_Sales_Model_Quote $quote) @@ -112,7 +110,6 @@ protected function _prepareGuestQuote(Mage_Sales_Model_Quote $quote) /** * Prepare quote for customer registration and customer order submit * - * @param Mage_Sales_Model_Quote $quote * @return $this */ protected function _prepareNewCustomerQuote(Mage_Sales_Model_Quote $quote) @@ -148,7 +145,6 @@ protected function _prepareNewCustomerQuote(Mage_Sales_Model_Quote $quote) /** * Prepare quote for customer order submit * - * @param Mage_Sales_Model_Quote $quote * @return $this */ protected function _prepareCustomerQuote(Mage_Sales_Model_Quote $quote) @@ -186,7 +182,6 @@ protected function _prepareCustomerQuote(Mage_Sales_Model_Quote $quote) /** * Involve new customer to system * - * @param Mage_Sales_Model_Quote $quote * @return $this */ public function involveNewCustomer(Mage_Sales_Model_Quote $quote) diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php b/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php index 52491f42581..d8b805ff7c0 100644 --- a/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php +++ b/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,9 +71,6 @@ protected function _getProductRequest($requestInfo) /** * Get QuoteItem by Product and request info * - * @param Mage_Sales_Model_Quote $quote - * @param Mage_Catalog_Model_Product $product - * @param Varien_Object $requestInfo * @return Mage_Sales_Model_Quote_Item * @throw Mage_Core_Exception */ diff --git a/app/code/core/Mage/Checkout/Model/Cart.php b/app/code/core/Mage/Checkout/Model/Cart.php index a13da55633e..15901159e6f 100644 --- a/app/code/core/Mage/Checkout/Model/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Cart.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -113,7 +113,6 @@ public function getQuote() /** * Set quote object associated with the cart * - * @param Mage_Sales_Model_Quote $quote * @return $this */ public function setQuote(Mage_Sales_Model_Quote $quote) diff --git a/app/code/core/Mage/Checkout/Model/Cart/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Api.php index 4cb3d233f71..a293d59b8ec 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php index b181a09a1c9..2426bf3db15 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php index 2c97e11d13e..ad505436d15 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Interface.php b/app/code/core/Mage/Checkout/Model/Cart/Interface.php index 1a1b1d9df66..da900185dc9 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Interface.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Interface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,7 +43,6 @@ public function saveQuote(); * Associate quote with the cart * * @abstract - * @param Mage_Sales_Model_Quote $quote * @return Mage_Checkout_Model_Cart_Interface */ public function setQuote(Mage_Sales_Model_Quote $quote); diff --git a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php index 8e51bf40f7d..a3a4f4e6ae2 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php index 58f67f790b3..fb4c8dbfacf 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php index 877228a7b1e..a1128ce4829 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Observer.php b/app/code/core/Mage/Checkout/Model/Observer.php index f2f9520930a..0ec7541b989 100644 --- a/app/code/core/Mage/Checkout/Model/Observer.php +++ b/app/code/core/Mage/Checkout/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,9 +40,6 @@ public function loadCustomerQuote() } } - /** - * @param Varien_Event_Observer $observer - */ public function salesQuoteSaveAfter(Varien_Event_Observer $observer) { $quote = $observer->getEvent()->getQuote(); diff --git a/app/code/core/Mage/Checkout/Model/Resource/Agreement.php b/app/code/core/Mage/Checkout/Model/Resource/Agreement.php index 5f914ba9d1d..d62b2a2fa23 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Agreement.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Agreement.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Method to run before save * - * @param Mage_Core_Model_Abstract|Mage_Checkout_Model_Agreement $object * @return Mage_Core_Model_Resource_Db_Abstract */ protected function _beforeSave(Mage_Core_Model_Abstract $object) @@ -50,7 +49,6 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) /** * Method to run after save * - * @param Mage_Core_Model_Abstract $object * @return Mage_Core_Model_Resource_Db_Abstract */ protected function _afterSave(Mage_Core_Model_Abstract $object) @@ -71,7 +69,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) /** * Method to run after load * - * @param Mage_Core_Model_Abstract $object * @return Mage_Core_Model_Resource_Db_Abstract */ protected function _afterLoad(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php index fe98a27ef32..fc51baf6825 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php +++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -162,7 +162,7 @@ public function removeAddressItem($addressId, $itemId) } /** - * Require shiping rate recollect + * Require shipping rate recollect */ $address->setCollectShippingRates((bool) $this->getCollectRatesFlag()); @@ -309,7 +309,7 @@ protected function _addShippingItem($quoteItemId, $data) $quoteAddress->addItem($quoteItem, $qty); } /** - * Require shiping rate recollect + * Require shipping rate recollect */ $quoteAddress->setCollectShippingRates((bool) $this->getCollectRatesFlag()); } @@ -397,7 +397,6 @@ public function setPaymentMethod($payment) /** * Prepare order based on quote address * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Order * @throws Mage_Checkout_Exception */ diff --git a/app/code/core/Mage/Checkout/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php index 2cdbe2eec65..d093d4904a2 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php +++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -90,7 +90,6 @@ public function getQuote() /** * Declare checkout quote instance * - * @param Mage_Sales_Model_Quote $quote * @return $this */ public function setQuote(Mage_Sales_Model_Quote $quote) @@ -377,7 +376,6 @@ public function saveBilling($data, $customerAddressId) * Validate customer data and set some its data for further usage in quote * Will return either true or array with error messages * - * @param array $data * @return true|array */ protected function _validateCustomerData(array $data) @@ -455,7 +453,6 @@ protected function _validateCustomerData(array $data) * Will return either true or array with error messages * * @deprecated since 1.4.0.1 - * @param Mage_Sales_Model_Quote_Address $address * @return true|array */ protected function _processValidateCustomer(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php index 3ad002536b1..4f0227be147 100644 --- a/app/code/core/Mage/Checkout/controllers/CartController.php +++ b/app/code/core/Mage/Checkout/controllers/CartController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -718,8 +718,6 @@ protected function _getCustomerSession() /** * Set product form data in checkout session for populating the product form * in case of errors in add to cart process. - * - * @return void */ protected function _setProductBuyRequest(): void { diff --git a/app/code/core/Mage/Checkout/controllers/OnepageController.php b/app/code/core/Mage/Checkout/controllers/OnepageController.php index 50fd294b5c5..759541f48ca 100644 --- a/app/code/core/Mage/Checkout/controllers/OnepageController.php +++ b/app/code/core/Mage/Checkout/controllers/OnepageController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Controller/Router.php b/app/code/core/Mage/Cms/Controller/Router.php index 0219515f063..368afa71e33 100644 --- a/app/code/core/Mage/Cms/Controller/Router.php +++ b/app/code/core/Mage/Cms/Controller/Router.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,7 +37,6 @@ public function initControllerRouters($observer) /** * Validate and Match Cms Page and modify request * - * @param Zend_Controller_Request_Http $request * @return bool */ public function match(Zend_Controller_Request_Http $request) @@ -46,6 +45,7 @@ public function match(Zend_Controller_Request_Http $request) Mage::app()->getFrontController()->getResponse() ->setRedirect(Mage::getUrl('install')) ->sendResponse(); + // phpcs:ignore: Ecg.Security.LanguageConstruct.ExitUsage exit; } diff --git a/app/code/core/Mage/Cms/Helper/Page.php b/app/code/core/Mage/Cms/Helper/Page.php index c76a8a52bd0..1513a755051 100644 --- a/app/code/core/Mage/Cms/Helper/Page.php +++ b/app/code/core/Mage/Cms/Helper/Page.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,14 +28,13 @@ class Mage_Cms_Helper_Page extends Mage_Core_Helper_Abstract protected $_moduleName = 'Mage_Cms'; /** - * Renders CMS page on front end - * - * Call from controller action - * - * @param Mage_Core_Controller_Front_Action $action - * @param string $pageId - * @return bool - */ + * Renders CMS page on front end + * + * Call from controller action + * + * @param string $pageId + * @return bool + */ public function renderPage(Mage_Core_Controller_Front_Action $action, $pageId = null) { return $this->_renderPage($action, $pageId); @@ -44,7 +43,6 @@ public function renderPage(Mage_Core_Controller_Front_Action $action, $pageId = /** * Renders CMS page * - * @param Mage_Core_Controller_Varien_Action $action * @param string $pageId * @param bool $renderLayout * @return bool @@ -53,9 +51,9 @@ protected function _renderPage(Mage_Core_Controller_Varien_Action $action, $pag { $page = Mage::getSingleton('cms/page'); if (!is_null($pageId) && $pageId !== $page->getId()) { - $delimeterPosition = strrpos($pageId, '|'); - if ($delimeterPosition) { - $pageId = substr($pageId, 0, $delimeterPosition); + $delimiterPosition = strrpos($pageId, '|'); + if ($delimiterPosition) { + $pageId = substr($pageId, 0, $delimiterPosition); } $page->setStoreId(Mage::app()->getStore()->getId()); @@ -133,7 +131,6 @@ protected function _renderPage(Mage_Core_Controller_Varien_Action $action, $pag * Allows to use also backend action as first parameter. * Also takes third parameter which allows not run renderLayout method. * - * @param Mage_Core_Controller_Varien_Action $action * @param string $pageId * @param bool $renderLayout * @return bool diff --git a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php index 6b41ba93beb..08e514a593c 100644 --- a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php +++ b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,7 +36,7 @@ class Mage_Cms_Helper_Wysiwyg_Images extends Mage_Core_Helper_Abstract protected $_currentUrl; /** - * Currenty selected store ID if applicable + * Currently selected store ID if applicable * * @var int */ @@ -70,6 +70,7 @@ public function getStorageRoot() if (!$this->_storageRoot) { $path = Mage::getConfig()->getOptions()->getMediaDir() . DS . Mage_Cms_Model_Wysiwyg_Config::IMAGE_DIRECTORY; + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found $this->_storageRoot = realpath($path); if (!$this->_storageRoot) { $this->_storageRoot = $path; @@ -107,6 +108,7 @@ public function getTreeNodeName() */ public function convertPathToId($path) { + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found $storageRoot = realpath($this->getStorageRoot()); $path = str_replace($storageRoot, '', $path); return $this->idEncode($path); @@ -121,6 +123,7 @@ public function convertPathToId($path) public function convertIdToPath($id) { $path = $this->idDecode($id); + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found $storageRoot = realpath($this->getStorageRoot()); if (!strstr($path, $storageRoot)) { $path = $storageRoot . DS . $path; @@ -209,7 +212,9 @@ public function getCurrentPath() $currentPath = $this->getStorageRoot(); $node = $this->_getRequest()->getParam($this->getTreeNodeName()); if ($node) { + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found $path = realpath($this->convertIdToPath($node)); + // phpcs:ignore: Ecg.Security.DiscouragedFunction.Discouraged if ($path && is_dir($path) && stripos($path, $currentPath) !== false) { $currentPath = $path; } @@ -235,6 +240,7 @@ public function getCurrentPath() public function getCurrentUrl() { if (!$this->_currentUrl) { + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found $mediaPath = realpath(Mage::getConfig()->getOptions()->getMediaDir()); $path = str_replace($mediaPath, '', $this->getCurrentPath()); $path = trim($path, DS); @@ -266,7 +272,7 @@ public function idEncode($string) } /** - * Revert opration to idEncode + * Revert operation to idEncode * * @param string $string * @return string|false @@ -274,6 +280,7 @@ public function idEncode($string) public function idDecode($string) { $string = strtr($string, ':_-', '+/='); + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found return base64_decode($string); } diff --git a/app/code/core/Mage/Cms/Model/Block.php b/app/code/core/Mage/Cms/Model/Block.php index 7ef415ff414..0b9c8275dc7 100644 --- a/app/code/core/Mage/Cms/Model/Block.php +++ b/app/code/core/Mage/Cms/Model/Block.php @@ -58,7 +58,7 @@ protected function _construct() protected function _beforeSave() { $needle = 'block_id="' . $this->getBlockId() . '"'; - if (strstr($this->getContent(), $needle) == false) { + if (!strstr($this->getContent(), $needle)) { return parent::_beforeSave(); } Mage::throwException( diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block.php b/app/code/core/Mage/Cms/Model/Mysql4/Block.php index 0ae678f8cad..e4fcf4094e6 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Block.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Block.php @@ -1,4 +1,5 @@ _getResource()->checkIdentifier($identifier, $storeId); } + /** + * Retrieves cms page title from DB by passed identifier. + */ + public function getCmsPageTitleByIdentifier(string $identifier): string + { + return $this->_getResource()->getCmsPageTitleByIdentifier($identifier); + } + + /** + * Retrieves cms page title from DB by passed id. + * + * @param string|int $id + */ + public function getCmsPageTitleById($id): string + { + return $this->_getResource()->getCmsPageTitleById($id); + } + + /** + * Retrieves cms page identifier from DB by passed id. + * + * @param string|int $id + */ + public function getCmsPageIdentifierById($id): string + { + return $this->_getResource()->getCmsPageIdentifierById($id); + } + /** * Prepare page's statuses. * Available event cms_page_get_available_statuses to customize statuses. diff --git a/app/code/core/Mage/Cms/Model/Resource/Block.php b/app/code/core/Mage/Cms/Model/Resource/Block.php index f3ca4f85938..f418a538ed5 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Block.php +++ b/app/code/core/Mage/Cms/Model/Resource/Block.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,7 +43,6 @@ protected function _beforeDelete(Mage_Core_Model_Abstract $object) /** * Perform operations before object save * - * @param Mage_Core_Model_Abstract|Mage_Cms_Model_Block $object * @return $this * @throws Mage_Core_Exception */ @@ -157,7 +156,6 @@ protected function _getLoadSelect($field, $value, $object) /** * Check for unique of identifier of block to selected store(s). * - * @param Mage_Core_Model_Abstract $object * @return bool */ public function getIsUniqueBlockToStores(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php b/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php index 2cab27d2fff..2e0852a8385 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php +++ b/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php @@ -92,6 +92,7 @@ protected function _renderFiltersBefore() ['store_table' => $this->getTable('cms/block_store')], 'main_table.block_id = store_table.block_id', [] + // phpcs:ignore: Ecg.Sql.SlowQuery.SlowSql )->group('main_table.block_id'); /* @@ -99,6 +100,6 @@ protected function _renderFiltersBefore() */ $this->_useAnalyticFunction = true; } - return parent::_renderFiltersBefore(); + parent::_renderFiltersBefore(); } } diff --git a/app/code/core/Mage/Cms/Model/Resource/Page.php b/app/code/core/Mage/Cms/Model/Resource/Page.php index 4bc973e4b83..8b9733a7f6f 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Page.php +++ b/app/code/core/Mage/Cms/Model/Resource/Page.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -213,7 +213,6 @@ protected function _getLoadByIdentifierSelect($identifier, $store, $isActive = n /** * Check for unique of identifier of page to selected store(s). * - * @param Mage_Core_Model_Abstract|Mage_Cms_Model_Page $object * @return bool */ public function getIsUniquePageToStores(Mage_Core_Model_Abstract $object) @@ -242,7 +241,6 @@ public function getIsUniquePageToStores(Mage_Core_Model_Abstract $object) * * @date Wed Mar 26 18:12:28 EET 2008 * - * @param Mage_Core_Model_Abstract $object * @return int|false */ protected function isNumericPageIdentifier(Mage_Core_Model_Abstract $object) @@ -253,7 +251,7 @@ protected function isNumericPageIdentifier(Mage_Core_Model_Abstract $object) /** * Check whether page identifier is valid * - * @param Mage_Core_Model_Abstract $object + * * @return int|false */ protected function isValidPageIdentifier(Mage_Core_Model_Abstract $object) @@ -284,7 +282,7 @@ public function checkIdentifier($identifier, $storeId) /** * Retrieves cms page title from DB by passed identifier. * - * @param string $identifier + * @param string|int $identifier * @return string */ public function getCmsPageTitleByIdentifier($identifier) @@ -306,7 +304,7 @@ public function getCmsPageTitleByIdentifier($identifier) /** * Retrieves cms page title from DB by passed id. * - * @param string $id + * @param string|int $id * @return string */ public function getCmsPageTitleById($id) diff --git a/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php b/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php index d8a85cd11f1..aa54f1ef80a 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php +++ b/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php @@ -162,6 +162,7 @@ protected function _renderFiltersBefore() ['store_table' => $this->getTable('cms/page_store')], 'main_table.page_id = store_table.page_id', [] + // phpcs:ignore: Ecg.Sql.SlowQuery.SlowSql )->group('main_table.page_id'); /* @@ -169,7 +170,7 @@ protected function _renderFiltersBefore() */ $this->_useAnalyticFunction = true; } - return parent::_renderFiltersBefore(); + parent::_renderFiltersBefore(); } /** diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php index 8aa9f1998c3..3974734a8fd 100644 --- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php +++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,7 +51,9 @@ public function getDirsCollection($path) $subDirectories = Mage::getModel('core/file_storage_directory_database')->getSubdirectories($path); foreach ($subDirectories as $directory) { $fullPath = rtrim($path, DS) . DS . $directory['name']; + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found if (!file_exists($fullPath)) { + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found mkdir($fullPath, 0777, true); } } @@ -136,6 +138,7 @@ public function getFilesCollection($path, $type = null) $thumbUrl = Mage::getSingleton('adminhtml/url')->getUrl('*/*/thumbnail', ['file' => $item->getId()]); } + // phpcs:ignore: Generic.PHP.NoSilencedErrors.Discouraged $size = @getimagesize($item->getFilename()); if (is_array($size)) { @@ -180,12 +183,14 @@ public function createDirectory($name, $path) if (!preg_match(self::DIRECTORY_NAME_REGEXP, $name)) { Mage::throwException(Mage::helper('cms')->__('Invalid folder name. Please, use alphanumeric characters, underscores and dashes.')); } + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found, Ecg.Security.DiscouragedFunction.Discouraged if (!is_dir($path) || !is_writable($path)) { $path = $this->getHelper()->getStorageRoot(); } $newPath = $path . DS . $name; + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found if (file_exists($newPath)) { Mage::throwException(Mage::helper('cms')->__('A directory with the same name already exists. Please try another folder name.')); } @@ -226,6 +231,7 @@ public function deleteDirectory($path) $io->getFilteredPath($path) )); } + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found if (str_contains($pathCmp, chr(0)) || preg_match('#(^|[\\\\/])\.\.($|[\\\\/])#', $pathCmp) ) { @@ -298,6 +304,7 @@ public function uploadFile($targetPath, $type = null) $this->resizeFile($targetPath . DS . $uploader->getUploadedFileName(), true); } $result['cookie'] = [ + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found 'name' => session_name(), 'value' => $this->getSession()->getSessionId(), 'lifetime' => $this->getSession()->getCookieLifetime(), @@ -322,6 +329,7 @@ public function getThumbnailPath($filePath, $checkFile = false) if (str_starts_with($filePath, $mediaRootDir)) { $thumbPath = $this->getThumbnailRoot() . DS . substr($filePath, strlen($mediaRootDir)); + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found if (!$checkFile || is_readable($thumbPath)) { return $thumbPath; } @@ -342,6 +350,7 @@ public function getThumbnailUrl($filePath, $checkFile = false) $mediaRootDir = Mage::getConfig()->getOptions()->getMediaDir() . DS; if (str_starts_with($filePath, $mediaRootDir)) { $thumbSuffix = self::THUMBS_DIRECTORY_NAME . DS . substr($filePath, strlen($mediaRootDir)); + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found if (!$checkFile || is_readable($this->getHelper()->getStorageRoot() . $thumbSuffix)) { $randomIndex = '?rand=' . time(); $thumbUrl = $this->getHelper()->getBaseUrl() . Mage_Cms_Model_Wysiwyg_Config::IMAGE_DIRECTORY @@ -361,6 +370,7 @@ public function getThumbnailUrl($filePath, $checkFile = false) */ public function resizeFile($source, $keepRation = true) { + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found, Ecg.Security.DiscouragedFunction.Discouraged if (!is_file($source) || !is_readable($source)) { return false; } @@ -386,8 +396,10 @@ public function resizeFile($source, $keepRation = true) $image->resize($width, $height); $dest = $targetDir . DS + // phpcs:ignore: Ecg.Security.DiscouragedFunction.Discouraged . Mage_Core_Model_File_Uploader::getCorrectFileName(pathinfo($source, PATHINFO_BASENAME)); $image->save($dest); + // phpcs:ignore: Ecg.Security.DiscouragedFunction.Discouraged if (is_file($dest)) { return $dest; } @@ -398,7 +410,7 @@ public function resizeFile($source, $keepRation = true) * Resize images on the fly in controller action * * @param string $filename File basename - * @return bool|string Thumbnail path or false for errors + * @return false|string Thumbnail path or false for errors */ public function resizeOnTheFly($filename) { @@ -421,6 +433,7 @@ public function getThumbsPath($filePath = false) $thumbnailDir = $this->getThumbnailRoot(); if ($filePath && str_starts_with($filePath, $mediaRootDir)) { + // phpcs:ignore: Ecg.Security.ForbiddenFunction.Found $thumbnailDir .= DS . dirname(substr($filePath, strlen($mediaRootDir))); } @@ -529,6 +542,7 @@ public function isImage($filename) if (!$this->hasData('_image_extensions')) { $this->setData('_image_extensions', $this->getAllowedExtensions('image')); } + // phpcs:ignore: Ecg.Security.DiscouragedFunction.Discouraged $ext = strtolower(pathinfo($filename, PATHINFO_EXTENSION)); return in_array($ext, $this->_getData('_image_extensions')); } diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php index d3b6a989cd4..e84c5f3b042 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php index bcc473e9ca4..3c841aa75e9 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -166,7 +166,7 @@ FRONTEND - You sesssion ID on the server. + You session ID on the server. GUEST-VIEW diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php index 5139e277156..3bb234a7d6c 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/etc/system.xml b/app/code/core/Mage/Cms/etc/system.xml index a19944d9b2e..2ca8f66a13f 100644 --- a/app/code/core/Mage/Cms/etc/system.xml +++ b/app/code/core/Mage/Cms/etc/system.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php index 36327a8f98b..68af36c0e77 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php +++ b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ abstract public function getProducts(); /** * json encode image fallback array * - * @param array $imageFallback * @return string */ protected function _getJsImageFallbackString(array $imageFallback) diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php b/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php index 4aee7b6ffd6..1debc6915ad 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +33,6 @@ class Mage_ConfigurableSwatches_Helper_List_Price extends Mage_Core_Helper_Abstr * Depends on following product data: * - product must have children products attached and be configurable by type * - * @param array $products * @param int $storeId */ public function attachConfigurableProductChildrenPricesMapping(array $products, $storeId = null) diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php index da23ea014ad..8c7e96f0544 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,7 +30,6 @@ class Mage_ConfigurableSwatches_Helper_Mediafallback extends Mage_Core_Helper_Ab * Depends on following product data: * - product must have children products attached * - * @param array $parentProducts * @deprecated use $this->attachProductChildrenAttributeMapping() instead * @param int $storeId */ @@ -44,7 +43,6 @@ public function attachConfigurableProductChildrenAttributeMapping(array $parentP * Depends on following product data: * - product must have children products attached * - * @param array $parentProducts * @param int $storeId * @param bool $onlyListAttributes */ @@ -159,7 +157,6 @@ public function attachProductChildrenAttributeMapping(array $parentProducts, $st * - product must have media gallery attached which attaches and differentiates local images and child images * - product must have child products attached * - * @param Mage_Catalog_Model_Product $product * @param array $imageTypes - image types to select for child products * @param bool $keepFrame * @return array @@ -297,8 +294,6 @@ protected function _resizeProductImage($product, $type, $keepFrame, $image = nul /** * Groups media gallery images by local images and child images - * - * @param Mage_Catalog_Model_Product $product */ public function groupMediaGalleryImages(Mage_Catalog_Model_Product $product) { @@ -329,7 +324,6 @@ public function groupMediaGalleryImages(Mage_Catalog_Model_Product $product) /** * For given product set, attach media_gallery attribute values. * - * @param array $products * @param int $storeId */ public function attachGallerySetToCollection(array $products, $storeId) @@ -416,7 +410,6 @@ protected function _getChildrenProductsAttributes() * Attaches children product to each product via * ->setChildrenProducts() * - * @param array $products * @param int $storeId */ public function attachChildrenProducts(array $products, $storeId) @@ -432,6 +425,7 @@ public function attachChildrenProducts(array $products, $storeId) ); $collection->setFlag('product_children', true) + ->setFlag('require_stock_items', true) ->addStoreFilter($storeId) ->addAttributeToSelect($this->_getChildrenProductsAttributes()); $collection->addProductSetFilter($productIds); diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php index f210de677cb..928288c49d3 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php index 54f23f28e69..0addf93326a 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ConfigurableSwatches/Model/Observer.php b/app/code/core/Mage/ConfigurableSwatches/Model/Observer.php index 75f8c98768c..41d820273d2 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Model/Observer.php +++ b/app/code/core/Mage/ConfigurableSwatches/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,7 +23,6 @@ class Mage_ConfigurableSwatches_Model_Observer extends Mage_Core_Model_Abstract * Attach children products after product list load * Observes: catalog_block_product_list_collection * - * @param Varien_Event_Observer $observer * @return void */ public function productListCollectionLoadAfter(Varien_Event_Observer $observer) @@ -70,8 +69,6 @@ public function productListCollectionLoadAfter(Varien_Event_Observer $observer) /** * Attach children products after product load * Observes: catalog_product_load_after - * - * @param Varien_Event_Observer $observer */ public function productLoadAfter(Varien_Event_Observer $observer) { @@ -98,8 +95,6 @@ public function productLoadAfter(Varien_Event_Observer $observer) * Instruct media attribute to load images for product's children * if config swatches enabled. * Observes: catalog_product_attribute_backend_media_load_gallery_before - * - * @param Varien_Event_Observer $observer */ public function loadChildProductImagesOnMediaLoad(Varien_Event_Observer $observer) { @@ -139,8 +134,6 @@ public function loadChildProductImagesOnMediaLoad(Varien_Event_Observer $observe /** * Convert a catalog layer block with the right templates * Observes: controller_action_layout_generate_blocks_after - * - * @param Varien_Event_Observer $observer */ public function convertLayerBlock(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Attribute/Super/Collection.php b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Attribute/Super/Collection.php index 795523cb0d7..f06c67946db 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Attribute/Super/Collection.php +++ b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Attribute/Super/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,7 +25,6 @@ class Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Attribute_Super_C /** * Filter parent products to these IDs * - * @param array $parentProductIds * @return $this */ public function addParentProductsFilter(array $parentProductIds) diff --git a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php index c65b7dbe5cb..1073bcf7e54 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php +++ b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -21,8 +21,6 @@ class Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable { /** * Filter by parent product set - * - * @param array $productIds */ public function addProductSetFilter(array $productIds) { diff --git a/app/code/core/Mage/Contacts/controllers/IndexController.php b/app/code/core/Mage/Contacts/controllers/IndexController.php index 42cf817ed77..3e72543fb3c 100644 --- a/app/code/core/Mage/Contacts/controllers/IndexController.php +++ b/app/code/core/Mage/Contacts/controllers/IndexController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Contacts * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Contacts/etc/config.xml b/app/code/core/Mage/Contacts/etc/config.xml index 0234162fc4e..e29d7907df1 100644 --- a/app/code/core/Mage/Contacts/etc/config.xml +++ b/app/code/core/Mage/Contacts/etc/config.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Contacts * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/etc/system.xml b/app/code/core/Mage/Contacts/etc/system.xml index dfdcaffcb49..ef4c78f84ad 100644 --- a/app/code/core/Mage/Contacts/etc/system.xml +++ b/app/code/core/Mage/Contacts/etc/system.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Contacts * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php index 39f49084c8e..bb1ba34fe1e 100644 --- a/app/code/core/Mage/Core/Block/Abstract.php +++ b/app/code/core/Mage/Core/Block/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,7 +74,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object protected $_parent; /** - * Short alias of this block that was refered from parent + * Short alias of this block that was referred from parent * * @var string */ @@ -191,8 +191,6 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object /** * Initialize factory instance - * - * @param array $args */ public function __construct(array $args = []) { @@ -268,7 +266,6 @@ public function getParentBlock() /** * Set parent block * - * @param Mage_Core_Block_Abstract $block * @return $this */ public function setParentBlock(Mage_Core_Block_Abstract $block) @@ -290,7 +287,6 @@ public function getAction() /** * Set layout object * - * @param Mage_Core_Model_Layout $layout * @return $this */ public function setLayout(Mage_Core_Model_Layout $layout) @@ -801,7 +797,6 @@ public function append($block, $alias = '') * Make sure specified block will be registered in the specified child groups * * @param string $groupName - * @param Mage_Core_Block_Abstract $child */ public function addToChildGroup($groupName, Mage_Core_Block_Abstract $child) { @@ -1056,7 +1051,6 @@ public function getUrlEncoded($route = '', $params = []) * Retrieve url of skins file * * @param string $file path to file in skin - * @param array $params * @return string */ public function getSkinUrl($file = null, array $params = []) @@ -1080,7 +1074,6 @@ public function getMessagesBlock() /** * Set messages block * - * @param Mage_Core_Block_Messages $block * @return $this */ public function setMessagesBlock(Mage_Core_Block_Messages $block) @@ -1202,9 +1195,7 @@ public function escapeHtml($data, $allowedTags = null) /** * Wrapper for escapeHtml() function with keeping original value * - * @param string $data * @param string[]|null $allowedTags - * @return Mage_Core_Model_Security_HtmlEscapedString * * @see Mage_Core_Model_Security_HtmlEscapedString::getUnescapedValue() */ @@ -1423,7 +1414,6 @@ public function addCacheTag($tag) /** * Add tags from specified model to current block * - * @param Mage_Core_Model_Abstract $model * @return $this */ public function addModelTags(Mage_Core_Model_Abstract $model) diff --git a/app/code/core/Mage/Core/Block/Html/Calendar.php b/app/code/core/Mage/Core/Block/Html/Calendar.php index cff47742e81..dbcdb665a89 100644 --- a/app/code/core/Mage/Core/Block/Html/Calendar.php +++ b/app/code/core/Mage/Core/Block/Html/Calendar.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Messages.php b/app/code/core/Mage/Core/Block/Messages.php index ee481199533..ceffd5446dc 100644 --- a/app/code/core/Mage/Core/Block/Messages.php +++ b/app/code/core/Mage/Core/Block/Messages.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -86,7 +86,6 @@ public function setEscapeMessageFlag($flag) /** * Set messages collection * - * @param Mage_Core_Model_Message_Collection $messages * @return Mage_Core_Block_Messages */ public function setMessages(Mage_Core_Model_Message_Collection $messages) @@ -98,7 +97,6 @@ public function setMessages(Mage_Core_Model_Message_Collection $messages) /** * Add messages to display * - * @param Mage_Core_Model_Message_Collection $messages * @return $this */ public function addMessages(Mage_Core_Model_Message_Collection $messages) @@ -125,7 +123,6 @@ public function getMessageCollection() /** * Adding new message to message collection * - * @param Mage_Core_Model_Message_Abstract $message * @return Mage_Core_Block_Messages */ public function addMessage(Mage_Core_Model_Message_Abstract $message) diff --git a/app/code/core/Mage/Core/Block/Template.php b/app/code/core/Mage/Core/Block/Template.php index 41bb5803d2e..ff6d24aed6a 100644 --- a/app/code/core/Mage/Core/Block/Template.php +++ b/app/code/core/Mage/Core/Block/Template.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2015-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2015-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -208,8 +208,6 @@ public function getShowTemplateHints() /** * Retrieve block cache status - * - * @return string */ private function _getCacheHintStatusColor(): string { @@ -356,7 +354,6 @@ public function getJsUrl($fileName = '') /** * Get data from specified object * - * @param Varien_Object $object * @param string $key * @return mixed */ diff --git a/app/code/core/Mage/Core/Block/Template/Facade.php b/app/code/core/Mage/Core/Block/Template/Facade.php index 6437feb2013..1f91615c877 100644 --- a/app/code/core/Mage/Core/Block/Template/Facade.php +++ b/app/code/core/Mage/Core/Block/Template/Facade.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Front/Router.php b/app/code/core/Mage/Core/Controller/Front/Router.php index c53287553e6..09d161af157 100644 --- a/app/code/core/Mage/Core/Controller/Front/Router.php +++ b/app/code/core/Mage/Core/Controller/Front/Router.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ public function getConfig() } /** - * @param Zend_Controller_Router_Interface $router * @return $this */ public function addRoutes(Zend_Controller_Router_Interface $router) diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php index f2e7ef81ada..d0446f5e66a 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Action.php +++ b/app/code/core/Mage/Core/Controller/Varien/Action.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -115,11 +115,6 @@ abstract class Mage_Core_Controller_Varien_Action */ protected $_removeDefaultTitle = false; - /** - * @param Zend_Controller_Request_Abstract $request - * @param Zend_Controller_Response_Abstract $response - * @param array $invokeArgs - */ public function __construct(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response, array $invokeArgs = []) { $this->_request = $request; @@ -611,7 +606,6 @@ public function noCookiesAction() * @param string $action * @param string|null $controller * @param string|null $module - * @param array|null $params */ protected function _forward($action, $controller = null, $module = null, ?array $params = null) { @@ -703,7 +697,6 @@ protected function _redirect($path, $arguments = []) * It allows to distinguish primordial request from browser with cookies disabled. * * @param string $path - * @param array $arguments * @return $this */ public function setRedirectWithCookieCheck($path, array $arguments = []) diff --git a/app/code/core/Mage/Core/Controller/Varien/Exception.php b/app/code/core/Mage/Core/Controller/Varien/Exception.php index cdb9b41c1c2..531fbf5a82b 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Exception.php +++ b/app/code/core/Mage/Core/Controller/Varien/Exception.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,7 +35,6 @@ class Mage_Core_Controller_Varien_Exception extends Exception * @param string $actionName * @param string $controllerName * @param string $moduleName - * @param array $params * @return $this */ public function prepareForward($actionName = null, $controllerName = null, $moduleName = null, array $params = []) diff --git a/app/code/core/Mage/Core/Controller/Varien/Front.php b/app/code/core/Mage/Core/Controller/Varien/Front.php index 9d79f64aa72..f42f97363ac 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Front.php +++ b/app/code/core/Mage/Core/Controller/Varien/Front.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -89,7 +89,6 @@ public function getResponse() * Adding new router * * @param string $name - * @param Mage_Core_Controller_Varien_Router_Abstract $router * @return Mage_Core_Controller_Varien_Front */ public function addRouter($name, Mage_Core_Controller_Varien_Router_Abstract $router) diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php index 124a1fea7d3..a8652ddaaa4 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,7 +58,6 @@ public function getRouteByFrontName($frontName) } /** - * @param Zend_Controller_Request_Http $request * @return bool */ abstract public function match(Zend_Controller_Request_Http $request); diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php index 94e359d65a4..742e6746de1 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Core_Controller_Varien_Router_Default extends Mage_Core_Controller_Va * If store is admin and specified different admin front name, * change store to default (Possible when enabled Store Code in URL) * - * @param Zend_Controller_Request_Http $request * @return bool */ public function match(Zend_Controller_Request_Http $request) diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php index a1c9aece874..392b3d0a989 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -289,7 +289,7 @@ protected function _validateControllerInstance($controllerInstance) /** * Generating and validating class file name, - * class and if evrything ok do include if needed and return of class name + * class and if everything ok do include if needed and return of class name * * @param string $realModule * @param string $controller @@ -448,7 +448,6 @@ public function getControllerClassName($realModule, $controller) } /** - * @param array $p * @return array */ public function rewrite(array $p) diff --git a/app/code/core/Mage/Core/Exception.php b/app/code/core/Mage/Core/Exception.php index 0f64e4e4d0b..c9f7f9a2b88 100644 --- a/app/code/core/Mage/Core/Exception.php +++ b/app/code/core/Mage/Core/Exception.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +26,6 @@ class Mage_Core_Exception extends Exception protected $_messages = []; /** - * @param Mage_Core_Model_Message_Abstract $message * @return $this */ public function addMessage(Mage_Core_Model_Message_Abstract $message) diff --git a/app/code/core/Mage/Core/Helper/Abstract.php b/app/code/core/Mage/Core/Helper/Abstract.php index 81a2d5832bd..3f5459db500 100644 --- a/app/code/core/Mage/Core/Helper/Abstract.php +++ b/app/code/core/Mage/Core/Helper/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/Array.php b/app/code/core/Mage/Core/Helper/Array.php index c7dd739e5c9..731a47df0f5 100644 --- a/app/code/core/Mage/Core/Helper/Array.php +++ b/app/code/core/Mage/Core/Helper/Array.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,8 +26,6 @@ class Mage_Core_Helper_Array extends Mage_Core_Helper_Abstract * PHP function array_merge_recursive merge array * with overwrite num keys * - * @param array $baseArray - * @param array $mergeArray * @return array */ public function mergeRecursiveWithoutOverwriteNumKeys(array $baseArray, array $mergeArray) diff --git a/app/code/core/Mage/Core/Helper/Cookie.php b/app/code/core/Mage/Core/Helper/Cookie.php index 81422d33e89..898f8275d31 100644 --- a/app/code/core/Mage/Core/Helper/Cookie.php +++ b/app/code/core/Mage/Core/Helper/Cookie.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,7 +67,6 @@ class Mage_Core_Helper_Cookie extends Mage_Core_Helper_Abstract /** * Initializes store, cookie and website objects. * - * @param array $data * @throws InvalidArgumentException */ public function __construct(array $data = []) diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php index a56890db38c..4c1c428fb8a 100644 --- a/app/code/core/Mage/Core/Helper/Data.php +++ b/app/code/core/Mage/Core/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,7 +39,7 @@ class Mage_Core_Helper_Data extends Mage_Core_Helper_Abstract public const CHARS_PASSWORD_SPECIALS = '!$*-.=?@_'; /** - * Config pathes to merchant country code and merchant VAT number + * Config paths to merchant country code and merchant VAT number */ public const XML_PATH_MERCHANT_COUNTRY_CODE = 'general/store_information/merchant_country'; public const XML_PATH_MERCHANT_VAT_NUMBER = 'general/store_information/merchant_vat_number'; @@ -303,7 +303,6 @@ public function validateHash($password, $hash) /** * Get encryption method depending on the presence of the function - password_hash. * - * @param Mage_Core_Model_Encryption $encryptionModel * @return int */ public function getVersionHash(Mage_Core_Model_Encryption $encryptionModel) @@ -587,7 +586,6 @@ private function _decorateArrayObject($element, $key, $value, $dontSkip) * Transform an assoc array to SimpleXMLElement object * Array has some limitations. Appropriate exceptions will be thrown * - * @param array $array * @param string $rootName * @return SimpleXMLElement * @throws Exception @@ -614,9 +612,7 @@ public function assocToXml(array $array, $rootName = '_') /** * Function, that actually recursively transforms array to xml * - * @param array $array * @param string $rootName - * @param SimpleXMLElement $xml * @return SimpleXMLElement * @throws Exception */ @@ -650,7 +646,6 @@ private function _assocToXml(array $array, $rootName, SimpleXMLElement &$xml) * Transform SimpleXMLElement to associative array * SimpleXMLElement must be conform structure, generated by assocToXml() * - * @param SimpleXMLElement $xml * @return array */ public function xmlToAssoc(SimpleXMLElement $xml) @@ -752,13 +747,11 @@ public function uniqHash($prefix = '') * May filter files by specified extension(s) * Returns false on error * - * @param array $srcFiles * @param string|false $targetFile - file path to be written * @param bool $mustMerge * @param callable $beforeMergeCallback * @param array|string $extensionsFilter * @return bool|string - * * @SuppressWarnings(PHPMD.ErrorControlOperator) */ public function mergeFiles( @@ -960,10 +953,9 @@ public function getExactDivision($dividend, $divisor) /** * Escaping CSV-data * - * Security enchancement for CSV data processing by Excel-like applications. + * Security enhancement for CSV data processing by Excel-like applications. * @see https://bugzilla.mozilla.org/show_bug.cgi?id=1054702 * - * @param array $data * @return array */ public function getEscapedCSVData(array $data) @@ -1004,7 +996,6 @@ public function unEscapeCSVData($data) /** * Returns true if the rate limit of the current client is exceeded * @param bool $setErrorMessage Adds a predefined error message to the 'core/session' object - * @param bool $recordRateLimitHit * @return bool is rate limit exceeded */ public function isRateLimitExceeded(bool $setErrorMessage = true, bool $recordRateLimitHit = true): bool @@ -1030,7 +1021,6 @@ public function isRateLimitExceeded(bool $setErrorMessage = true, bool $recordRa /** * Save the client rate limit hit to the cache - * @return void */ public function recordRateLimitHit(): void { diff --git a/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php b/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php index 5899c40acb9..3d4a293098d 100644 --- a/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php +++ b/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php @@ -52,7 +52,6 @@ class Mage_Core_Helper_EnvironmentConfigLoader extends Mage_Core_Helper_Abstract * Override the store 'german' configuration: * @example OPENMAGE_CONFIG__STORES__GERMAN__GENERAL__STORE_INFORMATION__NAME=store_german * - * @param Varien_Simplexml_Config $xmlConfig * @return void */ public function overrideEnvironment(Varien_Simplexml_Config $xmlConfig) @@ -133,11 +132,6 @@ protected function isConfigKeyValid(string $configKey): bool /** * Build configuration path. - * - * @param string $section - * @param string $group - * @param string $field - * @return string */ protected function buildPath(string $section, string $group, string $field): string { @@ -146,10 +140,6 @@ protected function buildPath(string $section, string $group, string $field): str /** * Build configuration node path. - * - * @param string $scope - * @param string $path - * @return string */ protected function buildNodePath(string $scope, string $path): string { diff --git a/app/code/core/Mage/Core/Helper/Http.php b/app/code/core/Mage/Core/Helper/Http.php index 89e95379092..00d3a33701b 100644 --- a/app/code/core/Mage/Core/Helper/Http.php +++ b/app/code/core/Mage/Core/Helper/Http.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/Js.php b/app/code/core/Mage/Core/Helper/Js.php index 7bbca238395..e4222a102f1 100644 --- a/app/code/core/Mage/Core/Helper/Js.php +++ b/app/code/core/Mage/Core/Helper/Js.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2015-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2015-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,7 +34,7 @@ class Mage_Core_Helper_Js extends Mage_Core_Helper_Abstract protected $_moduleName = 'Mage_Core'; /** - * Array of senteces of JS translations + * Array of sentences of JS translations * * @var array */ @@ -185,9 +185,7 @@ protected function _getXmlConfig() /** * Helper for "onclick.deleteConfirm" * - * @param string $url * @param string|null $message null for default message, do not use jsQuoteEscape() before - * @return string * @uses Mage_Core_Helper_Abstract::jsQuoteEscape() */ public function getDeleteConfirmJs(string $url, ?string $message = null): string @@ -203,9 +201,7 @@ public function getDeleteConfirmJs(string $url, ?string $message = null): string /** * Helper for "onclick.confirmSetLocation" * - * @param string $url * @param string|null $message null for default message, do not use jsQuoteEscape() before - * @return string * @uses Mage_Core_Helper_Abstract::jsQuoteEscape() */ public function getConfirmSetLocationJs(string $url, ?string $message = null): string @@ -220,9 +216,6 @@ public function getConfirmSetLocationJs(string $url, ?string $message = null): s /** * Helper for "onclick.setLocation" - * - * @param string $url - * @return string */ public function getSetLocationJs(string $url): string { @@ -231,9 +224,6 @@ public function getSetLocationJs(string $url): string /** * Helper for "onclick.saveAndContinueEdit" - * - * @param string $url - * @return string */ public function getSaveAndContinueEditJs(string $url): string { diff --git a/app/code/core/Mage/Core/Helper/Purifier.php b/app/code/core/Mage/Core/Helper/Purifier.php index 3a7fe9bc937..eaa63aa2a32 100644 --- a/app/code/core/Mage/Core/Helper/Purifier.php +++ b/app/code/core/Mage/Core/Helper/Purifier.php @@ -20,14 +20,10 @@ class Mage_Core_Helper_Purifier extends Mage_Core_Helper_Abstract { public const CACHE_DEFINITION = 'Cache.DefinitionImpl'; - /** - * @var HTMLPurifier|null - */ protected ?HTMLPurifier $purifier; /** * Purifier Constructor Call - * @param HTMLPurifier|null $purifier */ public function __construct( ?HTMLPurifier $purifier = null diff --git a/app/code/core/Mage/Core/Helper/Security.php b/app/code/core/Mage/Core/Helper/Security.php index 65073036804..a67e4943b28 100644 --- a/app/code/core/Mage/Core/Helper/Security.php +++ b/app/code/core/Mage/Core/Helper/Security.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,10 +26,8 @@ class Mage_Core_Helper_Security ]; /** - * @param Mage_Core_Block_Abstract $block * @param string $method * @param string[] $args - * * @throws Mage_Core_Exception */ public function validateAgainstBlockMethodBlacklist(Mage_Core_Block_Abstract $block, $method, array $args) diff --git a/app/code/core/Mage/Core/Helper/String.php b/app/code/core/Mage/Core/Helper/String.php index 02ab17ead36..c9b80daaf55 100644 --- a/app/code/core/Mage/Core/Helper/String.php +++ b/app/code/core/Mage/Core/Helper/String.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -299,7 +299,6 @@ public function strpos($haystack, $needle, $offset = 0) /** * Sorts array with multibyte string keys * - * @param array $sort * @return array|false */ public function ksortMultibyte(array &$sort) @@ -375,8 +374,6 @@ protected function _explodeAndDecodeParam($str) /** * Append param to general result * - * @param array $result - * @param array $param * @return array */ protected function _appendParam(array $result, array $param) @@ -399,7 +396,6 @@ protected function _appendParam(array $result, array $param) /** * Handle param recursively * - * @param array $param * @return array */ protected function _handleRecursiveParamForQueryStr(array $param) diff --git a/app/code/core/Mage/Core/Helper/Translate.php b/app/code/core/Mage/Core/Helper/Translate.php index 57b0c1f8c42..4eb4dc42ad3 100644 --- a/app/code/core/Mage/Core/Helper/Translate.php +++ b/app/code/core/Mage/Core/Helper/Translate.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Abstract.php b/app/code/core/Mage/Core/Model/Abstract.php index a1f07d45332..1b7cdd85a11 100644 --- a/app/code/core/Mage/Core/Model/Abstract.php +++ b/app/code/core/Mage/Core/Model/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -345,7 +345,7 @@ public function afterLoad() /** * Check whether model has changed data. * Can be overloaded in child classes to perform advanced check whether model needs to be saved - * e.g. usign resouceModel->hasDataChanged() or any other technique + * e.g. using resourceModel->hasDataChanged() or any other technique * * @return bool */ diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php index 8149769fa65..e792aa58281 100644 --- a/app/code/core/Mage/Core/Model/App.php +++ b/app/code/core/Mage/Core/Model/App.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -406,7 +406,6 @@ protected function _initBaseConfig() /** * Initialize application cache instance * - * @param array $cacheInitOptions * @return $this */ protected function _initCache(array $cacheInitOptions = []) @@ -1288,7 +1287,6 @@ public function getRequest() /** * Request setter * - * @param Mage_Core_Controller_Request_Http $request * @return $this */ public function setRequest(Mage_Core_Controller_Request_Http $request) @@ -1346,7 +1344,6 @@ public function getResponse() /** * Response setter * - * @param Mage_Core_Controller_Response_Http $response * @return $this */ public function setResponse(Mage_Core_Controller_Response_Http $response) diff --git a/app/code/core/Mage/Core/Model/App/Emulation.php b/app/code/core/Mage/Core/Model/App/Emulation.php index e81244d4691..96b48149a77 100644 --- a/app/code/core/Mage/Core/Model/App/Emulation.php +++ b/app/code/core/Mage/Core/Model/App/Emulation.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,9 +35,6 @@ class Mage_Core_Model_App_Emulation extends Varien_Object */ protected $_app; - /** - * @param array $args - */ public function __construct(array $args = []) { $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory'); @@ -200,7 +197,6 @@ protected function _restoreInitialInlineTranslation($initialTranslateInline) /** * Restore design of the initial store * - * @param array $initialDesign * * @return $this */ diff --git a/app/code/core/Mage/Core/Model/Cache.php b/app/code/core/Mage/Core/Model/Cache.php index 9965019bf1e..4d9e618f4ab 100644 --- a/app/code/core/Mage/Core/Model/Cache.php +++ b/app/code/core/Mage/Core/Model/Cache.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -102,8 +102,6 @@ class Mage_Core_Model_Cache /** * Class constructor. Initialize cache instance based on options - * - * @param array $options */ public function __construct(array $options = []) { @@ -144,7 +142,6 @@ public function __construct(array $options = []) /** * Get cache backend options. Result array contain backend type ('type' key) and backend options ('options') * - * @param array $cacheOptions * @return array */ protected function _getBackendOptions(array $cacheOptions) @@ -232,7 +229,6 @@ protected function _getBackendOptions(array $cacheOptions) /** * Get options for database backend type * - * @param array $options * @return array */ protected function getDbAdapterOptions(array $options = []) @@ -298,7 +294,6 @@ protected function _getTwoLevelsBackendOptions($fastOptions, $cacheOptions) /** * Get options of cache frontend (options of Zend_Cache_Core) * - * @param array $cacheOptions * @return array */ protected function _getFrontendOptions(array $cacheOptions) diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php index 546aa7bbef4..80e4e82f0a3 100644 --- a/app/code/core/Mage/Core/Model/Config.php +++ b/app/code/core/Mage/Core/Model/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -108,7 +108,7 @@ class Mage_Core_Model_Config extends Mage_Core_Model_Config_Base * array( * $sectionName => $recursionLevel * ) - * Recursion level provide availability cache subnodes separatly + * Recursion level provide availability cache sub-nodes separately * * @var array */ @@ -425,8 +425,6 @@ public function loadDb() /** * Load environment variables and override config - * - * @return self */ public function loadEnv(): Mage_Core_Model_Config { @@ -455,7 +453,7 @@ public function reinit($options = []) /** * Check local modules enable/disable flag - * If local modules are disbled remove local modules path from include dirs + * If local modules are disabled remove local modules path from include dirs * * return true if local modules enabled and false if disabled * @@ -1698,6 +1696,18 @@ public function deleteConfig($path, $scope = 'default', $scopeId = 0) return $this; } + + /** + * Get config value from DB + * + * @return string|false + */ + public function getConfig(string $path, string $scope = 'default', int $scopeId = 0) + { + $resource = $this->getResourceModel(); + return $resource->getConfig(rtrim($path, '/'), $scope, $scopeId); + } + /** * Get fieldset from configuration * @@ -1781,7 +1791,6 @@ public function getResourceModelClassName($modelClass) * Makes all events to lower-case * * @param string $area - * @param Varien_Simplexml_Config $mergeModel */ protected function _makeEventsLowerCase($area, Varien_Simplexml_Config $mergeModel) { @@ -1807,7 +1816,6 @@ protected function _makeEventsLowerCase($area, Varien_Simplexml_Config $mergeMod /** * Checks is event name has upper-case letters * - * @param Mage_Core_Model_Config_Element $event * @return bool */ protected function _isNodeNameHasUpperCase(Mage_Core_Model_Config_Element $event) diff --git a/app/code/core/Mage/Core/Model/Config/Element.php b/app/code/core/Mage/Core/Model/Config/Element.php index 4555367266d..874746c32b1 100644 --- a/app/code/core/Mage/Core/Model/Config/Element.php +++ b/app/code/core/Mage/Core/Model/Config/Element.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Cookie.php b/app/code/core/Mage/Core/Model/Cookie.php index d9330737899..44595fdcb19 100644 --- a/app/code/core/Mage/Core/Model/Cookie.php +++ b/app/code/core/Mage/Core/Model/Cookie.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -165,8 +165,6 @@ public function getHttponly() /** * Retrieve use SameSite - * - * @return string */ public function getSameSite(): string { diff --git a/app/code/core/Mage/Core/Model/Date.php b/app/code/core/Mage/Core/Model/Date.php index 0e7dc8a5653..679881b9fa7 100644 --- a/app/code/core/Mage/Core/Model/Date.php +++ b/app/code/core/Mage/Core/Model/Date.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Design/Config.php b/app/code/core/Mage/Core/Model/Design/Config.php index 5685d921507..d81075760de 100644 --- a/app/code/core/Mage/Core/Model/Design/Config.php +++ b/app/code/core/Mage/Core/Model/Design/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,7 +25,6 @@ class Mage_Core_Model_Design_Config extends Varien_Simplexml_Config /** * Assemble themes inheritance config - * @param array $params * @throws Mage_Core_Exception */ public function __construct(array $params = []) diff --git a/app/code/core/Mage/Core/Model/Design/Fallback.php b/app/code/core/Mage/Core/Model/Design/Fallback.php index 146eb7eb983..bdb2bffbe4f 100644 --- a/app/code/core/Mage/Core/Model/Design/Fallback.php +++ b/app/code/core/Mage/Core/Model/Design/Fallback.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,9 +45,6 @@ class Mage_Core_Model_Design_Fallback */ protected $_visited; - /** - * @param array $params - */ public function __construct(array $params = []) { $this->_config = $params['config'] ?? Mage::getModel('core/design_config'); diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php index 6ae0356fea1..ffb56633bd5 100644 --- a/app/code/core/Mage/Core/Model/Design/Package.php +++ b/app/code/core/Mage/Core/Model/Design/Package.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -69,7 +69,7 @@ class Mage_Core_Model_Design_Package /** * Directory of the css file - * Using only to transmit additional parametr in callback functions + * Using only to transmit additional parameter in callback functions * @var string */ protected $_callbackFileDir; @@ -293,7 +293,6 @@ public function getDefaultTheme() } /** - * @param array $params * @return $this */ public function updateParamDefaults(array &$params) @@ -317,7 +316,6 @@ public function updateParamDefaults(array &$params) } /** - * @param array $params * @return string */ public function getBaseDir(array $params) @@ -328,7 +326,6 @@ public function getBaseDir(array $params) } /** - * @param array $params * @return string */ public function getSkinBaseDir(array $params = []) @@ -340,7 +337,6 @@ public function getSkinBaseDir(array $params = []) } /** - * @param array $params * @return string */ public function getLocaleBaseDir(array $params = []) @@ -353,7 +349,6 @@ public function getLocaleBaseDir(array $params = []) } /** - * @param array $params * @return string */ public function getSkinBaseUrl(array $params = []) @@ -375,7 +370,6 @@ public function getSkinBaseUrl(array $params = []) * * @see Mage_Core_Model_Config::getBaseDir * @param string $file - * @param array $params * @return string|false */ public function validateFile($file, array $params) @@ -392,7 +386,6 @@ public function validateFile($file, array $params) * Get filename by specified theme parameters * * @param array $file - * @param array $params * @return string */ protected function _renderFilename($file, array $params) @@ -421,8 +414,6 @@ protected function _renderFilename($file, array $params) * If disabled, the lookup won't be performed to spare filesystem calls. * * @param string $file - * @param array $params - * @param array $fallbackScheme * @return string */ protected function _fallback($file, array &$params, array $fallbackScheme = [[]]) @@ -447,7 +438,6 @@ protected function _fallback($file, array &$params, array $fallbackScheme = [[]] * $params['_type'] is required * * @param string $file - * @param array $params * @return string * @throws Exception */ @@ -477,7 +467,6 @@ public function getFilename($file, array $params) /** * @param string $file - * @param array $params * @return string */ public function getLayoutFilename($file, array $params = []) @@ -488,7 +477,6 @@ public function getLayoutFilename($file, array $params = []) /** * @param string $file - * @param array $params * @return string */ public function getTemplateFilename($file, array $params = []) @@ -499,7 +487,6 @@ public function getTemplateFilename($file, array $params = []) /** * @param string $file - * @param array $params * @return string */ public function getLocaleFileName($file, array $params = []) @@ -512,7 +499,6 @@ public function getLocaleFileName($file, array $params = []) * Get skin file url * * @param string|null $file - * @param array $params * @return string * @throws Exception */ @@ -754,7 +740,6 @@ public function getMergedCssUrl($files) * Merges files into one and saves it into DB (if DB file storage is on) * * @see Mage_Core_Helper_Data::mergeFiles() - * @param array $srcFiles * @param string|bool $targetFile - file path to be written * @param bool $mustMerge * @param callable $beforeMergeCallback diff --git a/app/code/core/Mage/Core/Model/Domainpolicy.php b/app/code/core/Mage/Core/Model/Domainpolicy.php index c0f7a9c393b..d0e0ca5aaf8 100644 --- a/app/code/core/Mage/Core/Model/Domainpolicy.php +++ b/app/code/core/Mage/Core/Model/Domainpolicy.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +59,6 @@ public function __construct($options = []) /** * Add X-Frame-Options header to response, depends on config settings * - * @param Varien_Event_Observer $observer * @return $this */ public function addDomainPolicyHeader(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Core/Model/Email/Queue.php b/app/code/core/Mage/Core/Model/Email/Queue.php index 0607026739a..358324aaa5c 100644 --- a/app/code/core/Mage/Core/Model/Email/Queue.php +++ b/app/code/core/Mage/Core/Model/Email/Queue.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -152,7 +152,6 @@ public function clearRecipients() /** * Set message recipients data * - * @param array $recipients * * @return $this */ diff --git a/app/code/core/Mage/Core/Model/Email/Template.php b/app/code/core/Mage/Core/Model/Email/Template.php index 623b9e2ab5a..add3ffea775 100644 --- a/app/code/core/Mage/Core/Model/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Email/Template.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -112,7 +112,6 @@ public function getMail() /** * Declare template processing filter * - * @param Varien_Filter_Template $filter * @return $this */ public function setTemplateFilter(Varien_Filter_Template $filter) @@ -284,7 +283,6 @@ public function getType() /** * Process email template code * - * @param array $variables * @return string */ public function getProcessedTemplate(array $variables = []) @@ -351,7 +349,6 @@ public function getPreparedTemplateText($html = null) * Get template code for include directive * * @param string $template - * @param array $variables * @return string */ public function getInclude($template, array $variables) @@ -538,7 +535,6 @@ public function sendTransactional($templateId, $sender, $email, $name, $vars = [ /** * Process email subject * - * @param array $variables * @return string */ public function getProcessedTemplateSubject(array $variables) diff --git a/app/code/core/Mage/Core/Model/Email/Template/Abstract.php b/app/code/core/Mage/Core/Model/Email/Template/Abstract.php index 4ced0c25206..932a000ac66 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Abstract.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,7 +39,6 @@ abstract class Mage_Core_Model_Email_Template_Abstract extends Mage_Core_Model_T * Get template code for template directive * * @param string $configPath - * @param array $variables * @return string */ public function getTemplateByConfigPath($configPath, array $variables) diff --git a/app/code/core/Mage/Core/Model/Email/Template/Filter.php b/app/code/core/Mage/Core/Model/Email/Template/Filter.php index 04cc6d382ef..88ac9ddea40 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Filter.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Filter.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -539,7 +539,7 @@ public function getInlineCssFile() /** * Filter the string as template. - * Rewrited for logging exceptions + * Rewritten for logging exceptions * * @param string $value * @return string diff --git a/app/code/core/Mage/Core/Model/Email/Template/Mailer.php b/app/code/core/Mage/Core/Model/Email/Template/Mailer.php index 2b97685a451..b80ae4378f8 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Mailer.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Mailer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,7 +35,6 @@ class Mage_Core_Model_Email_Template_Mailer extends Varien_Object /** * Add new email info to corresponding list * - * @param Mage_Core_Model_Email_Info $emailInfo * @return $this */ public function addEmailInfo(Mage_Core_Model_Email_Info $emailInfo) @@ -138,9 +137,8 @@ public function getTemplateId() } /** - * Set tempate parameters + * Set template parameters * - * @param array $templateParams * @return $this */ public function setTemplateParams(array $templateParams) diff --git a/app/code/core/Mage/Core/Model/Factory.php b/app/code/core/Mage/Core/Model/Factory.php index be322976353..090268e8d08 100644 --- a/app/code/core/Mage/Core/Model/Factory.php +++ b/app/code/core/Mage/Core/Model/Factory.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,8 +35,6 @@ class Mage_Core_Model_Factory /** * Initialize factory - * - * @param array $arguments */ public function __construct(array $arguments = []) { @@ -59,7 +57,6 @@ public function getModel($modelClass = '', $arguments = []) * Retrieve model object singleton * * @param string $modelClass - * @param array $arguments * @return Mage_Core_Model_Abstract */ public function getSingleton($modelClass = '', array $arguments = []) diff --git a/app/code/core/Mage/Core/Model/File/Storage.php b/app/code/core/Mage/Core/Model/File/Storage.php index b6c64feee6d..5f37479d54f 100644 --- a/app/code/core/Mage/Core/Model/File/Storage.php +++ b/app/code/core/Mage/Core/Model/File/Storage.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,7 +28,7 @@ class Mage_Core_Model_File_Storage extends Mage_Core_Model_Abstract public const STORAGE_MEDIA_DATABASE = 1; /** - * Config pathes for storing storage configuration + * Config paths for storing storage configuration */ public const XML_PATH_STORAGE_MEDIA = 'default/system/media_storage_configuration/media_storage'; public const XML_PATH_STORAGE_MEDIA_DATABASE = 'default/system/media_storage_configuration/media_database'; @@ -47,8 +47,6 @@ class Mage_Core_Model_File_Storage extends Mage_Core_Model_Abstract /** * Show if there were errors while synchronize process * - * @param Mage_Core_Model_Abstract $sourceModel - * @param Mage_Core_Model_Abstract $destinationModel * @return bool */ protected function _synchronizeHasErrors( diff --git a/app/code/core/Mage/Core/Model/File/Storage/Flag.php b/app/code/core/Mage/Core/Model/File/Storage/Flag.php index f7fdbb57862..46cf74db77a 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Flag.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Flag.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,7 +53,6 @@ class Mage_Core_Model_File_Storage_Flag extends Mage_Core_Model_Flag /** * Pass error to flag * - * @param Exception $e * @return $this */ public function passError(Exception $e) diff --git a/app/code/core/Mage/Core/Model/File/Uploader.php b/app/code/core/Mage/Core/Model/File/Uploader.php index ecbb8828d1d..4a32c9fa9ef 100644 --- a/app/code/core/Mage/Core/Model/File/Uploader.php +++ b/app/code/core/Mage/Core/Model/File/Uploader.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php index 4328e155984..c69be843bfb 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php +++ b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -114,7 +114,6 @@ public function setPaths(array $paths) /** * Set protected paths masks * - * @param array $paths * @return $this */ public function setProtectedPaths(array $paths) @@ -152,7 +151,6 @@ public function getProtectedPaths() /** * Set available paths masks * - * @param array $paths * @return $this */ public function setAvailablePaths(array $paths) diff --git a/app/code/core/Mage/Core/Model/File/Validator/Image.php b/app/code/core/Mage/Core/Model/File/Validator/Image.php index d7957a1ed0e..02ec2c1b400 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/Image.php +++ b/app/code/core/Mage/Core/Model/File/Validator/Image.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,7 +37,6 @@ class Mage_Core_Model_File_Validator_Image /** * Setter for allowed image types * - * @param array $imageFileExtensions * @return $this */ public function setAllowedImageTypes(array $imageFileExtensions = []) diff --git a/app/code/core/Mage/Core/Model/Input/Filter.php b/app/code/core/Mage/Core/Model/Input/Filter.php index 01b0d27f0be..73113cdd013 100644 --- a/app/code/core/Mage/Core/Model/Input/Filter.php +++ b/app/code/core/Mage/Core/Model/Input/Filter.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -151,7 +151,6 @@ public function prependFilter($filter) * 'key2' => $filters * ) * - * @param array $filters * @return $this */ public function addFilters(array $filters) @@ -163,7 +162,6 @@ public function addFilters(array $filters) /** * Set filters * - * @param array $filters * @return $this */ public function setFilters(array $filters) @@ -201,7 +199,6 @@ public function filter($data) /** * Recursive filtering * - * @param array $data * @param array|null $filters * @param bool $isFilterListSimple * @param-out array $filters @@ -243,8 +240,6 @@ protected function _filter(array $data, &$filters = null, $isFilterListSimple = * Call specified helper method for $value filtration * * @param mixed $value - * @param Mage_Core_Helper_Abstract $helper - * @param array $filterData * @return mixed */ protected function _applyFiltrationWithHelper($value, Mage_Core_Helper_Abstract $helper, array $filterData) diff --git a/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php b/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php index 7b5bb925e9a..39bf8f03732 100644 --- a/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php +++ b/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,15 +23,13 @@ class Mage_Core_Model_Input_Filter_MaliciousCode implements Zend_Filter_Interfac { /** * Regular expressions for cutting malicious code - * - * @var array */ protected array $_expressions = [ //comments, must be first '/(\/\*.*\*\/)/Us', //tabs '/(\t)/', - //javasript prefix + //javascript prefix '/(javascript\s*:)/Usi', //import styles '/(@import)/Usi', @@ -83,7 +81,6 @@ public function addExpression($expression) /** * Set expressions * - * @param array $expressions * @return $this */ public function setExpressions(array $expressions) diff --git a/app/code/core/Mage/Core/Model/Layout.php b/app/code/core/Mage/Core/Model/Layout.php index 0c645edf50c..232c1cfcabc 100644 --- a/app/code/core/Mage/Core/Model/Layout.php +++ b/app/code/core/Mage/Core/Model/Layout.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -352,10 +352,8 @@ protected function _generateAction($node, $parent) } /** - * @param Mage_Core_Block_Abstract $block * @param string $method * @param string[] $args - * * @throws Mage_Core_Exception */ protected function validateAgainstBlacklist(Mage_Core_Block_Abstract $block, $method, array $args) @@ -446,7 +444,6 @@ public function unsetBlock($name) * * @param string $type * @param string $name - * @param array $attributes * @return Mage_Core_Block_Abstract|false */ public function createBlock($type, $name = '', array $attributes = []) @@ -494,7 +491,6 @@ public function addBlock($block, $blockName) * Create block object instance based on block type * * @param string $block - * @param array $attributes * @return Mage_Core_Block_Abstract */ protected function _getBlockInstance($block, array $attributes = []) @@ -637,7 +633,6 @@ public function helper($name) * 2) "module" attribute in any ancestor element * 3) layout handle name - first 1 or 2 parts (namespace is determined automatically) * - * @param Varien_Simplexml_Element $node * @return string */ public static function findTranslationModuleName(Varien_Simplexml_Element $node) diff --git a/app/code/core/Mage/Core/Model/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php index 857932ca70b..eecf7bd2655 100644 --- a/app/code/core/Mage/Core/Model/Layout/Update.php +++ b/app/code/core/Mage/Core/Model/Layout/Update.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2015-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2015-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -405,7 +405,7 @@ public function fetchRecursiveUpdates($updateXml) } if ($allow) { $this->merge((string)$child['handle']); - // Adding merged layout handle to the list of applied hanles + // Adding merged layout handle to the list of applied handles $this->addHandle((string)$child['handle']); } } diff --git a/app/code/core/Mage/Core/Model/Layout/Validator.php b/app/code/core/Mage/Core/Model/Layout/Validator.php index 5a64b73ce7f..a7c644de0e9 100644 --- a/app/code/core/Mage/Core/Model/Layout/Validator.php +++ b/app/code/core/Mage/Core/Model/Layout/Validator.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -225,8 +225,6 @@ public function getXpathBlockValidationExpression() * If template path value has "../" * * @throws Exception - * - * @param array $templatePaths */ public function validateTemplatePath(array $templatePaths) { diff --git a/app/code/core/Mage/Core/Model/Locale.php b/app/code/core/Mage/Core/Model/Locale.php index 5ade3b84cc0..fa406119c67 100644 --- a/app/code/core/Mage/Core/Model/Locale.php +++ b/app/code/core/Mage/Core/Model/Locale.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -575,7 +575,8 @@ public function utcDate($store, $date, $includeTime = false, $format = null) /** * Get store timestamp - * Timstamp will be builded with store timezone settings + * + * Timestamp will be built with store timezone settings * * @param mixed $store * @return int @@ -760,8 +761,8 @@ public function revert() } /** - * Returns localized informations as array, supported are several - * types of informations. + * Returns localized information as array, supported are several + * types of information. * For detailed information about the types look into the documentation * * @param string $path (Optional) Type of information to return @@ -774,7 +775,7 @@ public function getTranslationList($path = null, $value = null) } /** - * Returns a localized information string, supported are several types of informations. + * Returns a localized information string, supported are several types of information. * For detailed information about the types look into the documentation * * @param string $value Name to get detailed information about diff --git a/app/code/core/Mage/Core/Model/Log/Adapter.php b/app/code/core/Mage/Core/Model/Log/Adapter.php index 1a173c94d99..1f7dea8e136 100644 --- a/app/code/core/Mage/Core/Model/Log/Adapter.php +++ b/app/code/core/Mage/Core/Model/Log/Adapter.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Logger.php b/app/code/core/Mage/Core/Model/Logger.php index 8bb30892d7f..34ef1ddd854 100644 --- a/app/code/core/Mage/Core/Model/Logger.php +++ b/app/code/core/Mage/Core/Model/Logger.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,8 +36,6 @@ public function log($message, $level = null, $file = '', $forceLog = false) /** * Log exception wrapper - * - * @param Exception $e */ public function logException(Exception $e) { diff --git a/app/code/core/Mage/Core/Model/Message/Collection.php b/app/code/core/Mage/Core/Model/Message/Collection.php index f0a3fc21f60..13a08b4ff90 100644 --- a/app/code/core/Mage/Core/Model/Message/Collection.php +++ b/app/code/core/Mage/Core/Model/Message/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,7 +32,6 @@ class Mage_Core_Model_Message_Collection /** * Adding new message to collection * - * @param Mage_Core_Model_Message_Abstract $message * @return Mage_Core_Model_Message_Collection */ public function add(Mage_Core_Model_Message_Abstract $message) @@ -43,7 +42,6 @@ public function add(Mage_Core_Model_Message_Abstract $message) /** * Adding new message to collection * - * @param Mage_Core_Model_Message_Abstract $message * @return Mage_Core_Model_Message_Collection */ public function addMessage(Mage_Core_Model_Message_Abstract $message) diff --git a/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php index bc45c21640d..c94b3fe1b9f 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php @@ -9,12 +9,12 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Custom variabel collection + * Custom variable collection * * @category Mage * @package Mage_Core diff --git a/app/code/core/Mage/Core/Model/Observer.php b/app/code/core/Mage/Core/Model/Observer.php index a73bde12d6b..ecb9103eb61 100644 --- a/app/code/core/Mage/Core/Model/Observer.php +++ b/app/code/core/Mage/Core/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Core_Model_Observer /** * Check if synchronize process is finished and generate notification message * - * @param Varien_Event_Observer $observer * @return $this */ public function addSynchronizeNotification(Varien_Event_Observer $observer) @@ -84,8 +83,6 @@ public function addSynchronizeNotification(Varien_Event_Observer $observer) /** * Cron job method to clean old cache resources - * - * @param Mage_Cron_Model_Schedule $schedule */ public function cleanCache(Mage_Cron_Model_Schedule $schedule) { @@ -96,7 +93,6 @@ public function cleanCache(Mage_Cron_Model_Schedule $schedule) /** * Cleans cache by tags * - * @param Varien_Event_Observer $observer * @return $this */ public function cleanCacheByTags(Varien_Event_Observer $observer) @@ -115,7 +111,6 @@ public function cleanCacheByTags(Varien_Event_Observer $observer) /** * Checks method availability for processing in variable * - * @param Varien_Event_Observer $observer * @throws Exception * @return Mage_Core_Model_Observer */ diff --git a/app/code/core/Mage/Core/Model/Resource/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Abstract.php index e67f670e7fa..49a31cd7252 100644 --- a/app/code/core/Mage/Core/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -144,7 +144,6 @@ public function mktime($str) /** * Serialize specified field in an object * - * @param Varien_Object $object * @param string $field * @param mixed $defaultValue * @param bool $unsetEmpty @@ -172,7 +171,6 @@ protected function _serializeField(Varien_Object $object, $field, $defaultValue /** * Unserialize Varien_Object field in an object * - * @param Varien_Object $object * @param string $field * @param mixed $defaultValue */ @@ -189,7 +187,6 @@ protected function _unserializeField(Varien_Object $object, $field, $defaultValu /** * Prepare data for passed table * - * @param Varien_Object $object * @param string $table * @return array */ diff --git a/app/code/core/Mage/Core/Model/Resource/Config.php b/app/code/core/Mage/Core/Model/Resource/Config.php index ca52a577e9e..c6b14f133dc 100644 --- a/app/code/core/Mage/Core/Model/Resource/Config.php +++ b/app/code/core/Mage/Core/Model/Resource/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Load configuration values into xml config object * - * @param Mage_Core_Model_Config $xmlConfig * @param string $condition * @return $this */ @@ -207,4 +206,21 @@ public function deleteConfig($path, $scope, $scopeId) ]); return $this; } + + /** + * Get config value + * + * @return string|false + */ + public function getConfig(string $path, string $scope, int $scopeId) + { + $readAdapter = $this->_getReadAdapter(); + $select = $readAdapter->select() + ->from($this->getMainTable(), 'value') + ->where('path = ?', $path) + ->where('scope = ?', $scope) + ->where('scope_id = ?', $scopeId); + + return $readAdapter->fetchOne($select); + } } diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php index d4e11fd58f4..fffcc4e733d 100644 --- a/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -361,7 +361,6 @@ public function getReadConnection() /** * Load an object * - * @param Mage_Core_Model_Abstract $object * @param mixed $value * @param string $field field to load by (defaults to model id) * @return $this @@ -415,7 +414,6 @@ protected function _getLoadSelect($field, $value, $object) /** * Save object object data * - * @param Mage_Core_Model_Abstract $object * @return $this */ public function save(Mage_Core_Model_Abstract $object) @@ -475,7 +473,6 @@ public function save(Mage_Core_Model_Abstract $object) * forced update If duplicate unique key data * * @deprecated - * @param Mage_Core_Model_Abstract $object * @return $this */ public function forsedSave(Mage_Core_Model_Abstract $object) @@ -501,7 +498,6 @@ public function forsedSave(Mage_Core_Model_Abstract $object) /** * Delete the object * - * @param Mage_Core_Model_Abstract $object * @return $this * @throws Exception */ @@ -546,8 +542,6 @@ public function resetUniqueField() /** * Un-serialize serializable object fields - * - * @param Mage_Core_Model_Abstract $object */ public function unserializeFields(Mage_Core_Model_Abstract $object) { @@ -584,7 +578,6 @@ public function getUniqueFields() /** * Prepare data for save * - * @param Mage_Core_Model_Abstract $object * @return array */ protected function _prepareDataForSave(Mage_Core_Model_Abstract $object) @@ -630,7 +623,6 @@ protected function _prepareValueForSave($value, $type) /** * Check for unique values existence * - * @param Mage_Core_Model_Abstract $object * @return $this * @throws Mage_Core_Exception */ @@ -687,8 +679,6 @@ protected function _checkUnique(Mage_Core_Model_Abstract $object) /** * After load - * - * @param Mage_Core_Model_Abstract $object */ public function afterLoad(Mage_Core_Model_Abstract $object) { @@ -698,7 +688,6 @@ public function afterLoad(Mage_Core_Model_Abstract $object) /** * Perform actions after object load * - * @param Mage_Core_Model_Abstract $object * @return $this */ protected function _afterLoad(Mage_Core_Model_Abstract $object) @@ -709,7 +698,6 @@ protected function _afterLoad(Mage_Core_Model_Abstract $object) /** * Perform actions before object save * - * @param Mage_Core_Model_Abstract $object * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $object) @@ -720,7 +708,6 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) /** * Perform actions after object save * - * @param Mage_Core_Model_Abstract $object * @return $this */ protected function _afterSave(Mage_Core_Model_Abstract $object) @@ -731,7 +718,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) /** * Perform actions before object delete * - * @param Mage_Core_Model_Abstract $object * @return $this */ protected function _beforeDelete(Mage_Core_Model_Abstract $object) @@ -742,7 +728,6 @@ protected function _beforeDelete(Mage_Core_Model_Abstract $object) /** * Perform actions after object delete * - * @param Mage_Core_Model_Abstract $object * @return $this */ protected function _afterDelete(Mage_Core_Model_Abstract $object) @@ -752,8 +737,6 @@ protected function _afterDelete(Mage_Core_Model_Abstract $object) /** * Serialize serializable fields of the object - * - * @param Mage_Core_Model_Abstract $object */ protected function _serializeFields(Mage_Core_Model_Abstract $object) { diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php index 75df6120ac7..e0f6e0b147d 100644 --- a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -514,7 +514,6 @@ public function getData() /** * Prepare select for load * - * @param Varien_Db_Select $select * @return string * @throws Zend_Db_Select_Exception */ diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Queue.php b/app/code/core/Mage/Core/Model/Resource/Email/Queue.php index d5d10a724a5..8732876bafe 100644 --- a/app/code/core/Mage/Core/Model/Resource/Email/Queue.php +++ b/app/code/core/Mage/Core/Model/Resource/Email/Queue.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -61,7 +61,6 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) /** * Check if email was added to queue for requested recipients * - * @param Mage_Core_Model_Email_Queue $queue * * @return bool */ @@ -140,10 +139,8 @@ public function getRecipients($messageId) * Save message recipients * * @param int $messageId - * @param array $recipients * * @throws Exception - * * @return $this */ public function saveRecipients($messageId, array $recipients) diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Template.php b/app/code/core/Mage/Core/Model/Resource/Email/Template.php index 1b54abc180c..f7eced690bd 100644 --- a/app/code/core/Mage/Core/Model/Resource/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Resource/Email/Template.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +48,6 @@ public function loadByCode($templateCode) /** * Check usage of template code in other templates * - * @param Mage_Core_Model_Email_Template $template * @return bool */ public function checkCodeUsage(Mage_Core_Model_Email_Template $template) @@ -93,7 +92,7 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) } /** - * Retrieve config scope and scope id of specified email template by email pathes + * Retrieve config scope and scope id of specified email template by email paths * * @param array $paths * @param int|string $templateId diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php index fab84206f61..84aa6308dff 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -121,7 +121,6 @@ protected function _decodeAllFilesContent($rows) /** * Load entity by filename * - * @param Mage_Core_Model_File_Storage_Database $object * @param string $filename * @param string $path * @return $this diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php index 11f5a291113..ee26b96733d 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -90,7 +90,6 @@ public function createDatabaseScheme() /** * Load entity by path * - * @param Mage_Core_Model_File_Storage_Directory_Database $object * @param string $path * @return $this */ diff --git a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php index b8fe6fa7eed..d092fe5499b 100644 --- a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Core_Model_Resource_Helper_Mysql4 extends Mage_Core_Model_Resource_Helper_Abstract { /** - * Returns expresion for field unification + * Returns expression for field unification * * @param string $field * @return string @@ -47,7 +47,6 @@ public function prepareColumn($column, $groupAliasName = null, $orderBy = null) /** * Returns select query with analytic functions * - * @param Varien_Db_Select $select * @return string */ public function getQueryUsingAnalyticFunction(Varien_Db_Select $select) @@ -59,7 +58,6 @@ public function getQueryUsingAnalyticFunction(Varien_Db_Select $select) * * Returns Insert From Select On Duplicate query with analytic functions * - * @param Varien_Db_Select $select * @param string $table * @param array $fields * @return string @@ -84,7 +82,6 @@ public function limitUnion($select) /** * Returns array of quoted orders with direction * - * @param Varien_Db_Select $select * @param bool $autoReset * @return array */ @@ -144,7 +141,6 @@ protected function _truncateAliasName($field, $reverse = false) /** * Returns quoted group by fields * - * @param Varien_Db_Select $select * @param bool $autoReset * @return array */ @@ -170,7 +166,6 @@ protected function _prepareGroup(Varien_Db_Select $select, $autoReset = false) /** * Prepare and returns having array * - * @param Varien_Db_Select $select * @param bool $autoReset * @return array * @throws Zend_Db_Exception @@ -241,7 +236,6 @@ protected function _assembleLimit($query, $limitCount, $limitOffset, $columnList /** * Prepare select column list * - * @param Varien_Db_Select $select * @param string $groupByCondition * @return array * @throws Zend_Db_Exception diff --git a/app/code/core/Mage/Core/Model/Resource/Iterator.php b/app/code/core/Mage/Core/Model/Resource/Iterator.php index e296aa98e75..4f959045ce5 100644 --- a/app/code/core/Mage/Core/Model/Resource/Iterator.php +++ b/app/code/core/Mage/Core/Model/Resource/Iterator.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +26,6 @@ class Mage_Core_Model_Resource_Iterator extends Varien_Object * * @param Zend_Db_Statement_Interface|Zend_Db_Select|string $query * @param array|string $callbacks - * @param array $args * @param Varien_Db_Adapter_Interface $adapter * @return $this */ diff --git a/app/code/core/Mage/Core/Model/Resource/Session.php b/app/code/core/Mage/Core/Model/Resource/Session.php index 56d246f80f4..955be87dd10 100644 --- a/app/code/core/Mage/Core/Model/Resource/Session.php +++ b/app/code/core/Mage/Core/Model/Resource/Session.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php index d4083b907dd..013c0d50fdf 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -844,13 +844,11 @@ public function tableExists($table) } /******************* CONFIG *****************/ - /** * Undefined * * @param string $path * @param string $label - * @param array $data * @param string $default * @return $this * @deprecated since 1.4.0.1 @@ -977,7 +975,7 @@ public function getCallAfterApplyAllUpdates() /** * Run each time after applying of all updates, - * if setup model setted $_callAfterApplyAllUpdates flag to true + * if setup model set $_callAfterApplyAllUpdates flag to true * * @return $this */ diff --git a/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php b/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php index db943e5fb58..1a2e265a4c3 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,7 +85,7 @@ protected function _getColumnDefinitionFromSql($sql, $column) } /** - * Replaces first occurence of $needle in a $haystack + * Replaces first occurrence of $needle in a $haystack * * @param string $haystack * @param string $needle @@ -104,7 +104,7 @@ protected function _firstReplace($haystack, $needle, $replacement, $caseInsensit } /** - * Fixes column definition in CREATE TABLE sql to match defintion of column it's set to + * Fixes column definition in CREATE TABLE sql to match definition of column it's set to * * @param string $sql * @param string $column @@ -136,7 +136,7 @@ protected function _fixColumnDefinitionInSql(&$sql, $column, $refColumnDefinitio return $this; } - // Find pattern for type defintion + // Find pattern for type definition $pattern = '/\s*([^\s]+)\s+(' . $columnDefinition['type'] . '[^\s]*)\s+([^,]+)/i'; if (!preg_match($pattern, $restSql, $matches)) { return $this; @@ -282,7 +282,7 @@ public function processQuery(&$sql, &$bind) $refTable = $this->_prepareIdentifier($match[2]); $refColumn = $this->_prepareIdentifier($match[3]); - // Check tables existance + // Check tables existence if (($operation != 'create') && !($this->_tableExists($table))) { continue; } diff --git a/app/code/core/Mage/Core/Model/Resource/Store.php b/app/code/core/Mage/Core/Model/Resource/Store.php index 101c8ab751a..6bd7750330c 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store.php +++ b/app/code/core/Mage/Core/Model/Resource/Store.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -121,7 +121,6 @@ protected function _updateGroupDefaultStore($groupId, $storeId) /** * Change store group for store * - * @param Mage_Core_Model_Abstract|Mage_Core_Model_Store_Group $model * @return $this */ protected function _changeGroup(Mage_Core_Model_Abstract $model) diff --git a/app/code/core/Mage/Core/Model/Resource/Store/Collection.php b/app/code/core/Mage/Core/Model/Resource/Store/Collection.php index 55e699a6569..25f796d84fe 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Store/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -160,7 +160,6 @@ public function load($printQuery = false, $logQuery = false) /** * Add root category id filter to store collection * - * @param array $categories * @return $this */ public function loadByCategoryIds(array $categories) diff --git a/app/code/core/Mage/Core/Model/Resource/Store/Group.php b/app/code/core/Mage/Core/Model/Resource/Store/Group.php index 39cd96519f5..baa66f28e93 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Resource/Store/Group.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -66,7 +66,6 @@ protected function _updateWebsiteDefaultGroup($websiteId, $groupId) /** * Change store group website * - * @param Mage_Core_Model_Abstract|Mage_Core_Model_Store_Group $model * @return $this */ protected function _changeWebsite(Mage_Core_Model_Abstract $model) diff --git a/app/code/core/Mage/Core/Model/Resource/Transaction.php b/app/code/core/Mage/Core/Model/Resource/Transaction.php index b062f987ffc..554a8542964 100644 --- a/app/code/core/Mage/Core/Model/Resource/Transaction.php +++ b/app/code/core/Mage/Core/Model/Resource/Transaction.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -18,7 +18,7 @@ * * @category Mage * @package Mage_Core - * @todo need collect conection by name + * @todo need collect connection by name */ class Mage_Core_Model_Resource_Transaction { @@ -97,7 +97,6 @@ protected function _runCallbacks() /** * Adding object for using in transaction * - * @param Mage_Core_Model_Abstract $object * @param string $alias * @return $this */ diff --git a/app/code/core/Mage/Core/Model/Resource/Translate.php b/app/code/core/Mage/Core/Model/Resource/Translate.php index af9e335d0a7..6e2e4f56436 100644 --- a/app/code/core/Mage/Core/Model/Resource/Translate.php +++ b/app/code/core/Mage/Core/Model/Resource/Translate.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -65,7 +65,6 @@ public function getTranslationArray($storeId = null, $locale = null) /** * Retrieve translations array by strings * - * @param array $strings * @param int $storeId * @return array */ diff --git a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php index 7d23ace7ec2..a8e7562019e 100644 --- a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -108,7 +108,6 @@ public function getRequestPathByIdPath($idPath, $store) * Load rewrite information for request * If $path is array - we must load all possible records and choose one matching earlier record in array * - * @param Mage_Core_Model_Url_Rewrite $object * @param array|string $path * @return Mage_Core_Model_Resource_Url_Rewrite */ diff --git a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php index ae359a25a01..36e0b259ab4 100644 --- a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Variable.php b/app/code/core/Mage/Core/Model/Resource/Variable.php index 71faa4aa36a..6b1b03ceb74 100644 --- a/app/code/core/Mage/Core/Model/Resource/Variable.php +++ b/app/code/core/Mage/Core/Model/Resource/Variable.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Load variable by code * - * @param Mage_Core_Model_Variable $object * @param string $code * @return $this */ @@ -109,7 +108,6 @@ protected function _getLoadSelect($field, $value, $object) /** * Add variable store and default value to select * - * @param Zend_Db_Select $select * @param int $storeId * @return $this */ diff --git a/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php b/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php index b960b37e470..ac618752bb3 100644 --- a/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php @@ -9,12 +9,12 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Custom variabel collection + * Custom variable collection * * @category Mage * @package Mage_Core diff --git a/app/code/core/Mage/Core/Model/Security/HtmlEscapedString.php b/app/code/core/Mage/Core/Model/Security/HtmlEscapedString.php index afda0b6e9a0..00a9d39f3a1 100644 --- a/app/code/core/Mage/Core/Model/Security/HtmlEscapedString.php +++ b/app/code/core/Mage/Core/Model/Security/HtmlEscapedString.php @@ -23,9 +23,6 @@ */ class Mage_Core_Model_Security_HtmlEscapedString implements Stringable { - /** - * @var string - */ protected string $originalValue; /** @@ -34,7 +31,6 @@ class Mage_Core_Model_Security_HtmlEscapedString implements Stringable protected ?array $allowedTags; /** - * @param string $originalValue * @param string[]|null $allowedTags */ public function __construct(string $originalValue, ?array $allowedTags = null) @@ -45,8 +41,6 @@ public function __construct(string $originalValue, ?array $allowedTags = null) /** * Get escaped html entities - * - * @return string */ public function __toString(): string { @@ -58,8 +52,6 @@ public function __toString(): string /** * Get un-escaped html entities - * - * @return string */ public function getUnescapedValue(): string { diff --git a/app/code/core/Mage/Core/Model/Session/Abstract.php b/app/code/core/Mage/Core/Model/Session/Abstract.php index 1e30dc2ddc0..efbf672fd39 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -217,7 +217,6 @@ public function getMessages($clear = false) /** * Not Mage exception handling * - * @param Exception $exception * @param string $alternativeText * @return $this */ @@ -231,7 +230,6 @@ public function addException(Exception $exception, $alternativeText) /** * Adding new message to message collection * - * @param Mage_Core_Model_Message_Abstract $message * @return $this */ public function addMessage(Mage_Core_Model_Message_Abstract $message) diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php index 0c6b7b3e2c3..47e40c60ee2 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -231,7 +231,6 @@ public function getSessionHosts() /** * Set session hosts * - * @param array $hosts * @return $this */ public function setSessionHosts(array $hosts) @@ -379,7 +378,7 @@ public function getSessionSaveMethod() } /** - * Get sesssion save path + * Get session save path * * @return string */ diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php index ce621b78d60..2fabbeac1b2 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -135,7 +135,7 @@ public function getData($var = null, $clear = false) } /** - * Cleare session data + * Clear session data * * @return $this */ diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php index 981e8d1fe66..eea91b7d2e0 100644 --- a/app/code/core/Mage/Core/Model/Store.php +++ b/app/code/core/Mage/Core/Model/Store.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,7 +50,7 @@ class Mage_Core_Model_Store extends Mage_Core_Model_Abstract public const ENTITY = 'core_store'; /** - * Configuration pathes + * Configuration paths * @var string */ public const XML_PATH_STORE_STORE_NAME = 'general/store_information/name'; @@ -439,8 +439,6 @@ public function setConfig($path, $value) /** * Set website model - * - * @param Mage_Core_Model_Website $website */ public function setWebsite(Mage_Core_Model_Website $website) { @@ -511,7 +509,7 @@ protected function _processConfigValue($fullPath, $path, $node) } /** - * Convert config values for url pathes + * Convert config values for url paths * * @deprecated after 1.4.2.0 * @param string $value diff --git a/app/code/core/Mage/Core/Model/Store/Group.php b/app/code/core/Mage/Core/Model/Store/Group.php index 796ca1bfb4a..c4dac455f24 100644 --- a/app/code/core/Mage/Core/Model/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Store/Group.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -268,8 +268,6 @@ public function getStoresByLocale($locale) /** * Set website model - * - * @param Mage_Core_Model_Website $website */ public function setWebsite(Mage_Core_Model_Website $website) { diff --git a/app/code/core/Mage/Core/Model/Template.php b/app/code/core/Mage/Core/Model/Template.php index 430a360bd63..3170ac1e725 100644 --- a/app/code/core/Mage/Core/Model/Template.php +++ b/app/code/core/Mage/Core/Model/Template.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,14 +33,14 @@ abstract class Mage_Core_Model_Template extends Mage_Core_Model_Abstract public const DEFAULT_DESIGN_AREA = 'frontend'; /** - * Configuration of desing package for template + * Configuration of design package for template * * @var Varien_Object|null */ protected $_designConfig; /** - * Configuration of emulated desing package. + * Configuration of emulated design package. * * @var Varien_Object|false */ @@ -108,7 +108,6 @@ protected function getDesignConfig() /** * Initialize design information for template processing * - * @param array $config * @return $this */ public function setDesignConfig(array $config) diff --git a/app/code/core/Mage/Core/Model/Translate.php b/app/code/core/Mage/Core/Model/Translate.php index fde16b11110..3ea3836aea8 100644 --- a/app/code/core/Mage/Core/Model/Translate.php +++ b/app/code/core/Mage/Core/Model/Translate.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -227,7 +227,7 @@ protected function _addData($data, $scope, $forceReload = false) $value = $value === null ? '' : $this->_prepareDataString($value); if ($scope && isset($this->_dataScope[$key]) && !$forceReload) { /** - * Checking previos value + * Checking previous value */ $scopeKey = $this->_dataScope[$key] . self::SCOPE_SEPARATOR . $key; if (!isset($this->_data[$scopeKey])) { diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php index c1c080239f7..5a603a1e8a8 100644 --- a/app/code/core/Mage/Core/Model/Translate/Inline.php +++ b/app/code/core/Mage/Core/Model/Translate/Inline.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Url.php b/app/code/core/Mage/Core/Model/Url.php index c3b01d16ffb..aa75dae645c 100644 --- a/app/code/core/Mage/Core/Model/Url.php +++ b/app/code/core/Mage/Core/Model/Url.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -278,7 +278,6 @@ public function getConfigData($key, $prefix = null) /** * Set request * - * @param Zend_Controller_Request_Http $request * @return $this */ public function setRequest(Zend_Controller_Request_Http $request) @@ -588,7 +587,7 @@ public function getControllerName() /** * Set Action name - * Reseted route path if action name has change + * Reset route path if action name has changed * * @param string $data * @return $this @@ -615,7 +614,6 @@ public function getActionName() /** * Set route params * - * @param array $data * @param bool $unsetOldParams * @return $this */ @@ -842,7 +840,6 @@ public function getQuery($escape = false) /** * Set query Params as array * - * @param array $data * @return $this */ public function setQueryParams(array $data) @@ -1048,7 +1045,6 @@ protected function _prepareSessionUrl($url) * Check and add session id to URL, session is obtained with parameters * * @param string $url - * @param array $params * * @return $this */ diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Url/Rewrite.php index 929f39be12c..ff4c7be2c92 100644 --- a/app/code/core/Mage/Core/Model/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Url/Rewrite.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -201,8 +201,6 @@ public function removeTag($tags) /** * Implement logic of custom rewrites * - * @param Zend_Controller_Request_Http|null $request - * @param Zend_Controller_Response_Http|null $response * @return bool * @throws Mage_Core_Model_Store_Exception * @deprecated since 1.7.0.2. Refactored and moved to Mage_Core_Controller_Request_Rewrite diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php index f6c14bf4b9a..b3e07478949 100644 --- a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php +++ b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -70,8 +70,6 @@ class Mage_Core_Model_Url_Rewrite_Request * config - Mage_Core_Model_Config * factory - Mage_Core_Model_Factory * routers - array - * - * @param array $args */ public function __construct(array $args) { diff --git a/app/code/core/Mage/Core/Model/Variable/Observer.php b/app/code/core/Mage/Core/Model/Variable/Observer.php index 71e31e90e7e..1e5fb4283af 100644 --- a/app/code/core/Mage/Core/Model/Variable/Observer.php +++ b/app/code/core/Mage/Core/Model/Variable/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Core_Model_Variable_Observer /** * Add variable wysiwyg plugin config * - * @param Varien_Event_Observer $observer * @return $this */ public function prepareWysiwygPluginConfig(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index 191ba8846e8..5e1149a72e5 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/functions.php b/app/code/core/Mage/Core/functions.php index 1e46c5d5814..aab056ed380 100644 --- a/app/code/core/Mage/Core/functions.php +++ b/app/code/core/Mage/Core/functions.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php index 0e3ae3d17e7..c3793ac174a 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php index 4f57a05f12c..0298ae4c618 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php index c96ad411d03..f35d86dcf93 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/Model/Schedule.php b/app/code/core/Mage/Cron/Model/Schedule.php index 36d2ae69867..d32aa0028fb 100644 --- a/app/code/core/Mage/Cron/Model/Schedule.php +++ b/app/code/core/Mage/Cron/Model/Schedule.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Cron * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,9 +54,6 @@ public function _construct() $this->_init('cron/schedule'); } - /** - * @return bool - */ public function getIsError(): bool { return !empty($this->getData('is_error')); diff --git a/app/code/core/Mage/CurrencySymbol/Model/Observer.php b/app/code/core/Mage/CurrencySymbol/Model/Observer.php index d20177dc27b..f93ca81af68 100644 --- a/app/code/core/Mage/CurrencySymbol/Model/Observer.php +++ b/app/code/core/Mage/CurrencySymbol/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_CurrencySymbol * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_CurrencySymbol_Model_Observer /** * Generate options for currency displaying with custom currency symbol * - * @param Varien_Event_Observer $observer * @return $this */ public function currencyDisplayOptions(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php index 08121796702..f397dc5ceed 100644 --- a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php +++ b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php @@ -34,7 +34,7 @@ public function indexAction() { // set active menu and breadcrumbs $this->loadLayout() - ->_setActiveMenu('system/currency') + ->_setActiveMenu('system/currency/symbols') ->_addBreadcrumb( Mage::helper('currencysymbol')->__('System'), Mage::helper('currencysymbol')->__('System') diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php index 30bfffb45d2..744ef76a4cb 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php index 768be5478eb..69a7de19e5d 100644 --- a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php +++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +41,6 @@ public function getType() /** * Retrieve format type object * - * @param Varien_Object $type * @return $this */ public function setType(Varien_Object $type) @@ -51,7 +50,6 @@ public function setType(Varien_Object $type) } /** - * @param Mage_Customer_Model_Address_Abstract|null $address * @return string */ public function getFormat(?Mage_Customer_Model_Address_Abstract $address = null) @@ -72,7 +70,6 @@ public function getFormat(?Mage_Customer_Model_Address_Abstract $address = null) /** * Render address * - * @param Mage_Customer_Model_Address_Abstract $address * @param string|null $format * @return string * @throws Exception diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php index be40dbdc611..a302c64b521 100644 --- a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php +++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ interface Mage_Customer_Block_Address_Renderer_Interface { /** * Set format type object - * - * @param Varien_Object $type */ public function setType(Varien_Object $type); @@ -38,7 +36,6 @@ public function getType(); /** * Render address * - * @param Mage_Customer_Model_Address_Abstract $address * @return mixed */ public function render(Mage_Customer_Model_Address_Abstract $address); diff --git a/app/code/core/Mage/Customer/Block/Form/Register.php b/app/code/core/Mage/Customer/Block/Form/Register.php index 1f6a991ae6b..c7957b0a50e 100644 --- a/app/code/core/Mage/Customer/Block/Form/Register.php +++ b/app/code/core/Mage/Customer/Block/Form/Register.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -156,7 +156,6 @@ public function getAddress() * Restore entity data from session * Entity and form code must be defined for the form * - * @param Mage_Customer_Model_Form $form * @param string|null $scope * @return $this */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Name.php b/app/code/core/Mage/Customer/Block/Widget/Name.php index 532729ec7e6..3d63edeb9e2 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Name.php +++ b/app/code/core/Mage/Customer/Block/Widget/Name.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Helper/Data.php b/app/code/core/Mage/Customer/Helper/Data.php index 49d8d29495d..b6c6acc8dba 100644 --- a/app/code/core/Mage/Customer/Helper/Data.php +++ b/app/code/core/Mage/Customer/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -737,9 +737,6 @@ protected function _createVatNumberValidationSoapClient($trace = false) /** * Returns the country code used in VAT number which can be different from the ISO-2 country code. - * - * @param string $countryCode - * @return string */ protected function _getCountryCodeForVatNumber(string $countryCode): string { diff --git a/app/code/core/Mage/Customer/Model/Address.php b/app/code/core/Mage/Customer/Model/Address.php index d9b1377f101..8ffb92461d0 100644 --- a/app/code/core/Mage/Customer/Model/Address.php +++ b/app/code/core/Mage/Customer/Model/Address.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -79,7 +79,6 @@ public function getCustomer() /** * Specify address customer * - * @param Mage_Customer_Model_Customer $customer * @return $this */ public function setCustomer(Mage_Customer_Model_Customer $customer) diff --git a/app/code/core/Mage/Customer/Model/Address/Api.php b/app/code/core/Mage/Customer/Model/Address/Api.php index 9f779558882..55a40a392cc 100644 --- a/app/code/core/Mage/Customer/Model/Address/Api.php +++ b/app/code/core/Mage/Customer/Model/Address/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Address/Api/V2.php b/app/code/core/Mage/Customer/Model/Address/Api/V2.php index 901b932eef7..703e477667e 100644 --- a/app/code/core/Mage/Customer/Model/Address/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Address/Api/V2.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Address/Config.php b/app/code/core/Mage/Customer/Model/Address/Config.php index 287a5029f5e..6800ed8d5f1 100644 --- a/app/code/core/Mage/Customer/Model/Address/Config.php +++ b/app/code/core/Mage/Customer/Model/Address/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api/Resource.php b/app/code/core/Mage/Customer/Model/Api/Resource.php index 4c684a1fcf7..63d92f6a455 100644 --- a/app/code/core/Mage/Customer/Model/Api/Resource.php +++ b/app/code/core/Mage/Customer/Model/Api/Resource.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,7 +39,6 @@ class Mage_Customer_Model_Api_Resource extends Mage_Api_Model_Resource_Abstract * Check is attribute allowed * * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute - * @param array|null $filter * @return bool */ protected function _isAllowedAttribute($attribute, ?array $filter = null) @@ -59,7 +58,6 @@ protected function _isAllowedAttribute($attribute, ?array $filter = null) * Return list of allowed attributes * * @param Mage_Eav_Model_Entity_Abstract $entity - * @param array|null $filter * @return array */ public function getAllowedAttributes($entity, ?array $filter = null) diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer.php b/app/code/core/Mage/Customer/Model/Api2/Customer.php index a276548ee0c..85f703189c4 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Customer_Model_Api2_Customer extends Mage_Api2_Model_Resource { /** - * Resource specific method to retrieve attributes' codes. May be overriden in child. + * Resource specific method to retrieve attributes' codes. May be overridden in child. * * @return array */ diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address.php index 1c6f3f8817f..3883451efbe 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Customer_Model_Api2_Customer_Address extends Mage_Api2_Model_Resource { /** - * Resource specific method to retrieve attributes' codes. May be overriden in child. + * Resource specific method to retrieve attributes' codes. May be overridden in child. * * @return array */ @@ -44,7 +44,6 @@ protected function _getValidator() /** * Is specified address a default billing address? * - * @param Mage_Customer_Model_Address $address * @return bool */ protected function _isDefaultBillingAddress(Mage_Customer_Model_Address $address) @@ -55,7 +54,6 @@ protected function _isDefaultBillingAddress(Mage_Customer_Model_Address $address /** * Is specified address a default shipping address? * - * @param Mage_Customer_Model_Address $address * @return bool */ protected function _isDefaultShippingAddress(Mage_Customer_Model_Address $address) diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest.php index 5eba2b06e5a..d029c097483 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ abstract class Mage_Customer_Model_Api2_Customer_Address_Rest extends Mage_Custo /** * Create customer address * - * @param array $data * @throws Mage_Api2_Exception * @return string */ @@ -111,7 +110,6 @@ protected function _getCollectionForRetrieve() /** * Get array with default addresses information if possible * - * @param Mage_Customer_Model_Address $address * @return array */ protected function _getDefaultAddressesInfo(Mage_Customer_Model_Address $address) @@ -125,7 +123,6 @@ protected function _getDefaultAddressesInfo(Mage_Customer_Model_Address $address /** * Update specified stock item * - * @param array $data * @throws Mage_Api2_Exception */ protected function _update(array $data) diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php index 55b7aa4996e..4256f07ea59 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ class Mage_Customer_Model_Api2_Customer_Address_Validator extends Mage_Api2_Mode /** * Filter request data. * - * @param array $data * @return array Filtered data */ public function filter(array $data) @@ -55,7 +54,6 @@ public function filter(array $data) /** * Validate data for create association with the country * - * @param array $data * @return bool */ public function isValidDataForCreateAssociationWithCountry(array $data) @@ -66,8 +64,6 @@ public function isValidDataForCreateAssociationWithCountry(array $data) /** * Validate data for change association with the country * - * @param Mage_Customer_Model_Address $address - * @param array $data * @return bool */ public function isValidDataForChangeAssociationWithCountry(Mage_Customer_Model_Address $address, array $data) @@ -88,13 +84,12 @@ public function isValidDataForChangeAssociationWithCountry(Mage_Customer_Model_A * Check region * * @param array $data - * @param Mage_Directory_Model_Country $country * @return bool */ protected function _checkRegion($data, Mage_Directory_Model_Country $country) { $regions = $country->getRegions(); - // Is it the country with predifined regions? + // Is it the country with predefined regions? if ($regions->count()) { if (!array_key_exists('region', $data) || empty($data['region'])) { $this->_addError('"State/Province" is required.'); diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest.php index 16f462bd3b8..1323746451c 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ abstract class Mage_Customer_Model_Api2_Customer_Rest extends Mage_Customer_Mode /** * Create customer * - * @param array $data * @return string */ protected function _create(array $data) @@ -82,7 +81,6 @@ protected function _retrieveCollection() /** * Update customer * - * @param array $data * @throws Mage_Api2_Exception */ protected function _update(array $data) diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php index d24334d7f00..617480ea6a4 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,7 +60,6 @@ protected function _getCollectionForRetrieve() /** * Update customer * - * @param array $data * @throws Mage_Api2_Exception */ protected function _update(array $data) @@ -73,7 +72,6 @@ protected function _update(array $data) /** * Update customers * - * @param array $data * @throws Mage_Api2_Exception */ protected function _multiUpdate(array $data) diff --git a/app/code/core/Mage/Customer/Model/Config/Share.php b/app/code/core/Mage/Customer/Model/Config/Share.php index fe063ebf6fd..a5ebecc94ff 100644 --- a/app/code/core/Mage/Customer/Model/Config/Share.php +++ b/app/code/core/Mage/Customer/Model/Config/Share.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,7 +68,7 @@ public function toOptionArray() } /** - * Check for email dublicates before saving customers sharing options + * Check for email duplicates before saving customers sharing options * * @return $this * @throws Mage_Core_Exception diff --git a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php index e105bf6dfd7..e533c7af271 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -347,7 +347,6 @@ public function parse() } /** - * @param Mage_Customer_Model_Customer $customer * @throws Mage_Core_Exception * @throws Varien_Exception */ diff --git a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php index a6a5ab6b317..287c97d628f 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php index e99da3223ec..9a9b1b8f242 100644 --- a/app/code/core/Mage/Customer/Model/Customer.php +++ b/app/code/core/Mage/Customer/Model/Customer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -122,7 +122,9 @@ class Mage_Customer_Model_Customer extends Mage_Core_Model_Abstract public const XML_PATH_GENERATE_HUMAN_FRIENDLY_ID = 'customer/create_account/generate_human_friendly_id'; public const XML_PATH_CHANGED_PASSWORD_OR_EMAIL_TEMPLATE = 'customer/changed_account/password_or_email_template'; public const XML_PATH_CHANGED_PASSWORD_OR_EMAIL_IDENTITY = 'customer/changed_account/password_or_email_identity'; - + public const XML_PATH_PASSWORD_LINK_ACCOUNT_NEW_EMAIL_TEMPLATE = 'customer/password_link/account_new_email_template'; + public const XML_PATH_PASSWORD_LINK_EMAIL_TEMPLATE = 'customer/password_link/email_template'; + public const XML_PATH_PASSWORD_LINK_EMAIL_IDENTITY = 'customer/password_link/email_identity'; /** * Codes of exceptions related to customer model */ @@ -363,7 +365,6 @@ public function getName() /** * Add address to address collection * - * @param Mage_Customer_Model_Address $address * @return $this * @throws Mage_Core_Exception */ @@ -475,9 +476,6 @@ public function getAttribute($attributeCode) return $this->_attributes[$attributeCode] ?? null; } - /** - * @return string - */ public function getPassword(): string { return (string) $this->_getData('password'); @@ -702,7 +700,6 @@ public function getAdditionalAddresses() /** * Check if address is primary * - * @param Mage_Customer_Model_Address $address * @return bool */ public function isAddressPrimary(Mage_Customer_Model_Address $address) @@ -880,6 +877,40 @@ public function sendPasswordResetConfirmationEmail() return $this; } + /** + * Send email with link to set password + * + * @bool $isNew Send welcome email? + * @return $this + */ + public function sendPasswordLinkEmail(bool $isNew = false) + { + $storeId = Mage::app()->getStore()->getId(); + if (!$storeId) { + $storeId = $this->_getWebsiteStoreId(); + } + + /** @var Mage_Customer_Helper_Data $helper */ + $helper = Mage::helper('customer'); + $newResetPasswordLinkToken = $helper->generateResetPasswordLinkToken(); + $newResetPasswordLinkCustomerId = $helper->generateResetPasswordLinkCustomerId($this->getId()); + $this->changeResetPasswordLinkCustomerId($newResetPasswordLinkCustomerId); + $this->changeResetPasswordLinkToken($newResetPasswordLinkToken); + + $template = $isNew + ? self::XML_PATH_PASSWORD_LINK_ACCOUNT_NEW_EMAIL_TEMPLATE + : self::XML_PATH_PASSWORD_LINK_EMAIL_TEMPLATE; + + $this->_sendEmailTemplate( + $template, + self::XML_PATH_PASSWORD_LINK_EMAIL_IDENTITY, + ['customer' => $this], + $storeId + ); + + return $this; + } + /** * Retrieve customer group identifier * @@ -989,7 +1020,6 @@ public function getSharedWebsiteIds() /** * Set store to customer * - * @param Mage_Core_Model_Store $store * @return $this */ public function setStore(Mage_Core_Model_Store $store) @@ -1096,7 +1126,6 @@ public function validateResetPassword() /** * Import customer data from text array * - * @param array $row * @return $this|null * @throws Mage_Core_Exception * @throws Mage_Core_Model_Store_Exception @@ -1358,7 +1387,6 @@ public function printError($error, $line = null) /** * Validate address * - * @param array $data * @param string $type * @return bool */ @@ -1380,7 +1408,7 @@ public function validateAddress(array $data, $type = 'billing') return false; } - $region = Mage::getModel('directory/region')->loadByName($data[$prefix . 'region']); + $region = Mage::getModel('directory/region')->loadByName($data[$prefix . 'region'], $data[$prefix . $field]); if (!$region->getId()) { return false; } diff --git a/app/code/core/Mage/Customer/Model/Customer/Api.php b/app/code/core/Mage/Customer/Model/Customer/Api.php index f8daaa27a89..06671051537 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Api.php +++ b/app/code/core/Mage/Customer/Model/Customer/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php index 53fc8bb392c..89b9164b461 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,9 +28,6 @@ class Mage_Customer_Model_Entity_Address_Attribute_Source_Country extends Mage_C */ protected $_factory; - /** - * @param array $args - */ public function __construct(array $args = []) { $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory'); diff --git a/app/code/core/Mage/Customer/Model/Resource/Address.php b/app/code/core/Mage/Customer/Model/Resource/Address.php index 2974c88de22..964baf025b7 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +33,6 @@ protected function _construct() /** * Set default shipping to address * - * @param Varien_Object|Mage_Customer_Model_Address $address * @return $this */ protected function _afterSave(Varien_Object $address) diff --git a/app/code/core/Mage/Customer/Model/Resource/Customer.php b/app/code/core/Mage/Customer/Model/Resource/Customer.php index 9d89a366940..5287148b8cb 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Customer.php +++ b/app/code/core/Mage/Customer/Model/Resource/Customer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -101,7 +101,6 @@ protected function _beforeSave(Varien_Object $customer) /** * Save customer addresses and set default addresses in attributes backend * - * @param Varien_Object $customer * @return Mage_Eav_Model_Entity_Abstract */ protected function _afterSave(Varien_Object $customer) @@ -113,7 +112,6 @@ protected function _afterSave(Varien_Object $customer) /** * Save/delete customer address * - * @param Mage_Customer_Model_Customer $customer * @return $this */ protected function _saveAddresses(Mage_Customer_Model_Customer $customer) @@ -187,7 +185,6 @@ protected function _getLoadRowSelect($object, $rowId) * * @throws Mage_Core_Exception * - * @param Mage_Customer_Model_Customer $customer * @param string $email * @param bool $testOnly * @return $this @@ -223,7 +220,6 @@ public function loadByEmail(Mage_Customer_Model_Customer $customer, $email, $tes /** * Change customer password * - * @param Mage_Customer_Model_Customer $customer * @param string $newPassword * @return $this */ @@ -297,7 +293,6 @@ public function getWebsiteId($customerId) /** * Custom setter of increment ID if its needed * - * @param Varien_Object $object * @return $this */ public function setNewIncrementId(Varien_Object $object) @@ -313,7 +308,6 @@ public function setNewIncrementId(Varien_Object $object) * * Stores new reset password link token and its creation time * - * @param Mage_Customer_Model_Customer $customer * @param string $newResetPasswordLinkToken * @return $this */ @@ -334,7 +328,6 @@ public function changeResetPasswordLinkToken(Mage_Customer_Model_Customer $custo * * Stores new reset password link customer Id * - * @param Mage_Customer_Model_Customer $customer * @param string $newResetPasswordLinkCustomerId * @return $this * @throws Exception diff --git a/app/code/core/Mage/Customer/Model/Resource/Group.php b/app/code/core/Mage/Customer/Model/Resource/Group.php index 75d94df3599..13e1bf52913 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Group.php +++ b/app/code/core/Mage/Customer/Model/Resource/Group.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,7 +45,6 @@ protected function _initUniqueFields() /** * Check if group uses as default * - * @param Mage_Core_Model_Abstract $group * @throws Mage_Core_Exception * @return Mage_Core_Model_Resource_Db_Abstract */ @@ -61,7 +60,6 @@ protected function _beforeDelete(Mage_Core_Model_Abstract $group) /** * Method set default group id to the customers collection * - * @param Mage_Core_Model_Abstract $group * @return Mage_Core_Model_Resource_Db_Abstract */ protected function _afterDelete(Mage_Core_Model_Abstract $group) diff --git a/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php index 7dbba37bdac..569d1e094fd 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Session.php b/app/code/core/Mage/Customer/Model/Session.php index a082fb03dde..b3fa73dc2b7 100644 --- a/app/code/core/Mage/Customer/Model/Session.php +++ b/app/code/core/Mage/Customer/Model/Session.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -98,7 +98,6 @@ public function __construct() /** * Set customer object and setting customer id in session * - * @param Mage_Customer_Model_Customer $customer * @return Mage_Customer_Model_Session */ public function setCustomer(Mage_Customer_Model_Customer $customer) @@ -284,7 +283,6 @@ public function logout() /** * Authenticate controller action by login customer * - * @param Mage_Core_Controller_Varien_Action $action * @param bool $loginUrl * @return bool */ @@ -360,7 +358,7 @@ public function setAfterAuthUrl($url) } /** - * Reset core session hosts after reseting session ID + * Reset core session hosts after resetting session ID * * @return $this */ diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php index f01405c3090..bebfb99a2ad 100644 --- a/app/code/core/Mage/Customer/controllers/AccountController.php +++ b/app/code/core/Mage/Customer/controllers/AccountController.php @@ -322,7 +322,6 @@ public function createPostAction() /** * Success Registration * - * @param Mage_Customer_Model_Customer $customer * @return $this * @throws Mage_Core_Exception */ @@ -435,7 +434,7 @@ protected function _getCustomerErrors($customer) } /** - * Get Customer Form Initalized Model + * Get Customer Form Initialized Model * * @param Mage_Customer_Model_Customer $customer * @return Mage_Customer_Model_Form @@ -542,7 +541,6 @@ protected function _getFromRegistry($path) * Add welcome message and send new account email. * Returns success URL * - * @param Mage_Customer_Model_Customer $customer * @param bool $isJustConfirmed * @return string * @throws Mage_Core_Model_Store_Exception @@ -826,7 +824,7 @@ public function resetPasswordAction() /** * Reset forgotten password - * Used to handle data recieved from reset forgotten password form + * Used to handle data received from reset forgotten password form */ public function resetPasswordPostAction() { @@ -876,6 +874,7 @@ public function resetPasswordPostAction() $customer->cleanPasswordsValidationData(); $customer->setPasswordCreatedAt(time()); $customer->setRpCustomerId(null); + $customer->setConfirmation(null); // Set email is confirmed. $customer->save(); $this->_getSession()->unsetData(self::TOKEN_SESSION_NAME); @@ -933,7 +932,7 @@ protected function _validateResetPasswordLinkToken($customerId, $resetPasswordLi } $customerToken = $customer->getRpToken(); - if (strcmp($customerToken, $resetPasswordLinkToken) != 0 || $customer->isResetPasswordLinkTokenExpired()) { + if (is_null($customerToken) || strcmp($customerToken, $resetPasswordLinkToken) !== 0 || $customer->isResetPasswordLinkTokenExpired()) { throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Your password reset link has expired.')); } } @@ -1099,7 +1098,6 @@ protected function _isVatValidationEnabled($store = null) /** * Get restore password params. * - * @param Mage_Customer_Model_Session $session * @return array array ($customerId, $resetPasswordToken) */ protected function _getRestorePasswordParameters(Mage_Customer_Model_Session $session) diff --git a/app/code/core/Mage/Customer/etc/config.xml b/app/code/core/Mage/Customer/etc/config.xml index 9d81eb34965..2d4fa6a2cb5 100644 --- a/app/code/core/Mage/Customer/etc/config.xml +++ b/app/code/core/Mage/Customer/etc/config.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -413,6 +413,16 @@ password_or_email_changed.html html + + + account_new_password_link.html + html + + + + account_password_reset_confirmation.html + html + @@ -532,6 +542,11 @@ 1 7 + + support + customer_password_link_account_new_email_template + customer_password_link_email_template +
2 diff --git a/app/code/core/Mage/Customer/etc/system.xml b/app/code/core/Mage/Customer/etc/system.xml index 3a483040286..f5bece92add 100644 --- a/app/code/core/Mage/Customer/etc/system.xml +++ b/app/code/core/Mage/Customer/etc/system.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -327,6 +327,45 @@ + + + text + 35 + 1 + 1 + 1 + + + + + select + adminhtml/system_config_source_email_template + 41 + 1 + 1 + 1 + + + + Email Link to Set Password is checked on the customer page in backend.]]> + select + adminhtml/system_config_source_email_template + 42 + 1 + 1 + 1 + + + + select + adminhtml/system_config_source_email_identity + 43 + 1 + 1 + 1 + + +
40 diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php index 0e1c76b289f..d1b57d61d19 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch.php b/app/code/core/Mage/Dataflow/Model/Batch.php index 1235b8f468f..c9b20cd9410 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch.php +++ b/app/code/core/Mage/Dataflow/Model/Batch.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Io.php b/app/code/core/Mage/Dataflow/Model/Batch/Io.php index 059b612630c..944a59ac597 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Io.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Io.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,7 +62,6 @@ class Mage_Dataflow_Model_Batch_Io /** * Init model (required) * - * @param Mage_Dataflow_Model_Batch $object * @return $this */ public function init(Mage_Dataflow_Model_Batch $object) diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php index 923467a650c..38548e6a76d 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -136,7 +136,6 @@ public function addAction(?Mage_Dataflow_Model_Convert_Action_Interface $action /** * Set action's container * - * @param Mage_Dataflow_Model_Convert_Container_Interface $container * @return Mage_Dataflow_Model_Convert_Action_Abstract */ public function setContainer(Mage_Dataflow_Model_Convert_Container_Interface $container) diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php index 19860511fb1..3b710a99b28 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php index 23458115e99..3af01ce47b1 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php index 3ce062469be..a7fa4583dd3 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -309,7 +309,6 @@ public function unparse() /** * Prepare and return XML string for MS Excel XML from array * - * @param array $fields * @return string */ protected function _getXmlString(array $fields = []) diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php index 95b73e75b17..967536f4ca8 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php index 4e039562d33..b9927e8ad64 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php index da7e6d3d0e3..b5aef52e82d 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php index c74eaef3c48..f324b601057 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php index 8ab3d17216d..419e1ba4268 100644 --- a/app/code/core/Mage/Dataflow/Model/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Profile.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php index 737317ca6b5..db2df02eaff 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ abstract class Mage_Dataflow_Model_Resource_Batch_Abstract extends Mage_Core_Mod /** * Retrieve Id collection * - * @param Mage_Dataflow_Model_Batch_Abstract $object * @return array */ public function getIdCollection(Mage_Dataflow_Model_Batch_Abstract $object) @@ -44,7 +43,6 @@ public function getIdCollection(Mage_Dataflow_Model_Batch_Abstract $object) /** * Delete current Batch collection * - * @param Mage_Dataflow_Model_Batch_Abstract $object * @return Mage_Dataflow_Model_Resource_Batch_Abstract */ public function deleteCollection(Mage_Dataflow_Model_Batch_Abstract $object) diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php index 0d99fba182e..3ed303aa479 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Sets up performed at time if needed * - * @param Mage_Core_Model_Abstract $object * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php index fdf30b8c5f6..765f3ad56fc 100644 --- a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php index 1dba8958ff7..d33929e1f40 100644 --- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php +++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Directory_Block_Adminhtml_Frontend_Region_Updater extends Mage_Adminhtml_Block_System_Config_Form_Field { /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Directory/Block/Currency.php b/app/code/core/Mage/Directory/Block/Currency.php index b48aea7bf24..74bf7bdcbef 100644 --- a/app/code/core/Mage/Directory/Block/Currency.php +++ b/app/code/core/Mage/Directory/Block/Currency.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -65,7 +65,7 @@ public function getCurrencies() } /** - * Retrieve Currency Swith URL + * Retrieve Currency Switch URL * * @return string */ diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php index be20bd6e0e1..7ba984161dd 100644 --- a/app/code/core/Mage/Directory/Helper/Data.php +++ b/app/code/core/Mage/Directory/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -87,9 +87,6 @@ class Mage_Directory_Helper_Data extends Mage_Core_Helper_Abstract */ protected $_app; - /** - * @param array $args - */ public function __construct(array $args = []) { $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory'); diff --git a/app/code/core/Mage/Directory/Model/Country.php b/app/code/core/Mage/Directory/Model/Country.php index ed07bcc194f..f2f7c76b78b 100644 --- a/app/code/core/Mage/Directory/Model/Country.php +++ b/app/code/core/Mage/Directory/Model/Country.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -79,7 +79,6 @@ public function getRegionCollection() } /** - * @param Varien_Object $address * @param bool $html * @return string */ diff --git a/app/code/core/Mage/Directory/Model/Currency.php b/app/code/core/Mage/Directory/Model/Currency.php index 1363a76498d..dc54247298a 100644 --- a/app/code/core/Mage/Directory/Model/Currency.php +++ b/app/code/core/Mage/Directory/Model/Currency.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Currency/Filter.php b/app/code/core/Mage/Directory/Model/Currency/Filter.php index 51c6bf0a7db..74dfed03960 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Filter.php +++ b/app/code/core/Mage/Directory/Model/Currency/Filter.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Currencyconverterapi.php b/app/code/core/Mage/Directory/Model/Currency/Import/Currencyconverterapi.php index b9e1541b59d..e4898c30002 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Currencyconverterapi.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Currencyconverterapi.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -94,9 +94,7 @@ public function fetchRates() /** * Batch import of currency rates * - * @param array $data * @param string $currencyFrom - * @param array $currenciesTo * @return array */ protected function _convertBatch(array $data, $currencyFrom, array $currenciesTo) @@ -173,7 +171,6 @@ protected function _getServiceResponse($url, $retry = 0) /** * Fill simulated response with empty data * - * @param array $currenciesTo * @return array */ protected function _makeEmptyResponse(array $currenciesTo) diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php b/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php index 0b6aa44c81e..3022812bc0b 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -94,9 +94,7 @@ public function fetchRates() /** * Batch import of currency rates * - * @param array $data * @param string $currencyFrom - * @param array $currenciesTo * @return array */ protected function _convertBatch(array $data, $currencyFrom, array $currenciesTo) @@ -178,7 +176,6 @@ protected function _getServiceResponse($url, $retry = 0) /** * Validate response from external service * - * @param array $response * @param string $baseCurrency * @return bool */ @@ -213,7 +210,6 @@ protected function _validateResponse(array $response, $baseCurrency) /** * Fill simulated response with empty data * - * @param array $currenciesTo * @return array */ protected function _makeEmptyResponse(array $currenciesTo) diff --git a/app/code/core/Mage/Directory/Model/Resource/Country.php b/app/code/core/Mage/Directory/Model/Resource/Country.php index 347182c189e..55671d27d72 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,11 +29,9 @@ protected function _construct() /** * Load country by ISO code * - * @param Mage_Directory_Model_Country $country * @param string $code * * @throws Mage_Core_Exception - * * @return $this */ public function loadByCode(Mage_Directory_Model_Country $country, $code) diff --git a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php index 97db11c2565..3fc6da5a682 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -75,7 +75,7 @@ public function getItemById($countryId) * Add filter by country code to collection. * $countryCode can be either array of country codes or string representing one country code. * $iso can be either array containing 'iso2', 'iso3' values or string with containing one of that values directly. - * The collection will contain countries where at least one of contry $iso fields matches $countryCode. + * The collection will contain countries where at least one of country $iso fields matches $countryCode. * * @param string|array $countryCode * @param string|array $iso diff --git a/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php index 3dab8301334..fc143aca8c4 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Resource/Region.php b/app/code/core/Mage/Directory/Model/Resource/Region.php index 5bfd5334a69..f19f0c48839 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Region.php +++ b/app/code/core/Mage/Directory/Model/Resource/Region.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -117,10 +117,8 @@ protected function _loadByCountry($object, $countryId, $value, $field) /** * Loads region by region code and country id * - * @param Mage_Directory_Model_Region $region * @param string $regionCode * @param string $countryId - * * @return $this */ public function loadByCode(Mage_Directory_Model_Region $region, $regionCode, $countryId) @@ -131,10 +129,8 @@ public function loadByCode(Mage_Directory_Model_Region $region, $regionCode, $co /** * Load data by country id and default region name * - * @param Mage_Directory_Model_Region $region * @param string $regionName * @param string $countryId - * * @return $this */ public function loadByName(Mage_Directory_Model_Region $region, $regionName, $countryId) diff --git a/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php index c262b214cc1..7e315b012d9 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php index e427d1a14b7..e4300db6f0c 100644 --- a/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/etc/config.xml b/app/code/core/Mage/Directory/etc/config.xml index d889367fff0..723dcf8d376 100644 --- a/app/code/core/Mage/Directory/etc/config.xml +++ b/app/code/core/Mage/Directory/etc/config.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php index ac2f4d17fa6..720fe35b075 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -17,7 +17,7 @@ $installer = $this; $installer->startSetup(); -// Delelte non-existent and unofficial iso-3166-1 codes +// Delete non-existent and unofficial iso-3166-1 codes $installer->run(" DELETE FROM {$installer->getTable('directory/country')} WHERE country_id IN('FX','CS') diff --git a/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php index a1bf2cbbb1f..3ddb16262e4 100644 --- a/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php +++ b/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +26,6 @@ class Mage_Downloadable_Helper_Catalog_Product_Configuration extends Mage_Core_H /** * Retrieves item links options * - * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item * @return array */ public function getLinks(Mage_Catalog_Model_Product_Configuration_Item_Interface $item) @@ -66,7 +65,6 @@ public function getLinksTitle($product) /** * Retrieves product options * - * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item * @return array */ public function getOptions(Mage_Catalog_Model_Product_Configuration_Item_Interface $item) diff --git a/app/code/core/Mage/Downloadable/Helper/File.php b/app/code/core/Mage/Downloadable/Helper/File.php index a32793bdbe5..4f6e813b60c 100644 --- a/app/code/core/Mage/Downloadable/Helper/File.php +++ b/app/code/core/Mage/Downloadable/Helper/File.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php b/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php index dde76835853..5905ddf3340 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php index 9e7cfae71bd..fe4a82f6a75 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Observer.php b/app/code/core/Mage/Downloadable/Model/Observer.php index 33718a9fa7a..b2e6707242a 100644 --- a/app/code/core/Mage/Downloadable/Model/Observer.php +++ b/app/code/core/Mage/Downloadable/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,7 +45,6 @@ public function prepareProductSave($observer) /** * Save data from order to purchased links * - * @param Varien_Event_Observer $observer * @return $this */ public function saveDownloadableOrderItem(Varien_Event_Observer $observer) @@ -250,9 +249,8 @@ public function setLinkStatus($observer) } /** - * Check is allowed guest checkuot if quote contain downloadable product(s) + * Check is allowed guest checkout if quote contain downloadable product(s) * - * @param Varien_Event_Observer $observer * @return $this */ public function isAllowedGuestCheckout(Varien_Event_Observer $observer) @@ -282,7 +280,6 @@ public function isAllowedGuestCheckout(Varien_Event_Observer $observer) /** * Initialize product options renderer with downloadable specific params * - * @param Varien_Event_Observer $observer * @return $this */ public function initOptionRenderer(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Downloadable/Model/Product/Type.php b/app/code/core/Mage/Downloadable/Model/Product/Type.php index 32efc635dba..8bea3314de9 100644 --- a/app/code/core/Mage/Downloadable/Model/Product/Type.php +++ b/app/code/core/Mage/Downloadable/Model/Product/Type.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -266,7 +266,6 @@ public function save($product = null) * Prepare product and its configuration to be added to some products list. * Perform standard preparation process and then prepare options for downloadable links. * - * @param Varien_Object $buyRequest * @param Mage_Catalog_Model_Product $product * @param string $processMode * @return array|string diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php b/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php index ccfcc59749e..b2cb68ad48a 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Sample.php b/app/code/core/Mage/Downloadable/Model/Sample.php index bce49b0731d..c87012228b8 100644 --- a/app/code/core/Mage/Downloadable/Model/Sample.php +++ b/app/code/core/Mage/Downloadable/Model/Sample.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php index dd05a7658ad..9a19aaa56de 100644 --- a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php +++ b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/DownloadController.php b/app/code/core/Mage/Downloadable/controllers/DownloadController.php index 8bac8cf7078..4739bd0eba1 100644 --- a/app/code/core/Mage/Downloadable/controllers/DownloadController.php +++ b/app/code/core/Mage/Downloadable/controllers/DownloadController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php index d83cdbf57af..ad613b7dbbd 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -161,7 +161,7 @@ protected function _prepareForm() } /** - * Initialize form fileds values + * Initialize form fields values * * @inheritDoc */ diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php index 613013c3038..36f3a813d9e 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data.php b/app/code/core/Mage/Eav/Model/Attribute/Data.php index 1ad7379caa8..c19bdbcf586 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,8 +39,6 @@ class Mage_Eav_Model_Attribute_Data * Return attribute data model by attribute * Set entity to data model (need for work) * - * @param Mage_Eav_Model_Attribute $attribute - * @param Mage_Core_Model_Abstract $entity * @return Mage_Eav_Model_Attribute_Data_Abstract */ public static function factory(Mage_Eav_Model_Attribute $attribute, Mage_Core_Model_Abstract $entity) diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php index f672943a376..a38c7e46d0f 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,7 +74,6 @@ abstract class Mage_Eav_Model_Attribute_Data_Abstract /** * Set attribute instance * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return Mage_Eav_Model_Attribute_Data_Abstract */ public function setAttribute(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) @@ -125,7 +124,6 @@ public function setRequestScopeOnly($flag) /** * Set entity instance * - * @param Mage_Core_Model_Abstract $entity * @return Mage_Eav_Model_Attribute_Data_Abstract */ public function setEntity(Mage_Core_Model_Abstract $entity) @@ -150,7 +148,6 @@ public function getEntity() /** * Set array of full extracted data * - * @param array $data * @return Mage_Eav_Model_Attribute_Data_Abstract */ public function setExtractedData(array $data) @@ -471,7 +468,6 @@ public function getIsAjaxRequest() /** * Return Original Attribute value from Request * - * @param Zend_Controller_Request_Http $request * @return mixed */ protected function _getRequestValue(Zend_Controller_Request_Http $request) @@ -502,7 +498,6 @@ protected function _getRequestValue(Zend_Controller_Request_Http $request) /** * Extract data from request and return value * - * @param Zend_Controller_Request_Http $request * @return array|string */ abstract public function extractValue(Zend_Controller_Request_Http $request); diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php index db428de9d85..9105137c946 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Eav_Model_Attribute_Data_Date extends Mage_Eav_Model_Attribute_Data_A /** * Extract data from request and return value * - * @param Zend_Controller_Request_Http $request * @return array|string|false */ public function extractValue(Zend_Controller_Request_Http $request) diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php index 273b03de8d1..2c5814708a1 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ class Mage_Eav_Model_Attribute_Data_File extends Mage_Eav_Model_Attribute_Data_A /** * Extract data from request and return value * - * @param Zend_Controller_Request_Http $request * @return false|array|string */ public function extractValue(Zend_Controller_Request_Http $request) diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php index 98110ec1004..343695fe932 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Eav_Model_Attribute_Data_Multiline extends Mage_Eav_Model_Attribute_D /** * Extract data from request and return value * - * @param Zend_Controller_Request_Http $request * @return array|string */ public function extractValue(Zend_Controller_Request_Http $request) diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php index 5ebb86cf9ef..4f8c039636d 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Eav_Model_Attribute_Data_Multiselect extends Mage_Eav_Model_Attribute /** * Extract data from request and return value * - * @param Zend_Controller_Request_Http $request * @return array|string */ public function extractValue(Zend_Controller_Request_Http $request) diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php index dfdcff02e4d..6a76dbda64f 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Eav_Model_Attribute_Data_Select extends Mage_Eav_Model_Attribute_Data /** * Extract data from request and return value * - * @param Zend_Controller_Request_Http $request * @return array|string */ public function extractValue(Zend_Controller_Request_Http $request) diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php index ddc28871bec..729c808348b 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Eav_Model_Attribute_Data_Text extends Mage_Eav_Model_Attribute_Data_A /** * Extract data from request and return value * - * @param Zend_Controller_Request_Http $request * @return array|string */ public function extractValue(Zend_Controller_Request_Http $request) diff --git a/app/code/core/Mage/Eav/Model/Config.php b/app/code/core/Mage/Eav/Model/Config.php index 2e04f7c9ce8..0ce7afa50c5 100644 --- a/app/code/core/Mage/Eav/Model/Config.php +++ b/app/code/core/Mage/Eav/Model/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -650,7 +650,6 @@ public function loadCollectionAttributes($entityType, $attributes) /** * @param string|Mage_Eav_Model_Entity_Type $entityType - * @param array $attributes * @return $this * @deprecated No longer required. All attribute data is cached on-access. */ diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php index 736294a5844..b1ec006c976 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php +++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php index 295048c1ecd..6bb7ef7dd4b 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -108,7 +108,6 @@ public function getAttributeSetId($entityTypeId, $name) } /** - * @param Mage_Eav_Model_Entity_Attribute_Source_Interface $source * @param string $value * @return string|null */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php index 01c39e4c918..304c2823f86 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,7 +57,7 @@ abstract class Mage_Eav_Model_Entity_Abstract extends Mage_Core_Model_Resource_A protected $_attributesByCode = []; /** - * 2-dimentional array by table name and attribute name + * 2-dimensional array by table name and attribute name * * @var array */ @@ -433,7 +433,6 @@ protected function _getDefaultAttribute($attributeCode) /** * Adding attribute to entity * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return Mage_Eav_Model_Entity_Abstract */ public function addAttribute(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) @@ -590,7 +589,6 @@ protected function _isApplicableAttribute($object, $attribute) * for example: $this->walkAttributes('backend/validate'); * * @param string $partMethod - * @param array $args * @return array * @throws Mage_Eav_Model_Entity_Attribute_Exception */ @@ -825,7 +823,6 @@ public function validate($object) /** * Set new increment id to object * - * @param Varien_Object $object * @return Mage_Eav_Model_Entity_Abstract */ public function setNewIncrementId(Varien_Object $object) @@ -846,7 +843,6 @@ public function setNewIncrementId(Varien_Object $object) /** * Check attribute unique value * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param Varien_Object $object * @return bool */ @@ -994,7 +990,6 @@ protected function _loadModelAttributes($object) /** * Prepare select object for loading entity attributes values * - * @param array $selects * @return Varien_Db_Select */ protected function _prepareLoadSelect(array $selects) @@ -1068,7 +1063,6 @@ protected function _setAttributeValue($object, $valueRow) /** * Save entity's attributes into the object's resource * - * @param Varien_Object $object * @return Mage_Eav_Model_Entity_Abstract */ public function save(Varien_Object $object) @@ -1219,9 +1213,7 @@ protected function _collectSaveData($newObject) /** * Return if attribute exists in original data array. * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param mixed $v New value of the attribute. Can be used in subclasses. - * @param array $origData * @return bool */ protected function _canUpdateAttribute(Mage_Eav_Model_Entity_Attribute_Abstract $attribute, $v, array &$origData) @@ -1465,7 +1457,6 @@ protected function _processAttributeValues() * Prepare value for save * * @param mixed $value - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return mixed */ protected function _prepareValueForSave($value, Mage_Eav_Model_Entity_Attribute_Abstract $attribute) @@ -1513,7 +1504,6 @@ protected function _deleteAttributes($object, $table, $info) /** * Save attribute * - * @param Varien_Object $object * @param string $attributeCode * @return Mage_Eav_Model_Entity_Abstract */ @@ -1608,7 +1598,6 @@ public function delete($object) /** * After Load Entity process * - * @param Varien_Object $object * @return Mage_Eav_Model_Entity_Abstract */ protected function _afterLoad(Varien_Object $object) @@ -1620,7 +1609,6 @@ protected function _afterLoad(Varien_Object $object) /** * Before delete Entity process * - * @param Varien_Object $object * @return Mage_Eav_Model_Entity_Abstract */ protected function _beforeSave(Varien_Object $object) @@ -1632,7 +1620,6 @@ protected function _beforeSave(Varien_Object $object) /** * After Save Entity process * - * @param Varien_Object $object * @return Mage_Eav_Model_Entity_Abstract */ protected function _afterSave(Varien_Object $object) @@ -1644,7 +1631,6 @@ protected function _afterSave(Varien_Object $object) /** * Before Delete Entity process * - * @param Varien_Object $object * @return Mage_Eav_Model_Entity_Abstract */ protected function _beforeDelete(Varien_Object $object) @@ -1656,7 +1642,6 @@ protected function _beforeDelete(Varien_Object $object) /** * After delete entity process * - * @param Varien_Object $object * @return Mage_Eav_Model_Entity_Abstract */ protected function _afterDelete(Varien_Object $object) @@ -1709,7 +1694,6 @@ protected function _afterSetConfig() /** * Check is attribute value empty * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param mixed $value * @return bool */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php index efa6c2ac6fc..1b44c07810b 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php index faf00f6602d..3824cffaab3 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php index fce6274becb..c0a4f97e08d 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,10 +20,10 @@ class Mage_Eav_Model_Entity_Attribute_Backend_Datetime extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** - * Formating date value before save + * Formatting date value before save * * Should set (bool, string) correct type for empty value from html form, - * neccessary for farther proccess, else date string + * necessary for farther process, else date string * * @param Varien_Object $object * @throws Mage_Eav_Exception diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Serialized.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Serialized.php index b23310f9844..e677d533294 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Serialized.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Serialized.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,7 +67,6 @@ public function afterLoad($object) /** * Try to unserialize the attribute value * - * @param Varien_Object $object * @return $this */ protected function _unserialize(Varien_Object $object) diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php index 509f82d9f98..045596c2ce6 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -61,7 +61,7 @@ public function getInputType() } /** - * Retrieve lable + * Retrieve label * * @return string */ @@ -78,7 +78,6 @@ public function getLabel() /** * Retrieve attribute value * - * @param Varien_Object $object * @return mixed */ public function getValue(Varien_Object $object) diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php index b2f6591a6e2..95ac54e04e6 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Eav_Model_Entity_Attribute_Frontend_Datetime extends Mage_Eav_Model_E /** * Retrieve attribute value * - * @param Varien_Object $object * @return mixed */ public function getValue(Varien_Object $object) diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php index cc624cf0019..0ecf15d3925 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php index b62ade5504b..f4284b0ef1d 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -192,7 +192,6 @@ public function validate() * Add set info to attributes * * @param string|Mage_Eav_Model_Entity_Type $entityType - * @param array $attributes * @param int $setId * @return $this */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php index 4cf9b22ed17..af0d60daa0d 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -163,7 +163,7 @@ protected function _initSelect() } /** - * Standard resource collection initalization + * Standard resource collection initialization * * @param string $model * @param null|string $entityModel @@ -244,7 +244,6 @@ public function setObject($object = null) /** * Add an object to the collection * - * @param Varien_Object $object * @inheritDoc */ public function addItem(Varien_Object $object) diff --git a/app/code/core/Mage/Eav/Model/Entity/Setup.php b/app/code/core/Mage/Eav/Model/Entity/Setup.php index 61fadb6db13..7262f3d3ab3 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Setup.php +++ b/app/code/core/Mage/Eav/Model/Entity/Setup.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -104,14 +104,12 @@ public function installDefaultGroupIds() } /******************* ENTITY TYPES *****************/ - /** * Add an entity type * * If already exists updates the entity type with params data * * @param string $code - * @param array $params * @return $this */ public function addEntityType($code, array $params) @@ -666,7 +664,6 @@ protected function _validateAttributeData($data) * * @param string|int $entityTypeId * @param string $code - * @param array $attr * @return $this */ public function addAttribute($entityTypeId, $code, array $attr) @@ -1474,7 +1471,6 @@ protected function _getAttributeTableFields() /** * Insert attribute and filter data * - * @param array $data * @return $this */ protected function _insertAttribute(array $data) @@ -1506,7 +1502,6 @@ protected function _insertAttribute(array $data) * Insert attribute additional data * * @param int $entityTypeId - * @param array $data * @return $this */ protected function _insertAttributeAdditionalData($entityTypeId, array $data) diff --git a/app/code/core/Mage/Eav/Model/Form.php b/app/code/core/Mage/Eav/Model/Form.php index a8bd9d95605..20eb42ef306 100644 --- a/app/code/core/Mage/Eav/Model/Form.php +++ b/app/code/core/Mage/Eav/Model/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -138,7 +138,6 @@ public function setStore($store) /** * Set entity instance * - * @param Mage_Core_Model_Abstract $entity * @return $this */ public function setEntity(Mage_Core_Model_Abstract $entity) @@ -306,7 +305,6 @@ public function getSystemAttributes() /** * Return attribute data model by attribute * - * @param Mage_Eav_Model_Entity_Attribute $attribute * @return Mage_Eav_Model_Attribute_Data_Abstract */ protected function _getAttributeDataModel(Mage_Eav_Model_Entity_Attribute $attribute) @@ -320,7 +318,6 @@ protected function _getAttributeDataModel(Mage_Eav_Model_Entity_Attribute $attri /** * Prepare request with data and returns it * - * @param array $data * @return Zend_Controller_Request_Http */ public function prepareRequest(array $data) @@ -336,7 +333,6 @@ public function prepareRequest(array $data) /** * Extract data from request and return associative data array * - * @param Zend_Controller_Request_Http $request * @param string $scope the request scope * @param bool $scopeOnly search value only in scope or search value in global too * @return array @@ -359,7 +355,6 @@ public function extractData(Zend_Controller_Request_Http $request, $scope = null /** * Validate data array and return true or array of errors * - * @param array $data * @return bool|array */ public function validateData(array $data) @@ -390,7 +385,6 @@ public function validateData(array $data) /** * Compact data array to current entity * - * @param array $data * @return $this */ public function compactData(array $data) @@ -413,7 +407,6 @@ public function compactData(array $data) /** * Restore data array from SESSION to current entity * - * @param array $data * @return $this */ public function restoreData(array $data) diff --git a/app/code/core/Mage/Eav/Model/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Form/Fieldset.php index 9846680f703..f4098349dc0 100644 --- a/app/code/core/Mage/Eav/Model/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Form/Fieldset.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +81,6 @@ public function getLabels() * Set fieldset store labels * Input array where key - store_id and value = label * - * @param array $labels * @return $this */ public function setLabels(array $labels) diff --git a/app/code/core/Mage/Eav/Model/Form/Type.php b/app/code/core/Mage/Eav/Model/Form/Type.php index d7e10a90e15..1bdff6ad171 100644 --- a/app/code/core/Mage/Eav/Model/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Form/Type.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -66,7 +66,6 @@ public function getEntityTypes() /** * Set assigned Eav Entity types * - * @param array $entityTypes * @return $this */ public function setEntityTypes(array $entityTypes) @@ -94,7 +93,6 @@ public function addEntityType($entityTypeId) /** * Copy Form Type properties from skeleton form type * - * @param Mage_Eav_Model_Form_Type $skeleton * @return $this */ public function createFromSkeleton(Mage_Eav_Model_Form_Type $skeleton) diff --git a/app/code/core/Mage/Eav/Model/Resource/Attribute.php b/app/code/core/Mage/Eav/Model/Resource/Attribute.php index aae7fe5e055..2a796e884ad 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Resource/Attribute.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -153,7 +153,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) /** * Return scope values for attribute and website * - * @param Mage_Eav_Model_Attribute $object * @return array */ public function getScopeValues(Mage_Eav_Model_Attribute $object) @@ -180,7 +179,6 @@ public function getScopeValues(Mage_Eav_Model_Attribute $object) /** * Return forms in which the attribute * - * @param Mage_Core_Model_Abstract $object * @return array */ public function getUsedInForms(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php index 5376af7f9d0..ae28a31c017 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php index 41f603795d3..cedf256523a 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -72,7 +72,6 @@ protected function _loadTypeAttributes($entityTypeId) /** * Load attribute data by attribute code * - * @param Mage_Core_Model_Abstract $object * @param int $entityTypeId * @param string $code * @return bool @@ -95,7 +94,6 @@ public function loadByCode(Mage_Core_Model_Abstract $object, $entityTypeId, $cod /** * Retrieve Max Sort order for attribute in group * - * @param Mage_Core_Model_Abstract|Mage_Eav_Model_Entity_Attribute $object * @return int */ private function _getMaxSortOrder(Mage_Core_Model_Abstract $object) @@ -120,7 +118,6 @@ private function _getMaxSortOrder(Mage_Core_Model_Abstract $object) /** * Delete entity * - * @param Mage_Core_Model_Abstract|Mage_Eav_Model_Entity_Attribute $object * @return $this */ public function deleteEntity(Mage_Core_Model_Abstract $object) @@ -182,7 +179,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) /** * Save store labels * - * @param Mage_Core_Model_Abstract|Mage_Eav_Model_Entity_Attribute $object * @return $this */ protected function _saveStoreLabels(Mage_Core_Model_Abstract $object) @@ -213,7 +209,6 @@ protected function _saveStoreLabels(Mage_Core_Model_Abstract $object) /** * Save additional data of attribute * - * @param Mage_Core_Model_Abstract|Mage_Eav_Model_Entity_Attribute $object * @return $this */ protected function _saveAdditionalAttributeData(Mage_Core_Model_Abstract $object) @@ -241,7 +236,6 @@ protected function _saveAdditionalAttributeData(Mage_Core_Model_Abstract $object /** * Save in set including * - * @param Mage_Core_Model_Abstract|Mage_Eav_Model_Entity_Attribute $object * @return $this */ public function saveInSetIncluding(Mage_Core_Model_Abstract $object) @@ -278,7 +272,6 @@ public function saveInSetIncluding(Mage_Core_Model_Abstract $object) /** * Save attribute options * - * @param Mage_Core_Model_Abstract|Mage_Eav_Model_Entity_Attribute $object * @return $this */ protected function _saveOption(Mage_Core_Model_Abstract $object) @@ -422,7 +415,6 @@ public function getAttributeCodesByFrontendType($frontendType) /** * Retrieve Select For Flat Attribute update * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param int $storeId * @return Varien_Db_Select */ @@ -492,7 +484,6 @@ public function getAdditionalAttributeTable($entityTypeId) * Load additional attribute data. * Load label of current active store * - * @param Mage_Core_Model_Abstract $object * @return $this */ protected function _afterLoad(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php index 87e15762254..aca37cea0b8 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,7 +71,7 @@ protected function _getLoadDataFields() } /** - * Specify select columns which are used for load arrtibute values + * Specify select columns which are used for load attribute values * * @return $this */ @@ -144,7 +144,6 @@ public function setAttributeSetFilter($setId) * Specify multiple attribute sets filter * Result will be ordered by sort_order * - * @param array $setIds * @return $this */ public function setAttributeSetsFilter(array $setIds) @@ -164,7 +163,6 @@ public function setAttributeSetsFilter(array $setIds) /** * Filter for selecting of attributes that is in all sets * - * @param array $setIds * @return $this */ public function setInAllAttributeSetsFilter(array $setIds) diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php index 19f6fa8d631..9f49650a54a 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,7 +50,6 @@ public function itemExists($object) /** * Perform actions before object save * - * @param Mage_Core_Model_Abstract|Mage_Eav_Model_Entity_Attribute_Group $object * @return Mage_Core_Model_Resource_Db_Abstract */ protected function _beforeSave(Mage_Core_Model_Abstract $object) @@ -64,7 +63,6 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) /** * Perform actions after object save * - * @param Mage_Core_Model_Abstract|Mage_Eav_Model_Entity_Attribute_Group $object * @return Mage_Core_Model_Resource_Db_Abstract */ protected function _afterSave(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php index 9d913c2f6e2..8175eb50577 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -70,7 +70,6 @@ public function addOptionValueToCollection($collection, $attribute, $valueExpr) /** * Retrieve Select for update Flat data * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param int $store * @param bool $hasValueField flag which require option value * @return Varien_Db_Select diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php index 1fb8e9d8513..8150c8a66f3 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Perform actions after object save * - * @param Mage_Core_Model_Abstract|Mage_Eav_Model_Entity_Attribute_Set $object * @inheritDoc */ protected function _afterSave(Mage_Core_Model_Abstract $object) @@ -88,7 +87,6 @@ public function validate($object, $attributeSetName) /** * Retrieve Set info by attributes * - * @param array $attributeIds * @param int|null $setId * @return array */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php index 2acb3b8db61..2f08fe8e565 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Load an object by entity type and store * - * @param Mage_Core_Model_Abstract $object * @param int $entityTypeId * @param int $storeId * @return bool diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php index 5719de5189e..45fba7f0e01 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/etc/config.xml b/app/code/core/Mage/Eav/etc/config.xml index e0056eaedb6..3b9aeac1451 100644 --- a/app/code/core/Mage/Eav/etc/config.xml +++ b/app/code/core/Mage/Eav/etc/config.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php index 798de10a2ca..e25142194db 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php index 237b25a7f6e..3c0f548fbee 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php index a91e5b4f716..80b16fe837b 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php index 0cd35b98b33..64a5cb44202 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Helper/Message.php b/app/code/core/Mage/GiftMessage/Helper/Message.php index 635bac47340..a435b9c5163 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Message.php +++ b/app/code/core/Mage/GiftMessage/Helper/Message.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +48,6 @@ class Mage_GiftMessage_Helper_Message extends Mage_Core_Helper_Data * Retrieve old stule edit button html for editing of giftmessage in popup * * @param string $type - * @param Varien_Object $entity * @return string */ public function getButton($type, Varien_Object $entity) @@ -68,7 +67,6 @@ public function getButton($type, Varien_Object $entity) * Retrieve inline giftmessage edit form for specified entity * * @param string $type - * @param Varien_Object $entity * @param bool $dontDisplayContainer * @return string */ @@ -91,7 +89,6 @@ public function getInline($type, Varien_Object $entity, $dontDisplayContainer = * Check availability of giftmessages for specified entity. * * @param string $type - * @param Varien_Object $entity * @param Mage_Core_Model_Store|integer $store * @return bool|int */ @@ -150,7 +147,7 @@ public function isMessagesAvailable($type, Varien_Object $entity, $store = null) } /** - * Check availablity of gift messages from store config if flag eq 2. + * Check availability of gift messages from store config if flag eq 2. * * @param int $productGiftMessageAllow * @param Mage_Core_Model_Store|integer $store @@ -170,7 +167,6 @@ protected function _getDependenceFromStoreConfig($productGiftMessageAllow, $stor * Alias for isMessagesAvailable(...) * * @param string $type - * @param Varien_Object $entity * @param Mage_Core_Model_Store|integer $store * @return bool|int */ @@ -182,7 +178,6 @@ public function getIsMessagesAvailable($type, Varien_Object $entity, $store = nu /** * Retrieve escaped and preformatted gift message text for specified entity * - * @param Varien_Object $entity * @return string|null */ public function getEscapedGiftMessage(Varien_Object $entity) @@ -197,7 +192,6 @@ public function getEscapedGiftMessage(Varien_Object $entity) /** * Retrieve gift message for entity. If message not exists return null * - * @param Varien_Object $entity * @return Mage_GiftMessage_Model_Message */ public function getGiftMessageForEntity(Varien_Object $entity) diff --git a/app/code/core/Mage/GiftMessage/Helper/Url.php b/app/code/core/Mage/GiftMessage/Helper/Url.php index d59a6b08e2b..aa4c56b279c 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Url.php +++ b/app/code/core/Mage/GiftMessage/Helper/Url.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +26,6 @@ class Mage_GiftMessage_Helper_Url extends Mage_Core_Helper_Url /** * Retrieve gift message save url * - * @param Varien_Object $item * @param string $type * @param array $params * @return string diff --git a/app/code/core/Mage/GiftMessage/Model/Api.php b/app/code/core/Mage/GiftMessage/Model/Api.php index edeb794eb00..9c1042a83b3 100644 --- a/app/code/core/Mage/GiftMessage/Model/Api.php +++ b/app/code/core/Mage/GiftMessage/Model/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Message.php b/app/code/core/Mage/GiftMessage/Model/Message.php index ceb55d8fa1a..17b0494bba5 100644 --- a/app/code/core/Mage/GiftMessage/Model/Message.php +++ b/app/code/core/Mage/GiftMessage/Model/Message.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,7 +71,7 @@ public function getEntityModelByType($type) } /** - * Checks thats gift message is empty + * Checks that gift message is empty * * @return bool */ diff --git a/app/code/core/Mage/GiftMessage/Model/Observer.php b/app/code/core/Mage/GiftMessage/Model/Observer.php index 07ce34a51a8..069a967e45d 100644 --- a/app/code/core/Mage/GiftMessage/Model/Observer.php +++ b/app/code/core/Mage/GiftMessage/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_GiftMessage_Model_Observer extends Varien_Object /** * Set gift messages to order item on import item * - * @param Varien_Event_Observer $observer * @return $this */ public function salesEventConvertQuoteItemToOrderItem(Varien_Event_Observer $observer) @@ -48,7 +47,6 @@ public function salesEventConvertQuoteItemToOrderItem(Varien_Event_Observer $obs /** * Set gift messages to order from quote address * - * @param Varien_Event_Observer $observer * @return $this */ public function salesEventConvertQuoteAddressToOrder(Varien_Event_Observer $observer) @@ -63,7 +61,6 @@ public function salesEventConvertQuoteAddressToOrder(Varien_Event_Observer $obse /** * Set gift messages to order from quote address * - * @param Varien_Event_Observer $observer * @return $this */ public function salesEventConvertQuoteToOrder(Varien_Event_Observer $observer) @@ -89,9 +86,8 @@ protected function _getAvailable($product) } /** - * Operate with gift messages on checkout proccess + * Operate with gift messages on checkout process * - * @param Varien_Event_Observer $observer * @return $this */ public function checkoutEventCreateGiftMessage(Varien_Event_Observer $observer) @@ -157,7 +153,6 @@ public function checkoutEventCreateGiftMessage(Varien_Event_Observer $observer) * on catalog products collection load * * @deprecated after 1.4.2.0-beta1 - * @param Varien_Event_Observer $observer * @return $this */ public function catalogEventProductCollectionAfterLoad(Varien_Event_Observer $observer) @@ -168,7 +163,6 @@ public function catalogEventProductCollectionAfterLoad(Varien_Event_Observer $ob /** * Duplicates giftmessage from order to quote on import or reorder * - * @param Varien_Event_Observer $observer * @return $this */ public function salesEventOrderToQuote(Varien_Event_Observer $observer) @@ -197,7 +191,6 @@ public function salesEventOrderToQuote(Varien_Event_Observer $observer) /** * Duplicates giftmessage from order item to quote item on import or reorder * - * @param Varien_Event_Observer $observer * @return $this */ public function salesEventOrderItemToQuoteItem(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php index 5b62f716095..09767cc10c5 100644 --- a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php +++ b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_GoogleAnalytics * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -204,7 +204,7 @@ protected function _getEnhancedEcommerceDataForAnalytics4() if ($productViewed->getAttributeText('manufacturer')) { $_item['item_brand'] = $productViewed->getAttributeText('manufacturer'); } - array_push($eventData['items'], $_item); + $eventData['items'][] = $_item; $result[] = ['view_item', $eventData]; } elseif ($moduleName == 'catalog' && $controllerName == 'category') { // Log this event when the user has been presented with a list of items of a certain category. @@ -241,7 +241,7 @@ protected function _getEnhancedEcommerceDataForAnalytics4() if ($productViewed->getCategory()->getName()) { $_item['item_category'] = $productViewed->getCategory()->getName(); } - array_push($eventData['items'], $_item); + $eventData['items'][] = $_item; $index++; $eventData['value'] += $productViewed->getFinalPrice(); } @@ -274,7 +274,7 @@ protected function _getEnhancedEcommerceDataForAnalytics4() if ($itemCategory) { $_item['item_category'] = $itemCategory; } - array_push($eventData['items'], $_item); + $eventData['items'][] = $_item; $eventData['value'] += $_product->getFinalPrice() * $productInCart->getQty(); } $eventData['value'] = $helper->formatPrice($eventData['value']); @@ -306,7 +306,7 @@ protected function _getEnhancedEcommerceDataForAnalytics4() if ($itemCategory) { $_item['item_category'] = $itemCategory; } - array_push($eventData['items'], $_item); + $eventData['items'][] = $_item; $eventData['value'] += $_product->getFinalPrice(); } $eventData['value'] = $helper->formatPrice($eventData['value']); @@ -352,7 +352,7 @@ protected function _getEnhancedEcommerceDataForAnalytics4() if ($itemCategory) { $_item['item_category'] = $itemCategory; } - array_push($orderData['items'], $_item); + $orderData['items'][] = $_item; } $result[] = ['purchase', $orderData]; } diff --git a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php index b1e98e19f17..7494c799e4c 100644 --- a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php +++ b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_GoogleAnalytics * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -172,7 +172,6 @@ public function isUserIdEnabled($store = null) * Returns last category name * * @param Mage_Catalog_Model_Product $product - * @return string */ public function getLastCategoryName($product): string { @@ -190,7 +189,6 @@ public function getLastCategoryName($product): string /** * @param int|float|string $price - * @return string */ public function formatPrice($price): string { diff --git a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php index 33c0b84aed7..e8211698352 100644 --- a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php +++ b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_GoogleAnalytics * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ class Mage_GoogleAnalytics_Model_Observer { /** * Add order information into GA block to render on checkout success pages - * - * @param Varien_Event_Observer $observer */ public function setGoogleAnalyticsOnOrderSuccessPageView(Varien_Event_Observer $observer) { @@ -40,8 +38,6 @@ public function setGoogleAnalyticsOnOrderSuccessPageView(Varien_Event_Observer $ /** * Process items added or removed from cart for GA4 block to render event on cart view - * @param Varien_Event_Observer $observer - * @return void */ public function processItemsAddedOrRemovedFromCart(Varien_Event_Observer $observer): void { diff --git a/app/code/core/Mage/GoogleCheckout/Model/Payment.php b/app/code/core/Mage/GoogleCheckout/Model/Payment.php index 6e949d988dc..cf37a647278 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Payment.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Payment.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_GoogleCheckout * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +48,6 @@ public function getOrderPlaceRedirectUrl() /** * Authorize * - * @param Varien_Object $payment * @param float $amount * @return void */ @@ -60,7 +59,6 @@ public function authorize(Varien_Object $payment, $amount) /** * Capture payment * - * @param Varien_Object $payment * @param float $amount * @throws Exception * @return void @@ -73,7 +71,6 @@ public function capture(Varien_Object $payment, $amount) /** * Refund money * - * @param Varien_Object $payment * @param float $amount * @throws Exception * @return void @@ -84,7 +81,6 @@ public function refund(Varien_Object $payment, $amount) } /** - * @param Varien_Object $payment * @throws Exception * @return void */ @@ -96,7 +92,6 @@ public function void(Varien_Object $payment) /** * Void payment * - * @param Varien_Object $payment * @throws Exception * @return void */ @@ -121,7 +116,6 @@ public function getConfigData($field, $storeId = null) /** * Check void availability * - * @param Varien_Object $payment * @return bool */ public function canVoid(Varien_Object $payment) diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php index f6ca1175b7a..f6262affcb1 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,7 +52,6 @@ public function __construct() * Date 'from-to' filter HTML. * * @deprecated - * @param Mage_Eav_Model_Entity_Attribute $attribute * @return string */ protected function _getDateFromToHtml(Mage_Eav_Model_Entity_Attribute $attribute) @@ -74,7 +73,6 @@ protected function _getDateFromToHtml(Mage_Eav_Model_Entity_Attribute $attribute * Input text filter HTML. * * @deprecated - * @param Mage_Eav_Model_Entity_Attribute $attribute * @return string */ protected function _getInputHtml(Mage_Eav_Model_Entity_Attribute $attribute) @@ -87,7 +85,6 @@ protected function _getInputHtml(Mage_Eav_Model_Entity_Attribute $attribute) * Multiselect field filter HTML. * * @deprecated - * @param Mage_Eav_Model_Entity_Attribute $attribute * @return string */ protected function _getMultiSelectHtml(Mage_Eav_Model_Entity_Attribute $attribute) @@ -122,7 +119,6 @@ protected function _getMultiSelectHtml(Mage_Eav_Model_Entity_Attribute $attribut * Number 'from-to' field filter HTML. * * @deprecated - * @param Mage_Eav_Model_Entity_Attribute $attribute * @return string */ protected function _getNumberFromToHtml(Mage_Eav_Model_Entity_Attribute $attribute) @@ -139,7 +135,6 @@ protected function _getNumberFromToHtml(Mage_Eav_Model_Entity_Attribute $attribu * Select field filter HTML. * * @deprecated - * @param Mage_Eav_Model_Entity_Attribute $attribute * @return string */ protected function _getSelectHtml(Mage_Eav_Model_Entity_Attribute $attribute) @@ -154,7 +149,7 @@ protected function _getSelectHtml(Mage_Eav_Model_Entity_Attribute $attribute) $options = $attribute->getSource()->getAllOptions(false); } if (($size = count($options))) { - // add empty vaue option + // add empty value option $firstOption = reset($options); if ($firstOption['value'] === '') { @@ -177,7 +172,6 @@ protected function _getSelectHtml(Mage_Eav_Model_Entity_Attribute $attribute) /** * Date 'from-to' filter HTML with values * - * @param Mage_Eav_Model_Entity_Attribute $attribute * @param mixed $value * @return string */ @@ -206,7 +200,6 @@ protected function _getDateFromToHtmlWithValue(Mage_Eav_Model_Entity_Attribute $ /** * Input text filter HTML with value * - * @param Mage_Eav_Model_Entity_Attribute $attribute * @param mixed $value * @return string */ @@ -224,7 +217,6 @@ protected function _getInputHtmlWithValue(Mage_Eav_Model_Entity_Attribute $attri /** * Multiselect field filter HTML with selected values * - * @param Mage_Eav_Model_Entity_Attribute $attribute * @param mixed $value * @return string */ @@ -260,7 +252,6 @@ protected function _getMultiSelectHtmlWithValue(Mage_Eav_Model_Entity_Attribute /** * Number 'from-to' field filter HTML with selected value. * - * @param Mage_Eav_Model_Entity_Attribute $attribute * @param mixed $value * @return string */ @@ -285,7 +276,6 @@ protected function _getNumberFromToHtmlWithValue(Mage_Eav_Model_Entity_Attribute /** * Select field filter HTML with selected value. * - * @param Mage_Eav_Model_Entity_Attribute $attribute * @param mixed $value * @return string */ @@ -301,7 +291,7 @@ protected function _getSelectHtmlWithValue(Mage_Eav_Model_Entity_Attribute $attr $options = $attribute->getSource()->getAllOptions(false); } if (($size = count($options))) { - // add empty vaue option + // add empty value option $firstOption = reset($options); if ($firstOption['value'] === '') { @@ -377,8 +367,6 @@ protected function _prepareColumns() * Create filter fields for 'Filter' column. * * @param mixed $value - * @param Mage_Eav_Model_Entity_Attribute $row - * @param Varien_Object $column * @param bool $isExport * @return string */ @@ -444,7 +432,6 @@ public function getRowUrl($row) /** * Prepare collection by setting page number, sorting etc.. * - * @param Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection * @return Mage_Core_Model_Resource_Db_Collection_Abstract|null */ public function prepareCollection(Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection) diff --git a/app/code/core/Mage/ImportExport/Helper/Data.php b/app/code/core/Mage/ImportExport/Helper/Data.php index 0afc562f314..792d94043b0 100644 --- a/app/code/core/Mage/ImportExport/Helper/Data.php +++ b/app/code/core/Mage/ImportExport/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Abstract.php b/app/code/core/Mage/ImportExport/Model/Abstract.php index ee0aa5a4e26..981da8147f3 100644 --- a/app/code/core/Mage/ImportExport/Model/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,14 +32,14 @@ abstract class Mage_ImportExport_Model_Abstract extends Varien_Object public const LOG_DIRECTORY = 'log/import_export/'; /** - * Enable loging + * Enable logging * * @var bool */ protected $_debugMode = false; /** - * Loger instance + * Logger instance * @var Mage_Core_Model_Log_Adapter */ protected $_logInstance; diff --git a/app/code/core/Mage/ImportExport/Model/Export.php b/app/code/core/Mage/ImportExport/Model/Export.php index a8bf61d1cd3..998b00800be 100644 --- a/app/code/core/Mage/ImportExport/Model/Export.php +++ b/app/code/core/Mage/ImportExport/Model/Export.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -208,7 +208,6 @@ public function exportFile() /** * Clean up already loaded attribute collection. * - * @param Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection * @return Mage_Eav_Model_Resource_Entity_Attribute_Collection */ public function filterAttributeCollection(Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection) @@ -220,7 +219,6 @@ public function filterAttributeCollection(Mage_Eav_Model_Resource_Entity_Attribu * Determine filter type for specified attribute. * * @static - * @param Mage_Eav_Model_Entity_Attribute $attribute * @throws Exception * @return string */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php index b670fcd58be..4624b7b19a4 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -135,7 +135,6 @@ public function getRowsCount() /** * Set column names. * - * @param array $headerCols * @throws Exception * @return Mage_ImportExport_Model_Export_Adapter_Abstract */ @@ -165,7 +164,6 @@ public function getDestination() /** * Write row data to source file. * - * @param array $rowData * @return Mage_ImportExport_Model_Export_Adapter_Abstract */ abstract public function writeRow(array $rowData); diff --git a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php index 32c28990f63..cb6d77a2ad4 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +56,7 @@ public function destruct() } /** - * Method called as last step of object instance creation. Can be overrided in child classes. + * Method called as last step of object instance creation. Can be overridden in child classes. * * @return Mage_ImportExport_Model_Export_Adapter_Abstract */ @@ -89,7 +89,6 @@ public function getFileExtension() /** * Write row data to source file. * - * @param array $rowData * @throws Exception * @return Mage_ImportExport_Model_Export_Adapter_Abstract */ @@ -100,7 +99,7 @@ public function writeRow(array $rowData) } /** - * Security enchancement for CSV data processing by Excel-like applications. + * Security enhancement for CSV data processing by Excel-like applications. * @see https://bugzilla.mozilla.org/show_bug.cgi?id=1054702 */ $data = array_merge($this->_headerCols, array_intersect_key($rowData, $this->_headerCols)); diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php index ed2d8ecfc29..38d48cc3b29 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -251,7 +251,6 @@ protected function _initAttrValues() /** * Apply filter to collection and add not skipped attributes to select. * - * @param Mage_Eav_Model_Entity_Collection_Abstract $collection * @return Mage_Eav_Model_Entity_Collection_Abstract */ protected function _prepareEntityCollection(Mage_Eav_Model_Entity_Collection_Abstract $collection) @@ -373,7 +372,6 @@ abstract public function exportFile(); /** * Clean up attribute collection. * - * @param Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection * @return Mage_Eav_Model_Resource_Entity_Attribute_Collection */ public function filterAttributeCollection(Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection) @@ -398,7 +396,6 @@ abstract public function getAttributeCollection(); /** * Returns attributes all values in label-value or value-value pairs form. Labels are lower-cased. * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return array */ public function getAttributeOptions(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) @@ -520,7 +517,6 @@ public function getWriter() /** * Set parameters. * - * @param array $parameters * @return Mage_ImportExport_Model_Export_Entity_Abstract */ public function setParameters(array $parameters) @@ -533,7 +529,6 @@ public function setParameters(array $parameters) /** * Writer model setter. * - * @param Mage_ImportExport_Model_Export_Adapter_Abstract $writer * @return Mage_ImportExport_Model_Export_Entity_Abstract */ public function setWriter(Mage_ImportExport_Model_Export_Adapter_Abstract $writer) diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php index c42da8bb36f..43a21289a11 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,7 +32,7 @@ class Mage_ImportExport_Model_Export_Entity_Customer extends Mage_ImportExport_M public const COL_STORE = '_store'; /** - * Overriden attributes parameters. + * Overridden attributes parameters. * * @var array */ @@ -88,7 +88,6 @@ protected function _initWebsites() /** * Apply filter to collection and add not skipped attributes to select. * - * @param Mage_Eav_Model_Entity_Collection_Abstract $collection * @return Mage_Eav_Model_Entity_Collection_Abstract */ protected function _prepareEntityCollection(Mage_Eav_Model_Entity_Collection_Abstract $collection) @@ -307,7 +306,6 @@ protected function _getNextAddressRow(&$customerAddress) /** * Clean up already loaded attribute collection. * - * @param Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection * @return Mage_Eav_Model_Resource_Entity_Attribute_Collection */ public function filterAttributeCollection(Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection) diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php index 1ecb2e87b92..996469ac27d 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -208,7 +208,6 @@ protected function _initWebsites() /** * Prepare products tier prices * - * @param array $productIds * @return array */ protected function _prepareTierPrices(array $productIds) @@ -241,7 +240,6 @@ protected function _prepareTierPrices(array $productIds) /** * Prepare products group prices * - * @param array $productIds * @return array */ protected function _prepareGroupPrices(array $productIds) @@ -274,7 +272,6 @@ protected function _prepareGroupPrices(array $productIds) /** * Prepare products media gallery * - * @param array $productIds * @return array */ protected function _prepareMediaGallery(array $productIds) @@ -316,7 +313,6 @@ protected function _prepareMediaGallery(array $productIds) /** * Prepare catalog inventory * - * @param array $productIds * @return array */ protected function _prepareCatalogInventory(array $productIds) @@ -347,7 +343,6 @@ protected function _prepareCatalogInventory(array $productIds) /** * Prepare product links * - * @param array $productIds * @return array */ protected function _prepareLinks(array $productIds) @@ -422,7 +417,6 @@ protected function _prepareLinks(array $productIds) * * @deprecated since 1.6.1.0 * @see Mage_Catalog_Model_Resource_Product_Type_Configurable::getConfigurableOptions() - * @param array $productIds * @return array */ protected function _prepareConfigurableProductData(array $productIds) @@ -456,7 +450,6 @@ protected function _prepareConfigurableProductData(array $productIds) * * @deprecated since 1.6.1.0 * @see Mage_Catalog_Model_Resource_Product_Type_Configurable::getConfigurableOptions() - * @param array $productIds * @return array */ protected function _prepareConfigurableProductPrice(array $productIds) @@ -1057,7 +1050,6 @@ protected function _prepareExport() /** * Clean up already loaded attribute collection. * - * @param Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection * @return Mage_Eav_Model_Resource_Entity_Attribute_Collection */ public function filterAttributeCollection(Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection) diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php index 1bb73192b07..57bf45cec9e 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ abstract class Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract { /** - * Overriden attributes parameters. + * Overridden attributes parameters. * * @var array */ @@ -75,7 +75,6 @@ public function isSuitable() /** * Add additional data to attribute. * - * @param Mage_Catalog_Model_Resource_Eav_Attribute $attribute * @return bool */ public function overrideAttribute(Mage_Catalog_Model_Resource_Eav_Attribute $attribute) diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php index 56a91ef30c4..340808890a0 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_ImportExport_Model_Export_Entity_Product_Type_Simple extends Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract { /** - * Overriden attributes parameters. + * Overridden attributes parameters. * * @var array */ diff --git a/app/code/core/Mage/ImportExport/Model/Import.php b/app/code/core/Mage/ImportExport/Model/Import.php index 2644486fa14..ca034c5e3bb 100644 --- a/app/code/core/Mage/ImportExport/Model/Import.php +++ b/app/code/core/Mage/ImportExport/Model/Import.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -169,7 +169,6 @@ public function getOperationResultMessages($validationResult) /** * Get attribute type for upcoming validation. * - * @param Mage_Eav_Model_Entity_Attribute $attribute * @return string */ public static function getAttributeType(Mage_Eav_Model_Entity_Attribute $attribute) diff --git a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php index 5e51c4e3e72..09c3520bd70 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php index 1ee82122c41..1cb222bf142 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,7 +53,7 @@ public function destruct() } /** - * Method called as last step of object instance creation. Can be overrided in child classes. + * Method called as last step of object instance creation. Can be overridden in child classes. * * @return Mage_ImportExport_Model_Import_Adapter_Abstract */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php index 6b1b8221b83..0088896a6a1 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -216,7 +216,6 @@ abstract protected function _importData(); /** * Returns boolean TRUE if row scope is default (fundamental) scope. * - * @param array $rowData * @return bool */ protected function _isRowScopeDefault(array $rowData) @@ -227,7 +226,6 @@ protected function _isRowScopeDefault(array $rowData) /** * Change row data before saving in DB table. * - * @param array $rowData * @return array */ protected function _prepareRowForDb(array $rowData) @@ -339,7 +337,6 @@ public function addMessageTemplate($errorCode, $message) /** * Returns attributes all values in label-value or value-value pairs form. Labels are lower-cased. * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param array $indexValAttrs OPTIONAL Additional attributes' codes with index values. * @return array */ @@ -603,7 +600,6 @@ public function isImportAllowed() /** * Returns TRUE if row is valid and not in skipped rows array. * - * @param array $rowData * @param int $rowNum * @return bool */ @@ -615,7 +611,6 @@ public function isRowAllowedToImport(array $rowData, $rowNum) /** * Validate data row. * - * @param array $rowData * @param int $rowNum * @return bool */ @@ -624,7 +619,6 @@ abstract public function validateRow(array $rowData, $rowNum); /** * Set data from outside to change behavior. I.e. for setting some default parameters etc. * - * @param array $params * @return Mage_ImportExport_Model_Import_Entity_Abstract */ public function setParameters(array $params) @@ -636,7 +630,6 @@ public function setParameters(array $params) /** * Source model setter. * - * @param Mage_ImportExport_Model_Import_Adapter_Abstract $source * @return Mage_ImportExport_Model_Import_Entity_Abstract */ public function setSource(Mage_ImportExport_Model_Import_Adapter_Abstract $source) diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php index a80445efc8b..03268b870e2 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -147,7 +147,7 @@ class Mage_ImportExport_Model_Import_Entity_Customer extends Mage_ImportExport_M ]; /** - * Dry-runned customers information from import file. + * Dry-ran customers information from import file. * * @var array */ @@ -465,7 +465,6 @@ protected function _saveCustomers() /** * Save customer attributes. * - * @param array $attributesData * @return $this */ protected function _saveCustomerAttributes(array $attributesData) @@ -542,7 +541,6 @@ public function getEntityTypeCode() /** * Obtain scope of the row from row data. * - * @param array $rowData * @return int */ public function getRowScope(array $rowData) @@ -579,7 +577,6 @@ public function isAttributeParticular($attrCode) /** * Validate data row. * - * @param array $rowData * @param int $rowNum * @return bool */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php index 43098a63235..79e074f6e74 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -121,9 +121,6 @@ class Mage_ImportExport_Model_Import_Entity_Customer_Address extends Mage_Import */ protected $_regions = []; - /** - * @param Mage_ImportExport_Model_Import_Entity_Customer $customer - */ public function __construct(Mage_ImportExport_Model_Import_Entity_Customer $customer) { parent::__construct(); @@ -322,7 +319,6 @@ protected function _initCountryRegions() /** * Check address data availability in row data. * - * @param array $rowData * @return bool */ protected function _isRowWithAddress(array $rowData) @@ -338,7 +334,6 @@ protected function _isRowWithAddress(array $rowData) /** * Save customer address attributes. * - * @param array $attributesData * @return $this */ protected function _saveAddressAttributes(array $attributesData) @@ -389,7 +384,6 @@ protected function _saveAddressEntity(array $entityRows) /** * Save customer default addresses. * - * @param array $defaults * @return $this */ protected function _saveCustomerDefaults(array $defaults) @@ -459,7 +453,6 @@ public function isAttributeParticular($attrCode) /** * Validate data row. * - * @param array $rowData * @param int $rowNum * @return bool */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php index ce5f1e8327f..96738d29d8d 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -310,7 +310,7 @@ class Mage_ImportExport_Model_Import_Entity_Product extends Mage_ImportExport_Mo ]; /** - * Dry-runned products information from import file. + * Dry-ran products information from import file. * * [SKU] => array( * 'type_id' => (string) product type @@ -631,7 +631,6 @@ protected function _initWebsites() /** * Check product category validity. * - * @param array $rowData * @param int $rowNum * @return bool */ @@ -654,7 +653,6 @@ protected function _isProductCategoryValid(array $rowData, $rowNum) /** * Check product website belonging. * - * @param array $rowData * @param int $rowNum * @return bool */ @@ -671,7 +669,6 @@ protected function _isProductWebsiteValid(array $rowData, $rowNum) * Set valid attribute set and product type to rows with all scopes * to ensure that existing products doesn't changed. * - * @param array $rowData * @return array */ protected function _prepareRowForDb(array $rowData) @@ -697,7 +694,6 @@ protected function _prepareRowForDb(array $rowData) /** * Check tier price data validity. * - * @param array $rowData * @param int $rowNum * @return bool */ @@ -736,7 +732,6 @@ protected function _isTierPriceValid(array $rowData, $rowNum) /** * Check group price data validity. * - * @param array $rowData * @param int $rowNum * @return bool */ @@ -791,7 +786,6 @@ protected function _isSuperProductsSkuValid($rowData, $rowNum) /** * Check product sku data. * - * @param array $rowData * @param int $rowNum * @return bool */ @@ -1228,7 +1222,6 @@ protected function _saveLinks() /** * Save product attributes. * - * @param array $attributesData * @return $this */ protected function _saveProductAttributes(array $attributesData) @@ -1276,7 +1269,6 @@ protected function _saveProductAttributes(array $attributesData) /** * Save product categories. * - * @param array $categoriesData * @return $this */ protected function _saveProductCategories(array $categoriesData) @@ -1605,7 +1597,6 @@ protected function _prepareAttributes($rowData, $rowScope, $attributes, $rowSku, /** * Save product tier prices. * - * @param array $tierPriceData * @return $this */ protected function _saveProductTierPrices(array $tierPriceData) @@ -1645,7 +1636,6 @@ protected function _saveProductTierPrices(array $tierPriceData) /** * Save product group prices. * - * @param array $groupPriceData * @return $this */ protected function _saveProductGroupPrices(array $groupPriceData) @@ -1727,7 +1717,6 @@ protected function _uploadMediaFiles($fileName) /** * Save product media gallery. * - * @param array $mediaGalleryData * @return $this */ protected function _saveMediaGallery(array $mediaGalleryData) @@ -1809,7 +1798,6 @@ protected function _saveMediaGallery(array $mediaGalleryData) /** * Save product websites. * - * @param array $websiteData * @return $this */ protected function _saveProductWebsites(array $websiteData) @@ -1984,7 +1972,7 @@ protected function _filterRowData(&$rowData) } /** - * Atttribute set ID-to-name pairs getter. + * Attribute set ID-to-name pairs getter. * * @return array */ @@ -2047,7 +2035,6 @@ public function getOldSku() /** * Obtain scope of the row from row data. * - * @param array $rowData * @return int */ public function getRowScope(array $rowData) @@ -2074,7 +2061,6 @@ public function getWebsiteCodes() /** * Validate data row. * - * @param array $rowData * @param int $rowNum * @return bool */ @@ -2109,7 +2095,7 @@ public function validateRow(array $rowData, $rowNum) $sku = $rowData[self::COL_SKU]; - if (isset($this->_oldSku[$sku])) { // can we get all necessary data from existant DB product? + if (isset($this->_oldSku[$sku])) { // can we get all necessary data from existent DB product? // check for supported type of existing product if (isset($this->_productTypeModels[$this->_oldSku[$sku]['type_id']])) { $this->_newSku[$sku] = [ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php index 37f553b1843..c1ea4f9c870 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -83,7 +83,6 @@ abstract class Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract /** * Object constructor. * - * @param array $params * @throws Exception */ final public function __construct(array $params) @@ -199,7 +198,6 @@ protected function _isAttributeRequiredCheckNeeded($attrCode) /** * Validate particular attributes columns. * - * @param array $rowData * @param int $rowNum * @return bool */ @@ -232,7 +230,6 @@ public function getParticularAttributes() /** * Validate row attributes. Pass VALID row data ONLY as argument. * - * @param array $rowData * @param int $rowNum * @param bool $isNewProduct OPTIONAL. * @return bool @@ -283,7 +280,6 @@ public function isSuitable() /** * Prepare attributes values for save: remove non-existent, remove empty values, remove static. * - * @param array $rowData * @param bool $withDefaultValue * @return array */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php index 30e2a985720..4e8a4b17458 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -124,7 +124,7 @@ class Mage_ImportExport_Model_Import_Entity_Product_Type_Configurable extends Ma */ protected function _addAttributeParams($attrSetName, array $attrParams) { - // save super attributes for simplier and quicker search in future + // save super attributes for simpler and quicker search in future if ($attrParams['type'] === 'select' && $attrParams['is_global'] == 1 && $attrParams['for_configurable']) { $this->_superAttributes[$attrParams['code']] = $attrParams; } @@ -168,7 +168,6 @@ protected function _isAttributeSuper($attrCode) /** * Validate particular attributes columns. * - * @param array $rowData * @param int $rowNum * @return bool */ @@ -283,8 +282,6 @@ protected function _loadSkuSuperData() /** * Validate and prepare data about super attributes and associated products. * - * @param array $superData - * @param array $superAttributes * @return $this */ protected function _processSuperData(array $superData, array &$superAttributes) diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php index a01916f0b96..c6cf2dce2b3 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php index b0be1fcf692..3be8658c98c 100644 --- a/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php b/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php index ed757829ee3..4322049a38e 100644 --- a/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php +++ b/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -132,7 +132,6 @@ public function getNextBunch() * * @param string $entity * @param string $behavior - * @param array $data * @return int */ public function saveBunch($entity, $behavior, array $data) diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php index 43288f8c1b5..438497e8440 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php @@ -45,7 +45,7 @@ protected function _initAction() { $this->_title($this->__('Import/Export')) ->loadLayout() - ->_setActiveMenu('system/importexport'); + ->_setActiveMenu('system/convert/export'); return $this; } diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php index 880bcb549e6..3575a00b47b 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php @@ -45,7 +45,7 @@ protected function _initAction() { $this->_title($this->__('Import/Export')) ->loadLayout() - ->_setActiveMenu('system/importexport'); + ->_setActiveMenu('system/convert/import'); return $this; } diff --git a/app/code/core/Mage/Index/Model/Event.php b/app/code/core/Mage/Index/Model/Event.php index d4dc4468a17..45a47e5d4f8 100644 --- a/app/code/core/Mage/Index/Model/Event.php +++ b/app/code/core/Mage/Index/Model/Event.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Indexer.php b/app/code/core/Mage/Index/Model/Indexer.php index a015f368233..8bcf59adac1 100644 --- a/app/code/core/Mage/Index/Model/Indexer.php +++ b/app/code/core/Mage/Index/Model/Indexer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -114,7 +114,6 @@ public function getProcessByCode($code) /** * Function returns array of indexer's process with order by sort_order field * - * @param array $codes * @return array */ public function getProcessesCollectionByCodes(array $codes) @@ -230,7 +229,6 @@ public function indexEvents($entity = null, $type = null) /** * Index one event by all processes * - * @param Mage_Index_Model_Event $event * @return Mage_Index_Model_Indexer */ public function indexEvent(Mage_Index_Model_Event $event) @@ -242,7 +240,6 @@ public function indexEvent(Mage_Index_Model_Event $event) /** * Register event in each indexing process process * - * @param Mage_Index_Model_Event $event * @return $this */ public function registerEvent(Mage_Index_Model_Event $event) @@ -254,7 +251,6 @@ public function registerEvent(Mage_Index_Model_Event $event) /** * Create new event log and register event in all processes * - * @param Varien_Object $entity * @param string $entityType * @param string $eventType * @param bool $doSave @@ -279,10 +275,8 @@ public function logEvent(Varien_Object $entity, $entityType, $eventType, $doSave * Create new event log and register event in all processes. * Initiate events indexing procedure. * - * @param Varien_Object $entity * @param string $entityType * @param string $eventType - * @return Mage_Index_Model_Indexer * @throws Exception|Throwable */ public function processEntityAction(Varien_Object $entity, $entityType, $eventType): Mage_Index_Model_Indexer diff --git a/app/code/core/Mage/Index/Model/Indexer/Abstract.php b/app/code/core/Mage/Index/Model/Indexer/Abstract.php index 83bd393a651..4dec7164abc 100644 --- a/app/code/core/Mage/Index/Model/Indexer/Abstract.php +++ b/app/code/core/Mage/Index/Model/Indexer/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,22 +60,17 @@ public function getDescription() /** * Register indexer required data inside event object - * - * @param Mage_Index_Model_Event $event */ abstract protected function _registerEvent(Mage_Index_Model_Event $event); /** * Process event based on event state data - * - * @param Mage_Index_Model_Event $event */ abstract protected function _processEvent(Mage_Index_Model_Event $event); /** * Register data required by process in event object * - * @param Mage_Index_Model_Event $event * @return Mage_Index_Model_Indexer_Abstract */ public function register(Mage_Index_Model_Event $event) @@ -89,7 +84,6 @@ public function register(Mage_Index_Model_Event $event) /** * Process event * - * @param Mage_Index_Model_Event $event * @return Mage_Index_Model_Indexer_Abstract */ public function processEvent(Mage_Index_Model_Event $event) @@ -103,7 +97,6 @@ public function processEvent(Mage_Index_Model_Event $event) /** * Check if event can be matched by process * - * @param Mage_Index_Model_Event $event * @return bool */ public function matchEvent(Mage_Index_Model_Event $event) @@ -142,7 +135,6 @@ public function reindexAll() * Try dynamically detect and call event handler from resource model. * Handler name will be generated from event entity and type code * - * @param Mage_Index_Model_Event $event * @return Mage_Index_Model_Indexer_Abstract */ public function callEventHandler(Mage_Index_Model_Event $event) diff --git a/app/code/core/Mage/Index/Model/Observer.php b/app/code/core/Mage/Index/Model/Observer.php index 2a016c35137..20507c52e86 100644 --- a/app/code/core/Mage/Index/Model/Observer.php +++ b/app/code/core/Mage/Index/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,7 +37,6 @@ public function __construct() /** * Store after commit observer. Process store related indexes * - * @param Varien_Event_Observer $observer * @throws Throwable */ public function processStoreSave(Varien_Event_Observer $observer) @@ -53,7 +52,6 @@ public function processStoreSave(Varien_Event_Observer $observer) /** * Store group after commit observer. Process store group related indexes * - * @param Varien_Event_Observer $observer * @throws Throwable */ public function processStoreGroupSave(Varien_Event_Observer $observer) @@ -69,7 +67,6 @@ public function processStoreGroupSave(Varien_Event_Observer $observer) /** * Website save after commit observer. Process website related indexes * - * @param Varien_Event_Observer $observer * @throws Throwable */ public function processWebsiteSave(Varien_Event_Observer $observer) @@ -85,7 +82,6 @@ public function processWebsiteSave(Varien_Event_Observer $observer) /** * Store after commit observer. Process store related indexes * - * @param Varien_Event_Observer $observer * @throws Throwable */ public function processStoreDelete(Varien_Event_Observer $observer) @@ -101,7 +97,6 @@ public function processStoreDelete(Varien_Event_Observer $observer) /** * Store group after commit observer. Process store group related indexes * - * @param Varien_Event_Observer $observer * @throws Throwable */ public function processStoreGroupDelete(Varien_Event_Observer $observer) @@ -117,7 +112,6 @@ public function processStoreGroupDelete(Varien_Event_Observer $observer) /** * Website save after commit observer. Process website related indexes * - * @param Varien_Event_Observer $observer * @throws Throwable */ public function processWebsiteDelete(Varien_Event_Observer $observer) @@ -133,7 +127,6 @@ public function processWebsiteDelete(Varien_Event_Observer $observer) /** * Config data after commit observer. * - * @param Varien_Event_Observer $observer * @throws Throwable */ public function processConfigDataSave(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Index/Model/Process.php b/app/code/core/Mage/Index/Model/Process.php index 44745cc9824..88efd996cd3 100644 --- a/app/code/core/Mage/Index/Model/Process.php +++ b/app/code/core/Mage/Index/Model/Process.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -93,7 +93,6 @@ protected function _construct() /** * Set indexer class name as data namespace for event object * - * @param Mage_Index_Model_Event $event * @return $this */ protected function _setEventNamespace(Mage_Index_Model_Event $event) @@ -120,7 +119,6 @@ protected function _resetEventNamespace($event) /** * Register data required by process in event object * - * @param Mage_Index_Model_Event $event * @return $this */ public function register(Mage_Index_Model_Event $event) @@ -140,7 +138,6 @@ public function register(Mage_Index_Model_Event $event) /** * Check if event can be matched by process * - * @param Mage_Index_Model_Event $event * @return bool */ public function matchEvent(Mage_Index_Model_Event $event) @@ -251,7 +248,6 @@ public function reindexEverything() /** * Process event with assigned indexer object * - * @param Mage_Index_Model_Event $event * @return $this */ public function processEvent(Mage_Index_Model_Event $event) @@ -359,7 +355,6 @@ public function indexEvents($entity = null, $type = null) /** * Process all events of the collection * - * @param Mage_Index_Model_Resource_Event_Collection $eventsCollection * @param bool $skipUnmatched * @return $this */ @@ -389,7 +384,6 @@ protected function _processEventsCollection( /** * Update status process/event association * - * @param Mage_Index_Model_Event $event * @param string $status * @return $this */ @@ -424,7 +418,7 @@ protected function _getLockInstance() /** * Lock process without blocking. - * This method allow protect multiple process runing and fast lock validation. + * This method allow to protect multiple process running and fast lock validation. * * @return $this */ @@ -593,7 +587,6 @@ public function enableIndexerKeys() /** * Process event with locks checking * - * @param Mage_Index_Model_Event $event * @return $this */ public function safeProcessEvent(Mage_Index_Model_Event $event) diff --git a/app/code/core/Mage/Index/Model/Resource/Abstract.php b/app/code/core/Mage/Index/Model/Resource/Abstract.php index 1eb6f7aa17f..60572150757 100644 --- a/app/code/core/Mage/Index/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Index/Model/Resource/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -150,7 +150,6 @@ public function insertFromTable($sourceTable, $destTable, $readToIndex = true) * * @param Varien_Db_Select $select * @param string $destTable - * @param array $columns * @param bool $readToIndex data migration direction (true - read=>index, false - index=>read) * @return Mage_Index_Model_Resource_Abstract */ diff --git a/app/code/core/Mage/Index/Model/Resource/Helper/Lock/Interface.php b/app/code/core/Mage/Index/Model/Resource/Helper/Lock/Interface.php index b42d8bcf16c..822ac87a885 100644 --- a/app/code/core/Mage/Index/Model/Resource/Helper/Lock/Interface.php +++ b/app/code/core/Mage/Index/Model/Resource/Helper/Lock/Interface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,7 +51,6 @@ public function releaseLock($name); public function isLocked($name); /** - * @param Varien_Db_Adapter_Interface $adapter * @return $this */ public function setWriteAdapter(Varien_Db_Adapter_Interface $adapter); diff --git a/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php index 0521f99f784..4a91d8273fe 100644 --- a/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,7 +71,6 @@ public function isLocked($name) } /** - * @param Varien_Db_Adapter_Interface $adapter * @return $this */ public function setWriteAdapter(Varien_Db_Adapter_Interface $adapter) diff --git a/app/code/core/Mage/Index/Model/Resource/Process.php b/app/code/core/Mage/Index/Model/Resource/Process.php index 43164e43aae..a2d3fdfbe73 100644 --- a/app/code/core/Mage/Index/Model/Resource/Process.php +++ b/app/code/core/Mage/Index/Model/Resource/Process.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +48,6 @@ public function updateEventStatus($processId, $eventId, $status) /** * Register process end * - * @param Mage_Index_Model_Process $process * @return $this */ public function endProcess(Mage_Index_Model_Process $process) @@ -64,7 +63,6 @@ public function endProcess(Mage_Index_Model_Process $process) /** * Register process start * - * @param Mage_Index_Model_Process $process * @return $this */ public function startProcess(Mage_Index_Model_Process $process) @@ -80,7 +78,6 @@ public function startProcess(Mage_Index_Model_Process $process) /** * Register process fail * - * @param Mage_Index_Model_Process $process * @return $this */ public function failProcess(Mage_Index_Model_Process $process) @@ -125,7 +122,6 @@ protected function _updateProcessData($processId, $data) /** * Update process start date * - * @param Mage_Index_Model_Process $process * @return $this */ public function updateProcessStartDate(Mage_Index_Model_Process $process) @@ -137,7 +133,6 @@ public function updateProcessStartDate(Mage_Index_Model_Process $process) /** * Update process end date * - * @param Mage_Index_Model_Process $process * @return $this */ public function updateProcessEndDate(Mage_Index_Model_Process $process) diff --git a/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php index f93f1e39dc7..bc96028993a 100644 --- a/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php +++ b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php @@ -71,6 +71,7 @@ public function editAction() Mage::register('current_index_process', $process); $this->loadLayout(); + $this->_setActiveMenu('system/index'); $this->renderLayout(); } else { $this->_getSession()->addError( diff --git a/app/code/core/Mage/Install/Block/Begin.php b/app/code/core/Mage/Install/Block/Begin.php index a9e8c8d30c6..1265f7e1e11 100644 --- a/app/code/core/Mage/Install/Block/Begin.php +++ b/app/code/core/Mage/Install/Block/Begin.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Db/Main.php b/app/code/core/Mage/Install/Block/Db/Main.php index 25791d2f5f8..d741e4eaee8 100644 --- a/app/code/core/Mage/Install/Block/Db/Main.php +++ b/app/code/core/Mage/Install/Block/Db/Main.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer.php b/app/code/core/Mage/Install/Model/Installer.php index 67a1cf5fa2f..0edb53d7a59 100644 --- a/app/code/core/Mage/Install/Model/Installer.php +++ b/app/code/core/Mage/Install/Model/Installer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -205,7 +205,7 @@ public function validateAndPrepareAdministrator($data) /** * Create admin user. - * Paramater can be prepared user model or array of data. + * Parameter can be prepared user model or array of data. * Returns TRUE or throws exception. * * @param mixed $data diff --git a/app/code/core/Mage/Install/Model/Installer/Console.php b/app/code/core/Mage/Install/Model/Installer/Console.php index 7c31a5007ab..f33ca1e4e5a 100644 --- a/app/code/core/Mage/Install/Model/Installer/Console.php +++ b/app/code/core/Mage/Install/Model/Installer/Console.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -109,7 +109,7 @@ public function setArgs($args = null) if (preg_match('/^--(.*)$/', $arg, $match)) { // argument name $currentArg = $match[1]; - // in case if argument doen't need a value + // in case if argument doesn't need a value $args[$currentArg] = true; } else { // argument value @@ -235,7 +235,6 @@ public function getEncryptionKey() /** * Init installation * - * @param Mage_Core_Model_App $app * @return bool */ public function init(Mage_Core_Model_App $app) @@ -255,7 +254,7 @@ public function init(Mage_Core_Model_App $app) } /** - * Prepare data ans save it in data model + * Prepare data and save it in data model * * @return $this */ diff --git a/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php b/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php index 33b6de0c2ea..cdafb8c4556 100644 --- a/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php +++ b/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Observer.php b/app/code/core/Mage/Install/Model/Observer.php index 2b679c6cf66..bf1e3f7f0ef 100644 --- a/app/code/core/Mage/Install/Model/Observer.php +++ b/app/code/core/Mage/Install/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Wizard.php b/app/code/core/Mage/Install/Model/Wizard.php index 0d5beaa37fe..760f0758559 100644 --- a/app/code/core/Mage/Install/Model/Wizard.php +++ b/app/code/core/Mage/Install/Model/Wizard.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +59,6 @@ public function __construct() /** * Get wizard step by request * - * @param Zend_Controller_Request_Abstract $request * @return Varien_Object | false */ public function getStepByRequest(Zend_Controller_Request_Abstract $request) diff --git a/app/code/core/Mage/Install/controllers/IndexController.php b/app/code/core/Mage/Install/controllers/IndexController.php index 9d3615ca569..791167311ec 100644 --- a/app/code/core/Mage/Install/controllers/IndexController.php +++ b/app/code/core/Mage/Install/controllers/IndexController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/controllers/WizardController.php b/app/code/core/Mage/Install/controllers/WizardController.php index 2ba8864f8f4..6ecfbe1612c 100644 --- a/app/code/core/Mage/Install/controllers/WizardController.php +++ b/app/code/core/Mage/Install/controllers/WizardController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -275,7 +275,7 @@ public function administratorAction() } /** - * Process administrator instalation POST data + * Process administrator installation POST data */ public function administratorPostAction() { diff --git a/app/code/core/Mage/Install/etc/config.xml b/app/code/core/Mage/Install/etc/config.xml index b0de4dcd4c1..928921abde9 100644 --- a/app/code/core/Mage/Install/etc/config.xml +++ b/app/code/core/Mage/Install/etc/config.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Log/Helper/Data.php b/app/code/core/Mage/Log/Helper/Data.php index 263f75a22c9..0d22611388f 100644 --- a/app/code/core/Mage/Log/Helper/Data.php +++ b/app/code/core/Mage/Log/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,7 +37,6 @@ class Mage_Log_Helper_Data extends Mage_Core_Helper_Abstract /** * Mage_Log_Helper_Data constructor. - * @param array $data */ public function __construct(array $data = []) { diff --git a/app/code/core/Mage/Log/Model/Adminhtml/System/Config/Source/Loglevel.php b/app/code/core/Mage/Log/Model/Adminhtml/System/Config/Source/Loglevel.php index 7ecdf4cdd65..f2abc522d44 100644 --- a/app/code/core/Mage/Log/Model/Adminhtml/System/Config/Source/Loglevel.php +++ b/app/code/core/Mage/Log/Model/Adminhtml/System/Config/Source/Loglevel.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,7 +44,6 @@ class Mage_Log_Model_Adminhtml_System_Config_Source_Loglevel /** * Mage_Log_Model_Adminhtml_System_Config_Source_Loglevel constructor. - * @param array $data */ public function __construct(array $data = []) { diff --git a/app/code/core/Mage/Log/Model/Aggregation.php b/app/code/core/Mage/Log/Model/Aggregation.php index 6fcaf7de95d..90e3d8d1de6 100644 --- a/app/code/core/Mage/Log/Model/Aggregation.php +++ b/app/code/core/Mage/Log/Model/Aggregation.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Log.php b/app/code/core/Mage/Log/Model/Log.php index fb4b0c2d6ed..4b2caa90a54 100644 --- a/app/code/core/Mage/Log/Model/Log.php +++ b/app/code/core/Mage/Log/Model/Log.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Resource/Log.php b/app/code/core/Mage/Log/Model/Resource/Log.php index 2fbda32293b..4bb32a3a388 100644 --- a/app/code/core/Mage/Log/Model/Resource/Log.php +++ b/app/code/core/Mage/Log/Model/Resource/Log.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Clean logs * - * @param Mage_Log_Model_Log $object * @return $this */ public function clean(Mage_Log_Model_Log $object) diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor.php b/app/code/core/Mage/Log/Model/Resource/Visitor.php index def15373058..6e388a50b43 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,7 +30,6 @@ class Mage_Log_Model_Resource_Visitor extends Mage_Core_Model_Resource_Db_Abstra /** * Mage_Log_Model_Resource_Visitor constructor. - * @param array $data */ public function __construct(array $data = []) { @@ -46,7 +45,6 @@ protected function _construct() /** * Prepare data for save * - * @param Mage_Core_Model_Abstract|Mage_Log_Model_Visitor $visitor * @return array */ protected function _prepareDataForSave(Mage_Core_Model_Abstract $visitor) @@ -85,7 +83,6 @@ protected function _saveUrlInfo($visitor) /** * Save url info before save * - * @param Mage_Core_Model_Abstract|Mage_Log_Model_Visitor $visitor * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $visitor) @@ -102,7 +99,6 @@ protected function _beforeSave(Mage_Core_Model_Abstract $visitor) /** * Actions after save * - * @param Mage_Core_Model_Abstract|Mage_Log_Model_Visitor $visitor * @return $this */ protected function _afterSave(Mage_Core_Model_Abstract $visitor) @@ -134,7 +130,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $visitor) /** * Perform actions after object load * - * @param Mage_Core_Model_Abstract|Mage_Log_Model_Visitor $object * @return $this */ protected function _afterLoad(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php b/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php index 3a2cd348cc3..5524a5e37db 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Prepare online visitors for collection * - * @param Mage_Log_Model_Visitor_Online $object * @return $this */ public function prepare(Mage_Log_Model_Visitor_Online $object) diff --git a/app/code/core/Mage/Log/Model/Visitor.php b/app/code/core/Mage/Log/Model/Visitor.php index b8314b038d3..12b43827ee4 100644 --- a/app/code/core/Mage/Log/Model/Visitor.php +++ b/app/code/core/Mage/Log/Model/Visitor.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -83,7 +83,6 @@ class Mage_Log_Model_Visitor extends Mage_Core_Model_Abstract /** * Mage_Log_Model_Visitor constructor. - * @param array $data */ public function __construct(array $data = []) { @@ -178,7 +177,7 @@ public function getUrl() } /** - * @return mixed + * @return string */ public function getFirstVisitAt() { @@ -189,7 +188,7 @@ public function getFirstVisitAt() } /** - * @return mixed + * @return string */ public function getLastVisitAt() { @@ -335,7 +334,7 @@ public function bindQuoteDestroy($observer) } /** - * Methods for research (depends from customer online admin section) + * Methods for research (depends on customer online admin section) * @param Varien_Object $data * @return $this */ diff --git a/app/code/core/Mage/Log/Model/Visitor/Online.php b/app/code/core/Mage/Log/Model/Visitor/Online.php index 366fabe4c79..6ef37546b84 100644 --- a/app/code/core/Mage/Log/Model/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Visitor/Online.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php index 298d3c0ab98..2b11679902e 100644 --- a/app/code/core/Mage/Media/Model/File/Image.php +++ b/app/code/core/Mage/Media/Model/File/Image.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Media * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,6 @@ protected function _getWriteAdapter() } /** - * @param Mage_Media_Model_Image $object * @param mixed $file * @param mixed|null $field * @return $this @@ -58,7 +57,6 @@ public function load(Mage_Media_Model_Image $object, $file, $field = null) } /** - * @param Mage_Media_Model_Image $object * @return $this */ public function save(Mage_Media_Model_Image $object) @@ -68,7 +66,6 @@ public function save(Mage_Media_Model_Image $object) } /** - * @param Mage_Media_Model_Image $object * @return $this */ public function delete(Mage_Media_Model_Image $object) @@ -79,7 +76,6 @@ public function delete(Mage_Media_Model_Image $object) /** * Create image resource for operation from file * - * @param Mage_Media_Model_Image $object * @return bool|false|resource * @throws Mage_Core_Exception */ @@ -115,7 +111,6 @@ public function getImage(Mage_Media_Model_Image $object) /** * Create tmp image resource for operations * - * @param Mage_Media_Model_Image $object * @return resource */ public function getTmpImage(Mage_Media_Model_Image $object) @@ -126,7 +121,6 @@ public function getTmpImage(Mage_Media_Model_Image $object) /** * Resize image * - * @param Mage_Media_Model_Image $object * @return $this */ public function resize(Mage_Media_Model_Image $object) @@ -153,7 +147,6 @@ public function resize(Mage_Media_Model_Image $object) /** * Add watermark for image * - * @param Mage_Media_Model_Image $object * @return $this */ public function watermark(Mage_Media_Model_Image $object) @@ -164,7 +157,6 @@ public function watermark(Mage_Media_Model_Image $object) /** * Creates image * - * @param Mage_Media_Model_Image $object * @param string|null $extension * @return $this */ @@ -201,9 +193,7 @@ public function saveAs(Mage_Media_Model_Image $object, $extension = null) /** * Retrieve image dimensions * - * @param Mage_Media_Model_Image $object * @return Varien_Object - * * @SuppressWarnings(PHPMD.ErrorControlOperator) */ public function getDimensions(Mage_Media_Model_Image $object) @@ -232,7 +222,6 @@ public function destroyResource(&$resource) /** * Destroys resource object * - * @param Mage_Media_Model_Image $object * @return bool */ public function hasSpecialImage(Mage_Media_Model_Image $object) diff --git a/app/code/core/Mage/Media/Model/Image.php b/app/code/core/Mage/Media/Model/Image.php index 4b824e53af9..d22142ea04d 100644 --- a/app/code/core/Mage/Media/Model/Image.php +++ b/app/code/core/Mage/Media/Model/Image.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Media * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,7 +55,6 @@ protected function _construct() /** * Set media image config instance - * @param Mage_Media_Model_Image_Config_Interface $config * @return Mage_Media_Model_Image */ public function setConfig(Mage_Media_Model_Image_Config_Interface $config) @@ -111,7 +110,7 @@ public function getDimensions() } /** - * Retrieve destanation dimensions object + * Retrieve destination dimensions object * * @return Varien_Object */ diff --git a/app/code/core/Mage/Newsletter/Model/Observer.php b/app/code/core/Mage/Newsletter/Model/Observer.php index 930fda0f97a..4307d75a4a0 100644 --- a/app/code/core/Mage/Newsletter/Model/Observer.php +++ b/app/code/core/Mage/Newsletter/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Newsletter_Model_Observer { /** - * @param Varien_Event_Observer $observer * @return $this */ public function subscribeCustomer(Varien_Event_Observer $observer) @@ -37,7 +36,6 @@ public function subscribeCustomer(Varien_Event_Observer $observer) /** * Customer delete handler * - * @param Varien_Event_Observer $observer * @return $this */ public function customerDeleted(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Newsletter/Model/Problem.php b/app/code/core/Mage/Newsletter/Model/Problem.php index 45f7aaac9aa..bdef3f5a8b7 100644 --- a/app/code/core/Mage/Newsletter/Model/Problem.php +++ b/app/code/core/Mage/Newsletter/Model/Problem.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,7 +54,6 @@ protected function _construct() /** * Add Subscriber Data * - * @param Mage_Newsletter_Model_Subscriber $subscriber * @return $this */ public function addSubscriberData(Mage_Newsletter_Model_Subscriber $subscriber) @@ -66,7 +65,6 @@ public function addSubscriberData(Mage_Newsletter_Model_Subscriber $subscriber) /** * Add Queue Data * - * @param Mage_Newsletter_Model_Queue $queue * @return $this */ public function addQueueData(Mage_Newsletter_Model_Queue $queue) @@ -78,7 +76,6 @@ public function addQueueData(Mage_Newsletter_Model_Queue $queue) /** * Add Error Data * - * @param Exception $e * @return $this */ public function addErrorData(Exception $e) diff --git a/app/code/core/Mage/Newsletter/Model/Queue.php b/app/code/core/Mage/Newsletter/Model/Queue.php index 0acd5ecc67d..5ec08cdc9e9 100644 --- a/app/code/core/Mage/Newsletter/Model/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Queue.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -157,7 +157,6 @@ public function setQueueStartAtByString($startAt) * Send messages to subscribers for this queue * * @param int $count - * @param array $additionalVariables * @return $this */ public function sendPerSubscriber($count = 20, array $additionalVariables = []) @@ -249,7 +248,6 @@ public function getDataForSave() /** * Add subscribers to queue. * - * @param array $subscriberIds * @return $this */ public function addSubscribersToQueue(array $subscriberIds) @@ -307,7 +305,6 @@ public function getSaveStoresFlag() /** * Setter for stores of queue. * - * @param array $storesIds * @return $this */ public function setStores(array $storesIds) diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php index b0045d91f2e..7eb9c8e9441 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -122,7 +122,7 @@ protected function _addCustomersData() } /** - * Loads collecion and adds customers info + * Loads collection and adds customers info * * @param bool $printQuery * @param bool $logQuery diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Queue.php b/app/code/core/Mage/Newsletter/Model/Resource/Queue.php index 3bb8319d065..f5c4e5ccbfc 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Queue.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,9 +28,6 @@ protected function _construct() /** * Add subscribers to queue - * - * @param Mage_Newsletter_Model_Queue $queue - * @param array $subscriberIds */ public function addSubscribersToQueue(Mage_Newsletter_Model_Queue $queue, array $subscriberIds) { @@ -69,8 +66,6 @@ public function addSubscribersToQueue(Mage_Newsletter_Model_Queue $queue, array /** * Removes subscriber from queue - * - * @param Mage_Newsletter_Model_Queue $queue */ public function removeSubscribersFromQueue(Mage_Newsletter_Model_Queue $queue) { @@ -93,7 +88,6 @@ public function removeSubscribersFromQueue(Mage_Newsletter_Model_Queue $queue) /** * Links queue to store * - * @param Mage_Newsletter_Model_Queue $queue * @return $this */ public function setStores(Mage_Newsletter_Model_Queue $queue) @@ -143,7 +137,6 @@ public function setStores(Mage_Newsletter_Model_Queue $queue) /** * Returns queue linked stores * - * @param Mage_Newsletter_Model_Queue $queue * @return array */ public function getStores(Mage_Newsletter_Model_Queue $queue) diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php index 392c5890de9..682e44157f5 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -177,7 +177,7 @@ public function addSubscriberFilter($subscriberId) } /** - * Add filter by only ready fot sending item + * Add filter by only ready for sending item * * @return $this */ diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php index f54b2902444..65654eb77dc 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -95,7 +95,6 @@ public function loadByEmail($subscriberEmail) /** * Load subscriber by customer * - * @param Mage_Customer_Model_Customer $customer * @return array */ public function loadByCustomer(Mage_Customer_Model_Customer $customer) @@ -140,8 +139,6 @@ protected function _generateRandomCode() /** * Updates data when subscriber received * - * @param Mage_Newsletter_Model_Subscriber $subscriber - * @param Mage_Newsletter_Model_Queue $queue * @return $this */ public function received(Mage_Newsletter_Model_Subscriber $subscriber, Mage_Newsletter_Model_Queue $queue) diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php index 47f17964410..c8d8cd74311 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -77,7 +77,6 @@ protected function _construct() /** * Set loading mode subscribers by queue * - * @param Mage_Newsletter_Model_Queue $queue * @return $this */ public function useQueue(Mage_Newsletter_Model_Queue $queue) diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Template.php b/app/code/core/Mage/Newsletter/Model/Resource/Template.php index 456441aacdb..064b32f8086 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Template.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Load an object by template code * - * @param Mage_Newsletter_Model_Template $object * @param string $templateCode * @return $this */ @@ -54,7 +53,6 @@ public function loadByCode(Mage_Newsletter_Model_Template $object, $templateCode /** * Check usage of template in queue * - * @param Mage_Newsletter_Model_Template $template * @return bool */ public function checkUsageInQueue(Mage_Newsletter_Model_Template $template) @@ -77,7 +75,6 @@ public function checkUsageInQueue(Mage_Newsletter_Model_Template $template) /** * Check usage of template code in other templates * - * @param Mage_Newsletter_Model_Template $template * @return bool */ public function checkCodeUsage(Mage_Newsletter_Model_Template $template) diff --git a/app/code/core/Mage/Newsletter/Model/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Subscriber.php index 53edf443619..36a250b9d6f 100644 --- a/app/code/core/Mage/Newsletter/Model/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Subscriber.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -261,7 +261,6 @@ public function loadByEmail($subscriberEmail) /** * Load subscriber info by customer * - * @param Mage_Customer_Model_Customer $customer * @return $this */ public function loadByCustomer(Mage_Customer_Model_Customer $customer) @@ -482,7 +481,6 @@ public function confirm($code) /** * Mark receiving subscriber of queue newsletter * - * @param Mage_Newsletter_Model_Queue $queue * @return $this */ public function received(Mage_Newsletter_Model_Queue $queue) diff --git a/app/code/core/Mage/Newsletter/Model/Template.php b/app/code/core/Mage/Newsletter/Model/Template.php index 2471f4701f6..9128cd0d162 100644 --- a/app/code/core/Mage/Newsletter/Model/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Template.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -180,7 +180,6 @@ public function getTemplateTextPreprocessed() /** * Retrieve processed template * - * @param array $variables * @param bool $usePreprocess * @return string */ @@ -250,7 +249,6 @@ public function getPreparedTemplateText($usePreprocess = false, $html = null) * Retrieve included template * * @param string $templateCode - * @param array $variables * @return string */ public function getInclude($templateCode, array $variables) @@ -388,7 +386,6 @@ public function preprocess() /** * Retrieve processed template subject * - * @param array $variables * @return string */ public function getProcessedTemplateSubject(array $variables) diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php index 2fedc172842..8e91caf19e7 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php index 3b185d5e6f8..432a789309b 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php index 0a28788248a..9b6701211ce 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php index e4ce0fa57c4..b312aebb060 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php b/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php index 3bf418cbb10..a2454d178bc 100644 --- a/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php +++ b/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Customer/Token/List.php b/app/code/core/Mage/Oauth/Block/Customer/Token/List.php index bbd8b1bb1ae..37d4daa8629 100644 --- a/app/code/core/Mage/Oauth/Block/Customer/Token/List.php +++ b/app/code/core/Mage/Oauth/Block/Customer/Token/List.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -92,7 +92,6 @@ public function getCollection() /** * Get link for update revoke status * - * @param Mage_Oauth_Model_Token $model * @return string */ public function getUpdateRevokeLink(Mage_Oauth_Model_Token $model) @@ -106,7 +105,6 @@ public function getUpdateRevokeLink(Mage_Oauth_Model_Token $model) /** * Get delete link * - * @param Mage_Oauth_Model_Token $model * @return string */ public function getDeleteLink(Mage_Oauth_Model_Token $model) diff --git a/app/code/core/Mage/Oauth/Helper/Data.php b/app/code/core/Mage/Oauth/Helper/Data.php index fc471c1b9b7..9ae6a81060b 100644 --- a/app/code/core/Mage/Oauth/Helper/Data.php +++ b/app/code/core/Mage/Oauth/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Consumer.php b/app/code/core/Mage/Oauth/Model/Consumer.php index 5fcb82c7028..e50499939d2 100644 --- a/app/code/core/Mage/Oauth/Model/Consumer.php +++ b/app/code/core/Mage/Oauth/Model/Consumer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php b/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php index ac4a2f9b13e..8532c3f1997 100644 --- a/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php +++ b/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Observer.php b/app/code/core/Mage/Oauth/Model/Observer.php index a59fc793251..6812333f829 100644 --- a/app/code/core/Mage/Oauth/Model/Observer.php +++ b/app/code/core/Mage/Oauth/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,8 +33,6 @@ protected function _getOauthToken() /** * Redirect customer to callback page after login - * - * @param Varien_Event_Observer $observer */ public function afterCustomerLogin(Varien_Event_Observer $observer) { @@ -51,8 +49,6 @@ public function afterCustomerLogin(Varien_Event_Observer $observer) /** * Redirect admin to authorize controller after login success - * - * @param Varien_Event_Observer $observer */ public function afterAdminLogin(Varien_Event_Observer $observer) { @@ -69,8 +65,6 @@ public function afterAdminLogin(Varien_Event_Observer $observer) /** * Redirect admin to authorize controller after login fail - * - * @param Varien_Event_Observer $observer */ public function afterAdminLoginFailed(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Oauth/Model/Server.php b/app/code/core/Mage/Oauth/Model/Server.php index 1e995726b21..74b38270786 100644 --- a/app/code/core/Mage/Oauth/Model/Server.php +++ b/app/code/core/Mage/Oauth/Model/Server.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -653,7 +653,6 @@ public function initiateToken() /** * Create response string for problem during request and set HTTP error code * - * @param Exception $e * @param Zend_Controller_Response_Http|null $response OPTIONAL If NULL - will use internal getter * @return string * @throws Zend_Controller_Response_Exception @@ -692,7 +691,6 @@ public function reportProblem(Exception $e, ?Zend_Controller_Response_Http $resp /** * Set response object * - * @param Zend_Controller_Response_Http $response * @return $this */ public function setResponse(Zend_Controller_Response_Http $response) diff --git a/app/code/core/Mage/Oauth/Model/Token.php b/app/code/core/Mage/Oauth/Model/Token.php index 6918e56ae0d..a8740356e2f 100644 --- a/app/code/core/Mage/Oauth/Model/Token.php +++ b/app/code/core/Mage/Oauth/Model/Token.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php index 7fddc2e9d84..fb37e09189e 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php @@ -43,6 +43,7 @@ public function preDispatch() public function indexAction() { $this->loadLayout(); + $this->_setActiveMenu('system/api/oauth_admin_token'); $this->renderLayout(); } diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php index e0457c2392b..bc9ddd14893 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php @@ -40,7 +40,8 @@ public function preDispatch() */ public function indexAction() { - $this->loadLayout()->_setActiveMenu('system/oauth'); + $this->loadLayout(); + $this->_setActiveMenu('system/api/oauth_authorized_tokens'); $this->renderLayout(); } diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php index 6eaa7253f91..0cb65932db4 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,7 +25,6 @@ class Mage_Oauth_Adminhtml_Oauth_ConsumerController extends Mage_Adminhtml_Contr * Unset unused data from request * Skip getting "key" and "secret" because its generated from server side only * - * @param array $data * @return array */ protected function _filter(array $data) @@ -59,6 +58,7 @@ public function preDispatch() public function indexAction() { $this->loadLayout(); + $this->_setActiveMenu('system/api/oauth_consumer'); $this->renderLayout(); } @@ -94,6 +94,7 @@ public function newAction() Mage::register('current_consumer', $model); $this->loadLayout(); + $this->_setActiveMenu('system/api/oauth_consumer'); $this->renderLayout(); } @@ -124,6 +125,7 @@ public function editAction() Mage::register('current_consumer', $model); $this->loadLayout(); + $this->_setActiveMenu('system/api/oauth_consumer'); $this->renderLayout(); } diff --git a/app/code/core/Mage/Page/Block/Html.php b/app/code/core/Mage/Page/Block/Html.php index c02b43eecb4..e620b71e7db 100644 --- a/app/code/core/Mage/Page/Block/Html.php +++ b/app/code/core/Mage/Page/Block/Html.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -95,7 +95,7 @@ public function getPrintLogoUrl() } } - // buld url + // build url if (!empty($logo)) { $logo = Mage::getStoreConfig(Mage_Core_Model_Store::XML_PATH_UNSECURE_BASE_MEDIA_URL) . $logo; } else { diff --git a/app/code/core/Mage/Page/Block/Html/Head.php b/app/code/core/Mage/Page/Block/Html/Head.php index ca02a259ce5..7a9549c3de0 100644 --- a/app/code/core/Mage/Page/Block/Html/Head.php +++ b/app/code/core/Mage/Page/Block/Html/Head.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -481,7 +481,7 @@ public function getRobots() } /** - * Get miscellanious scripts/styles to be included in head before head closing tag + * Get miscellaneous scripts/styles to be included in head before head closing tag * * @return string */ diff --git a/app/code/core/Mage/Page/Block/Html/Header.php b/app/code/core/Mage/Page/Block/Html/Header.php index 1b251001f59..56b8af0752a 100644 --- a/app/code/core/Mage/Page/Block/Html/Header.php +++ b/app/code/core/Mage/Page/Block/Html/Header.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/Pager.php b/app/code/core/Mage/Page/Block/Html/Pager.php index 68f99e326e1..a986f06c80e 100644 --- a/app/code/core/Mage/Page/Block/Html/Pager.php +++ b/app/code/core/Mage/Page/Block/Html/Pager.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -200,9 +200,6 @@ public function getLimitVarName() return $this->_limitVarName; } - /** - * @param array $limits - */ public function setAvailableLimit(array $limits) { $this->_availableLimit = $limits; diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu.php b/app/code/core/Mage/Page/Block/Html/Topmenu.php index 41d2c68e317..a54525d6c6b 100644 --- a/app/code/core/Mage/Page/Block/Html/Topmenu.php +++ b/app/code/core/Mage/Page/Block/Html/Topmenu.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -83,7 +83,6 @@ public function getHtml($outermostClass = '', $childrenWrapClass = '') /** * Recursively generates top menu html from data that is specified in $menuTree * - * @param Varien_Data_Tree_Node $menuTree * @param string $childrenWrapClass * @return string * @deprecated since 1.8.2.0 use child block catalog.topnav.renderer instead @@ -143,7 +142,6 @@ protected function _getHtml(Varien_Data_Tree_Node $menuTree, $childrenWrapClass) /** * Generates string with all attributes that should be present in menu item element * - * @param Varien_Data_Tree_Node $item * @return string */ protected function _getRenderedMenuItemAttributes(Varien_Data_Tree_Node $item) @@ -161,7 +159,6 @@ protected function _getRenderedMenuItemAttributes(Varien_Data_Tree_Node $item) /** * Returns array of menu item's attributes * - * @param Varien_Data_Tree_Node $item * @return array */ protected function _getMenuItemAttributes(Varien_Data_Tree_Node $item) @@ -175,7 +172,6 @@ protected function _getMenuItemAttributes(Varien_Data_Tree_Node $item) /** * Returns array of menu item's classes * - * @param Varien_Data_Tree_Node $item * @return array */ protected function _getMenuItemClasses(Varien_Data_Tree_Node $item) diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php index bf63dde9eba..fc6a44cb441 100644 --- a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php +++ b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,7 +62,6 @@ protected function _addCacheTags() /** * Fetches template. If template has return statement, than its value is used and direct output otherwise. - * @param Varien_Data_Tree_Node $menuTree * @param string $childrenWrapClass * @return string */ diff --git a/app/code/core/Mage/Page/Block/Html/Welcome.php b/app/code/core/Mage/Page/Block/Html/Welcome.php index b8d4308488e..6b70862c63a 100644 --- a/app/code/core/Mage/Page/Block/Html/Welcome.php +++ b/app/code/core/Mage/Page/Block/Html/Welcome.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Template/Links.php b/app/code/core/Mage/Page/Block/Template/Links.php index aacfd69b27e..707c66d3228 100644 --- a/app/code/core/Mage/Page/Block/Template/Links.php +++ b/app/code/core/Mage/Page/Block/Template/Links.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Template/Links/Block.php b/app/code/core/Mage/Page/Block/Template/Links/Block.php index 83ee97a1609..6785a9b90e5 100644 --- a/app/code/core/Mage/Page/Block/Template/Links/Block.php +++ b/app/code/core/Mage/Page/Block/Template/Links/Block.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2015-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2015-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,14 +57,14 @@ class Mage_Page_Block_Template_Links_Block extends Mage_Core_Block_Template protected $_title = null; /** - * Li elemnt params + * Li element params * * @var string */ protected $_liParams = null; /** - * A elemnt params + * A element params * * @var string */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php index c32a8b69385..179e0f438c9 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paygate * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -265,7 +265,6 @@ public function canRefund() /** * Check void availability * - * @param Varien_Object $payment * @return bool */ public function canVoid(Varien_Object $payment) @@ -407,7 +406,6 @@ public function cancel(Varien_Object $payment) /** * Refund the amount with transaction id * - * @param Mage_Payment_Model_Info|Varien_Object $payment * @param float $requestedAmount * @return $this * @throws Mage_Core_Exception @@ -460,8 +458,6 @@ public function refund(Varien_Object $payment, $requestedAmount) /** * Cancel partial authorizations and flush current split_tender_id record - * - * @param Mage_Payment_Model_Info $payment */ public function cancelPartialAuthorization(Mage_Payment_Model_Info $payment) { @@ -1013,7 +1009,7 @@ public function getCardsStorage($payment = null) } /** - * If parial authorization is started method will returne true + * If partial authorization is started method will return true * * @param Mage_Payment_Model_Info $payment * @return bool @@ -1056,7 +1052,6 @@ public function processCreditmemo($creditmemo, $payment) * * Update transaction info if there is one placing transaction only * - * @param Mage_Payment_Model_Info $payment * @param string $transactionId * @return array */ @@ -1101,7 +1096,7 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact } /** - * Set split_tender_id to quote payment if neeeded + * Set split_tender_id to quote payment if needed * * @param Varien_Object $response * @param Mage_Sales_Model_Order_Payment $orderPayment @@ -1290,7 +1285,7 @@ protected function _buildRequest(Varien_Object $payment) } /** - * Post request to gateway and return responce + * Post request to gateway and return response * * @param Mage_Paygate_Model_Authorizenet_Request $request) * @return Mage_Paygate_Model_Authorizenet_Result @@ -1400,7 +1395,6 @@ protected function _getSession() * It sets card`s data into additional information of payment model * * @param Mage_Paygate_Model_Authorizenet_Result $response - * @param Mage_Sales_Model_Order_Payment $payment * @return Varien_Object */ protected function _registerCard(Varien_Object $response, Mage_Sales_Model_Order_Payment $payment) @@ -1451,11 +1445,8 @@ private function _clearAssignedData($payment) /** * Add payment transaction * - * @param Mage_Sales_Model_Order_Payment $payment * @param string $transactionId * @param string $transactionType - * @param array $transactionDetails - * @param array $transactionAdditionalInfo * @return null|Mage_Sales_Model_Order_Payment_Transaction */ protected function _addTransaction( @@ -1543,7 +1534,6 @@ protected function _processFailureMultitransactionAction($payment, $messages, $i /** * Generate checksum for object * - * @param Varien_Object $object * @param array $checkSumDataKeys * @return string */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php index ba08cfc6c90..0f605a7b7b2 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paygate * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,7 +42,6 @@ class Mage_Paygate_Model_Authorizenet_Cards /** * Set payment instance for storing credit card information and partial authorizations * - * @param Mage_Payment_Model_Info $payment * @return $this */ public function setPayment(Mage_Payment_Model_Info $payment) @@ -171,7 +170,7 @@ public function flushCards() } /** - * Check for payment instace present + * Check for payment instance present * * @throws Exception */ diff --git a/app/code/core/Mage/Payment/Block/Form/Cc.php b/app/code/core/Mage/Payment/Block/Form/Cc.php index 8abf0b5a733..7cc7e8ee24f 100644 --- a/app/code/core/Mage/Payment/Block/Form/Cc.php +++ b/app/code/core/Mage/Payment/Block/Form/Cc.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php index fed881ddeae..aacda1ffc00 100644 --- a/app/code/core/Mage/Payment/Helper/Data.php +++ b/app/code/core/Mage/Payment/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -106,7 +106,6 @@ protected function _sortMethods($a, $b) /** * Retrieve payment method form html * - * @param Mage_Payment_Model_Method_Abstract $method * @return Mage_Payment_Block_Form|Mage_Core_Block_Abstract */ public function getMethodFormBlock(Mage_Payment_Model_Method_Abstract $method) @@ -123,7 +122,6 @@ public function getMethodFormBlock(Mage_Payment_Model_Method_Abstract $method) /** * Retrieve payment information block * - * @param Mage_Payment_Model_Info $info * @return Mage_Core_Block_Template|Mage_Core_Block_Abstract */ public function getInfoBlock(Mage_Payment_Model_Info $info) diff --git a/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php b/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php index 6cd0bbc31bc..c728af66b02 100644 --- a/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php +++ b/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,29 +23,21 @@ interface Mage_Payment_Model_Billing_Agreement_MethodInterface { /** * Init billing agreement - * - * @param Mage_Payment_Model_Billing_AgreementAbstract $agreement */ public function initBillingAgreementToken(Mage_Payment_Model_Billing_AgreementAbstract $agreement); /** * Retrieve billing agreement details - * - * @param Mage_Payment_Model_Billing_AgreementAbstract $agreement */ public function getBillingAgreementTokenInfo(Mage_Payment_Model_Billing_AgreementAbstract $agreement); /** * Create billing agreement - * - * @param Mage_Payment_Model_Billing_AgreementAbstract $agreement */ public function placeBillingAgreement(Mage_Payment_Model_Billing_AgreementAbstract $agreement); /** * Update billing agreement status - * - * @param Mage_Payment_Model_Billing_AgreementAbstract $agreement */ public function updateBillingAgreementStatus(Mage_Payment_Model_Billing_AgreementAbstract $agreement); } diff --git a/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php b/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php index aafed9ef4b4..dfb32cfbb07 100644 --- a/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php +++ b/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -97,7 +97,7 @@ public function isValid() } /** - * Before save, it's overriden just to make data validation on before save event + * Before save, it's overridden just to make data validation on before save event * * @throws Mage_Core_Exception * @return Mage_Core_Model_Abstract diff --git a/app/code/core/Mage/Payment/Model/Config.php b/app/code/core/Mage/Payment/Model/Config.php index 85ba523dd0f..23a1ba0ac3a 100644 --- a/app/code/core/Mage/Payment/Model/Config.php +++ b/app/code/core/Mage/Payment/Model/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Abstract.php b/app/code/core/Mage/Payment/Model/Method/Abstract.php index 8b87e2add71..ea39a616e77 100644 --- a/app/code/core/Mage/Payment/Model/Method/Abstract.php +++ b/app/code/core/Mage/Payment/Model/Method/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -173,7 +173,6 @@ public function canRefundPartialPerInvoice() /** * Check void availability * - * @param Varien_Object $payment * @return bool */ public function canVoid(Varien_Object $payment) @@ -245,7 +244,6 @@ public function canCreateBillingAgreement() /** * Fetch transaction info * - * @param Mage_Payment_Model_Info $payment * @param string $transactionId * @return array */ @@ -406,9 +404,7 @@ public function validate() /** * Order payment abstract method * - * @param Varien_Object $payment * @param float $amount - * * @return $this */ public function order(Varien_Object $payment, $amount) @@ -422,9 +418,7 @@ public function order(Varien_Object $payment, $amount) /** * Authorize payment abstract method * - * @param Varien_Object $payment * @param float $amount - * * @return $this */ public function authorize(Varien_Object $payment, $amount) @@ -438,9 +432,7 @@ public function authorize(Varien_Object $payment, $amount) /** * Capture payment abstract method * - * @param Varien_Object $payment * @param float $amount - * * @return $this */ public function capture(Varien_Object $payment, $amount) @@ -482,9 +474,7 @@ public function processBeforeRefund($invoice, $payment) /** * Refund specified amount for payment * - * @param Varien_Object $payment * @param float $amount - * * @return $this */ public function refund(Varien_Object $payment, $amount) @@ -511,7 +501,6 @@ public function processCreditmemo($creditmemo, $payment) /** * Cancel payment abstract method * - * @param Varien_Object $payment * * @return $this */ @@ -537,7 +526,6 @@ public function processBeforeVoid($invoice, $payment) /** * Void payment abstract method * - * @param Varien_Object $payment * * @return $this */ @@ -552,7 +540,6 @@ public function void(Varien_Object $payment) /** * Whether this method can accept or deny payment * - * @param Mage_Payment_Model_Info $payment * * @return bool */ @@ -564,7 +551,6 @@ public function canReviewPayment(Mage_Payment_Model_Info $payment) /** * Attempt to accept a payment that us under review * - * @param Mage_Payment_Model_Info $payment * @return bool * @throws Mage_Core_Exception */ @@ -579,7 +565,6 @@ public function acceptPayment(Mage_Payment_Model_Info $payment) /** * Attempt to deny a payment that us under review * - * @param Mage_Payment_Model_Info $payment * @return bool * @throws Mage_Core_Exception */ diff --git a/app/code/core/Mage/Payment/Model/Observer.php b/app/code/core/Mage/Payment/Model/Observer.php index 85dc64be17d..59e5352edcc 100644 --- a/app/code/core/Mage/Payment/Model/Observer.php +++ b/app/code/core/Mage/Payment/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -101,8 +101,6 @@ public function prepareProductRecurringProfileOptions($observer) /** * Sets current instructions for bank transfer account - * - * @param Varien_Event_Observer $observer */ public function beforeOrderPaymentSave(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Payment/Model/Recurring/Profile.php b/app/code/core/Mage/Payment/Model/Recurring/Profile.php index d04e8252e38..1a508921fb9 100644 --- a/app/code/core/Mage/Payment/Model/Recurring/Profile.php +++ b/app/code/core/Mage/Payment/Model/Recurring/Profile.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -198,7 +198,6 @@ public function getValidationErrors($isGrouped = true, $asMessage = false) /** * Setter for payment method instance * - * @param Mage_Payment_Model_Method_Abstract $object * @return $this * @throws Exception */ @@ -216,7 +215,6 @@ public function setMethodInstance(Mage_Payment_Model_Method_Abstract $object) * Collect needed information from buy request * Then filter data * - * @param Varien_Object $buyRequest * @return $this * @throws Mage_Core_Exception */ @@ -241,7 +239,6 @@ public function importBuyRequest(Varien_Object $buyRequest) * Import product recurring profile information * Returns false if it cannot be imported * - * @param Mage_Catalog_Model_Product $product * @return $this|false */ public function importProduct(Mage_Catalog_Model_Product $product) @@ -298,7 +295,6 @@ public function exportScheduleInfo() /** * Determine nearest possible profile start date * - * @param Zend_Date|null $minAllowed * @return $this * @throws Zend_Date_Exception */ @@ -335,7 +331,6 @@ public function exportStartDatetime($asString = true) /** * Locale instance setter * - * @param Mage_Core_Model_Locale $locale * @return $this */ public function setLocale(Mage_Core_Model_Locale $locale) @@ -347,7 +342,6 @@ public function setLocale(Mage_Core_Model_Locale $locale) /** * Store instance setter * - * @param Mage_Core_Model_Store $store * @return $this */ public function setStore(Mage_Core_Model_Store $store) diff --git a/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php b/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php index 027cb9063a4..363591e84a1 100644 --- a/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php +++ b/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,16 +24,12 @@ interface Mage_Payment_Model_Recurring_Profile_MethodInterface /** * Validate data * - * @param Mage_Payment_Model_Recurring_Profile $profile * @throws Mage_Core_Exception */ public function validateRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile); /** * Submit to the gateway - * - * @param Mage_Payment_Model_Recurring_Profile $profile - * @param Mage_Payment_Model_Info $paymentInfo */ public function submitRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile, Mage_Payment_Model_Info $paymentInfo); @@ -41,7 +37,6 @@ public function submitRecurringProfile(Mage_Payment_Model_Recurring_Profile $pro * Fetch details * * @param string $referenceId - * @param Varien_Object $result */ public function getRecurringProfileDetails($referenceId, Varien_Object $result); @@ -54,15 +49,11 @@ public function canGetRecurringProfileDetails(); /** * Update data - * - * @param Mage_Payment_Model_Recurring_Profile $profile */ public function updateRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile); /** * Manage status - * - * @param Mage_Payment_Model_Recurring_Profile $profile */ public function updateRecurringProfileStatus(Mage_Payment_Model_Recurring_Profile $profile); } diff --git a/app/code/core/Mage/Payment/Model/Source/Cctype.php b/app/code/core/Mage/Payment/Model/Source/Cctype.php index 6ab8e819524..0a921690c23 100644 --- a/app/code/core/Mage/Payment/Model/Source/Cctype.php +++ b/app/code/core/Mage/Payment/Model/Source/Cctype.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +41,6 @@ public function getAllowedTypes() /** * Setter for allowed types * - * @param array $values * @return $this */ public function setAllowedTypes(array $values) diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php index d56fc662065..99617bb61b5 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +41,6 @@ protected function _prepareLayout() /** * Unset some non-related element parameters * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) @@ -53,7 +52,6 @@ public function render(Varien_Data_Form_Element_Abstract $element) /** * Get the button and scripts contents * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php index df26d090129..ed0cf8db009 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ class Mage_Paypal_Block_Adminhtml_System_Config_Field_Country extends Mage_Admin /** * Render country field considering request parameter * - * @param Varien_Data_Form_Element_Abstract $element * @return string * @throws Exception */ @@ -73,7 +72,6 @@ public function render(Varien_Data_Form_Element_Abstract $element) /** * Get country selector html * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php index 83009a0083b..d605452d7ee 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Paypal_Block_Adminhtml_System_Config_Field_SolutionType extends Mage_Adminhtml_Block_System_Config_Form_Field { /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php index 4d5c2f3b0be..9c66dd5ce2f 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Deprecated extends Mage /** * Get was enabled config path * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getWasActiveConfigPath(Varien_Data_Form_Element_Abstract $element) @@ -36,7 +35,6 @@ protected function _getWasActiveConfigPath(Varien_Data_Form_Element_Abstract $el /** * Check whether solution was enabled * - * @param Varien_Data_Form_Element_Abstract $element * @return bool */ protected function _wasActive(Varien_Data_Form_Element_Abstract $element) @@ -50,7 +48,6 @@ protected function _wasActive(Varien_Data_Form_Element_Abstract $element) /** * Set solution as was enabled * - * @param Varien_Data_Form_Element_Abstract $element * @return $this */ protected function _setWasActive(Varien_Data_Form_Element_Abstract $element) @@ -111,7 +108,6 @@ public function isPaymentEnabledAnyScope($activityPath) /** * Do not render solution if disabled * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php index 5cab20b6fad..68aa9e1db37 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,7 +39,6 @@ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Global extends Mage_Adm /** * Render fieldset html * - * @param Varien_Data_Form_Element_Abstract $fieldset * @return string */ public function render(Varien_Data_Form_Element_Abstract $fieldset) @@ -80,7 +79,6 @@ public function getElement($elementId) /** * Return checkbox html with hidden field for correct config values * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function getElementHtml(Varien_Data_Form_Element_Abstract $element) @@ -107,7 +105,6 @@ public function getElementHtml(Varien_Data_Form_Element_Abstract $element) /** * Whether element should be rendered in "simplified" mode * - * @param Varien_Data_Form_Element_Abstract $element * @return bool */ public function getIsElementSimplified(Varien_Data_Form_Element_Abstract $element) @@ -119,7 +116,6 @@ public function getIsElementSimplified(Varien_Data_Form_Element_Abstract $elemen /** * Getter for element label * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function getElementLabel(Varien_Data_Form_Element_Abstract $element) @@ -130,7 +126,6 @@ public function getElementLabel(Varien_Data_Form_Element_Abstract $element) /** * Getter for element comment * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function getElementComment(Varien_Data_Form_Element_Abstract $element) @@ -141,7 +136,6 @@ public function getElementComment(Varien_Data_Form_Element_Abstract $element) /** * Getter for element comment * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function getElementOriginalData(Varien_Data_Form_Element_Abstract $element, $key) @@ -153,7 +147,6 @@ public function getElementOriginalData(Varien_Data_Form_Element_Abstract $elemen /** * Check whether checkbox has "Use default" option or not * - * @param Varien_Data_Form_Element_Abstract $element * @return bool */ public function hasInheritElement(Varien_Data_Form_Element_Abstract $element) @@ -164,7 +157,6 @@ public function hasInheritElement(Varien_Data_Form_Element_Abstract $element) /** * Return "Use default" checkbox html * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function getInheritElementHtml(Varien_Data_Form_Element_Abstract $element) @@ -188,7 +180,6 @@ public function getInheritElementHtml(Varien_Data_Form_Element_Abstract $element /** * Return label for "Use default" checkbox * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function getInheritElementLabelHtml(Varien_Data_Form_Element_Abstract $element) @@ -204,7 +195,6 @@ public function getInheritElementLabelHtml(Varien_Data_Form_Element_Abstract $el /** * Return element label with tag SPAN * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function getElementLabelTextHtml(Varien_Data_Form_Element_Abstract $element) @@ -219,7 +209,6 @@ public function getElementLabelTextHtml(Varien_Data_Form_Element_Abstract $eleme /** * Return backend config for element like JSON * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function getElementBackendConfig(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php index 157fb1e945f..d1c9edfcbde 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +26,6 @@ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Hint extends Mage_Admin /** * Render fieldset html * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php index a29265e4ddc..0ab7c643458 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/PathDependent.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/PathDependent.php index 3faf570adf8..24a6cdb32fa 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/PathDependent.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/PathDependent.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,7 +36,6 @@ public function hasActivePathDependencies($groupConfig) /** * Do not render solution if disabled * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php index 49e9635dfcf..c9b0567b48c 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Store extends Mage_Admi /** * Render service JavaScript code * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php index 7b114e94bb6..57d8e5d6362 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ class Mage_Paypal_Block_Adminhtml_System_Config_Payflowlink_Info extends Mage_Ad /** * Render fieldset html * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Paypal/Block/Express/Form.php b/app/code/core/Mage/Paypal/Block/Express/Form.php index 98178b675cd..6d2ec26873e 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Form.php +++ b/app/code/core/Mage/Paypal/Block/Express/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Express/Review.php b/app/code/core/Mage/Paypal/Block/Express/Review.php index 17c4d38a3d5..a184a094c0f 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +48,6 @@ class Mage_Paypal_Block_Express_Review extends Mage_Core_Block_Template /** * Quote object setter * - * @param Mage_Sales_Model_Quote $quote * @return $this */ public function setQuote(Mage_Sales_Model_Quote $quote) @@ -108,7 +107,6 @@ public function getCarrierName($carrierCode) /** * Get either shipping rate code or empty value on error * - * @param Varien_Object $rate * @return string */ public function renderShippingRateValue(Varien_Object $rate) diff --git a/app/code/core/Mage/Paypal/Block/Standard/Form.php b/app/code/core/Mage/Paypal/Block/Standard/Form.php index d21631190c4..a58d00c957e 100644 --- a/app/code/core/Mage/Paypal/Block/Standard/Form.php +++ b/app/code/core/Mage/Paypal/Block/Standard/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Helper/Data.php b/app/code/core/Mage/Paypal/Helper/Data.php index d31ac6b07ea..06f19040d4f 100644 --- a/app/code/core/Mage/Paypal/Helper/Data.php +++ b/app/code/core/Mage/Paypal/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,7 +43,6 @@ class Mage_Paypal_Helper_Data extends Mage_Core_Helper_Abstract /** * Check whether customer should be asked confirmation whether to sign a billing agreement * - * @param Mage_Paypal_Model_Config $config * @param int $customerId * @return bool */ @@ -63,7 +62,6 @@ public function shouldAskToCreateBillingAgreement(Mage_Paypal_Model_Config $conf /** * Return backend config for element like JSON * - * @param Varien_Data_Form_Element_Abstract $element * @return false|string */ public function getElementBackendConfig(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Paypal/Model/Api/Abstract.php b/app/code/core/Mage/Paypal/Model/Api/Abstract.php index 0bb8c3d18cf..42ae4560d20 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Abstract.php +++ b/app/code/core/Mage/Paypal/Model/Api/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -244,7 +244,6 @@ public function getBusinessAccount() * Import $this public data to specified object or array * * @param array|Varien_Object $to - * @param array $publicMap * @return array|Varien_Object */ public function &import($to, array $publicMap = []) @@ -256,7 +255,6 @@ public function &import($to, array $publicMap = []) * Export $this public data from specified object or array * * @param array|Varien_Object $from - * @param array $publicMap * @return Mage_Paypal_Model_Api_Abstract */ public function export($from, array $publicMap = []) @@ -268,7 +266,6 @@ public function export($from, array $publicMap = []) /** * Set PayPal cart instance * - * @param Mage_Paypal_Model_Cart $cart * @return Mage_Paypal_Model_Api_Abstract */ public function setPaypalCart(Mage_Paypal_Model_Cart $cart) @@ -279,7 +276,6 @@ public function setPaypalCart(Mage_Paypal_Model_Cart $cart) /** * Config instance setter - * @param Mage_Paypal_Model_Config $config * @return Mage_Paypal_Model_Api_Abstract */ public function setConfigObject(Mage_Paypal_Model_Config $config) @@ -309,7 +305,6 @@ public function getFraudManagementFiltersEnabled() /** * Set recurring profiles * - * @param array $items * @return Mage_Paypal_Model_Api_Abstract */ public function addRecurringPaymentProfiles(array $items) @@ -323,8 +318,6 @@ public function addRecurringPaymentProfiles(array $items) /** * Export $this public data to private request array * - * @param array $privateRequestMap - * @param array $request * @return array */ protected function &_exportToRequest(array $privateRequestMap, array $request = []) @@ -349,9 +342,6 @@ protected function &_exportToRequest(array $privateRequestMap, array $request = /** * Import $this public data from a private response array - * - * @param array $privateResponseMap - * @param array $response */ protected function _importFromResponse(array $privateResponseMap, array $response) { @@ -373,7 +363,6 @@ protected function _importFromResponse(array $privateResponseMap, array $respons * * Returns true if there were line items added * - * @param array &$request * @param int $i * @return bool */ @@ -421,7 +410,6 @@ protected function _exportLineItems(array &$request, $i = 0) * Prepare shipping options request * Returns false if there are no shipping options * - * @param array &$request * @param int $i * @return bool */ @@ -497,7 +485,6 @@ protected function _getDataOrConfig($key, $default = null) /** * region_id workaround: PayPal requires state code, try to find one in the address * - * @param Varien_Object $address * @return string */ protected function _lookupRegionCodeFromAddress(Varien_Object $address) @@ -514,9 +501,6 @@ protected function _lookupRegionCodeFromAddress(Varien_Object $address) /** * Street address workaround: divides address lines into parts by specified keys * (keys should go as 3rd, 4th[...] parameters) - * - * @param Varien_Object $address - * @param array $to */ protected function _importStreetFromAddress(Varien_Object $address, array &$to) { diff --git a/app/code/core/Mage/Paypal/Model/Api/Nvp.php b/app/code/core/Mage/Paypal/Model/Api/Nvp.php index bc54fa49312..1f932c31437 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Nvp.php +++ b/app/code/core/Mage/Paypal/Model/Api/Nvp.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -873,7 +873,6 @@ public function callGetRecurringPaymentsProfileDetails(Varien_Object $result) /** * Import callback request array into $this public data * - * @param array $request * @return Varien_Object */ public function prepareShippingOptionsCallbackAddress(array $request) @@ -917,7 +916,6 @@ protected function _addMethodToRequest($methodName, $request) * Do the API call * * @param string $methodName - * @param array $request * @return array * @throws Mage_Core_Exception */ @@ -1178,7 +1176,7 @@ protected function _deformatNVP($nvpstr) $nvpstr = strpos($nvpstr, "\r\n\r\n") !== false ? substr($nvpstr, strpos($nvpstr, "\r\n\r\n") + 4) : $nvpstr; while (strlen($nvpstr)) { - //postion of Key + //position of Key $keypos = strpos($nvpstr, '='); //position of value $valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr); @@ -1186,7 +1184,7 @@ protected function _deformatNVP($nvpstr) /*getting the Key and Value values and storing in a Associative Array*/ $keyval = substr($nvpstr, $intial, $keypos); $valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1); - //decoding the respose + //decoding the response $nvpArray[urldecode($keyval)] = urldecode($valval); $nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr)); } @@ -1196,7 +1194,6 @@ protected function _deformatNVP($nvpstr) /** * NVP doesn't support passing discount total as a separate amount - add it as a line item * - * @param array $request * @param int $i * @return true|null */ @@ -1235,8 +1232,6 @@ protected function _exportAddressses($data) /** * Adopt specified address object to be compatible with Magento - * - * @param Varien_Object $address */ protected function _applyStreetAndRegionWorkarounds(Varien_Object $address) { @@ -1277,8 +1272,6 @@ protected function _applyCountryWorkarounds(&$request) * * @deprecated after 1.4.2.0-beta1, use _importAddresses() instead * - * @param Varien_Object $address - * @param array $to * @return array */ protected function _importAddress(Varien_Object $address, array $to) @@ -1290,7 +1283,6 @@ protected function _importAddress(Varien_Object $address, array $to) /** * Prepare request data basing on provided addresses * - * @param array $to * @return array */ protected function _importAddresses(array $to) @@ -1482,7 +1474,6 @@ protected function _filterRecurringProfileActionToNvp($value) * Check the obtained RP status in NVP format and specify the profile state * * @param string $value - * @param Varien_Object $result */ protected function _analyzeRecurringProfileStatus($value, Varien_Object $result) { diff --git a/app/code/core/Mage/Paypal/Model/Api/Standard.php b/app/code/core/Mage/Paypal/Model/Api/Standard.php index a557e757e0d..c8fa4e99f19 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Api/Standard.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -178,7 +178,6 @@ public function debugRequest($request) * For some reason PayPal ignores shipping total variables exactly when line items is enabled * Note that $i = 1 * - * @param array $request * @param int $i * @return bool */ diff --git a/app/code/core/Mage/Paypal/Model/Cart.php b/app/code/core/Mage/Paypal/Model/Cart.php index 20c2886c6ff..d37535c14e7 100644 --- a/app/code/core/Mage/Paypal/Model/Cart.php +++ b/app/code/core/Mage/Paypal/Model/Cart.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,7 +23,7 @@ class Mage_Paypal_Model_Cart { /** - * Totals that PayPal suppports when passing shopping cart + * Totals that PayPal supports when passing shopping cart * * @var string */ @@ -147,7 +147,7 @@ public function getItems($bypassValidation = false) /** * Render and get totals * If the totals are invalid for any reason, they will be merged into one amount (subtotal is utilized for it) - * An option to substract discount from the subtotal is available + * An option to subtract discount from the subtotal is available * * @param bool $mergeDiscount * @return array @@ -427,7 +427,6 @@ public function areItemsValid() /** * Add a usual line item with amount and qty * - * @param Varien_Object $salesItem * @return Varien_Object */ protected function _addRegularItem(Varien_Object $salesItem) diff --git a/app/code/core/Mage/Paypal/Model/Config.php b/app/code/core/Mage/Paypal/Model/Config.php index d7c558f4bad..a4c1d977fe6 100644 --- a/app/code/core/Mage/Paypal/Model/Config.php +++ b/app/code/core/Mage/Paypal/Model/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -1067,11 +1067,10 @@ public function getStartBillingAgreementUrl($token) } /** - * PayPal web URL generic getter - * - * @param array $params - * @return string - */ + * PayPal web URL generic getter + * + * @return string + */ public function getPaypalUrl(array $params = []) { return sprintf( @@ -1175,7 +1174,6 @@ public function getPaymentMarkImageUrl($localeCode, $orderTotal = null, $pal = n * Get "What Is PayPal" localized URL * Supposed to be used with "mark" as popup window * - * @param Mage_Core_Model_Locale|null $locale * @return string */ public function getPaymentMarkWhatIsPaypalUrl(?Mage_Core_Model_Locale $locale = null) @@ -1541,8 +1539,6 @@ public function isCurrencyCodeSupported($code) /** * Export page style current settings to specified object - * - * @param Varien_Object $to */ public function exportExpressCheckoutStyleSettings(Varien_Object $to) { @@ -1658,7 +1654,7 @@ protected function _getSpecificConfigPath($fieldName) } /** - * Check wheter specified country code is supported by build notation codes for specific countries + * Check whether specified country code is supported by build notation codes for specific countries * * @param string $code * @return string|null diff --git a/app/code/core/Mage/Paypal/Model/Direct.php b/app/code/core/Mage/Paypal/Model/Direct.php index ad1190ffd45..51455351c79 100644 --- a/app/code/core/Mage/Paypal/Model/Direct.php +++ b/app/code/core/Mage/Paypal/Model/Direct.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -271,7 +271,6 @@ public function getCentinelValidator() /** * Fetch transaction details info * - * @param Mage_Payment_Model_Info $payment * @param string $transactionId * @return array */ @@ -283,7 +282,6 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact /** * Place an order with authorization or capture action * - * @param Mage_Sales_Model_Order_Payment $payment * @param float $amount * @return $this */ @@ -336,7 +334,7 @@ protected function _placeOrder(Mage_Sales_Model_Order_Payment $payment, $amount) try { $api->callGetTransactionDetails(); } catch (Mage_Core_Exception $e) { - // if we recieve errors, but DoDirectPayment response is Success, then set Pending status for transaction + // if we receive errors, but DoDirectPayment response is Success, then set Pending status for transaction $payment->setIsTransactionPending(true); } $this->_importResultToPayment($api, $payment); @@ -371,7 +369,6 @@ protected function _importResultToPayment($api, $payment) /** * Check void availability * - * @param Varien_Object $payment * @return bool */ public function canVoid(Varien_Object $payment) diff --git a/app/code/core/Mage/Paypal/Model/Express.php b/app/code/core/Mage/Paypal/Model/Express.php index 0ff0eeab18c..b5197c1d262 100644 --- a/app/code/core/Mage/Paypal/Model/Express.php +++ b/app/code/core/Mage/Paypal/Model/Express.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -458,7 +458,6 @@ public function getCheckoutRedirectUrl() /** * Fetch transaction details info * - * @param Mage_Payment_Model_Info $payment * @param string $transactionId * @return array */ @@ -469,8 +468,6 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact /** * Validate RP data - * - * @param Mage_Payment_Model_Recurring_Profile $profile */ public function validateRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile) { @@ -479,9 +476,6 @@ public function validateRecurringProfile(Mage_Payment_Model_Recurring_Profile $p /** * Submit RP to the gateway - * - * @param Mage_Payment_Model_Recurring_Profile $profile - * @param Mage_Payment_Model_Info $paymentInfo */ public function submitRecurringProfile( Mage_Payment_Model_Recurring_Profile $profile, @@ -497,7 +491,6 @@ public function submitRecurringProfile( * Fetch RP details * * @param string $referenceId - * @param Varien_Object $result */ public function getRecurringProfileDetails($referenceId, Varien_Object $result) { @@ -514,8 +507,6 @@ public function canGetRecurringProfileDetails() /** * Update RP data - * - * @param Mage_Payment_Model_Recurring_Profile $profile */ public function updateRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile) { @@ -524,8 +515,6 @@ public function updateRecurringProfile(Mage_Payment_Model_Recurring_Profile $pro /** * Manage status - * - * @param Mage_Payment_Model_Recurring_Profile $profile */ public function updateRecurringProfileStatus(Mage_Payment_Model_Recurring_Profile $profile) { @@ -550,7 +539,6 @@ public function assignData($data) /** * Place an order with authorization or capture action * - * @param Mage_Sales_Model_Order_Payment $payment * @param float $amount * @return $this */ @@ -606,7 +594,6 @@ protected function _importToPayment($api, $payment) /** * Check void availability * - * @param Varien_Object $payment * @return bool */ public function canVoid(Varien_Object $payment) @@ -698,7 +685,6 @@ protected function _callDoAuthorize($amount, $payment, $parentTransactionId) /** * Check transaction for expiration in PST * - * @param Mage_Sales_Model_Order_Payment_Transaction $transaction * @param int $period * @return bool */ diff --git a/app/code/core/Mage/Paypal/Model/Express/Checkout.php b/app/code/core/Mage/Paypal/Model/Express/Checkout.php index 979feaa7817..6b6e5677c87 100644 --- a/app/code/core/Mage/Paypal/Model/Express/Checkout.php +++ b/app/code/core/Mage/Paypal/Model/Express/Checkout.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -320,7 +320,7 @@ public function start($returnUrl, $cancelUrl, $button = null) $this->_api->setRequireBillingAddress(1); } - // supress or export shipping address + // suppress or export shipping address if ($this->_quote->getIsVirtual()) { if ($this->_config->requireBillingAddress == Mage_Paypal_Model_Config::REQUIRE_BILLING_ADDRESS_VIRTUAL) { $this->_api->setRequireBillingAddress(1); @@ -508,7 +508,6 @@ public function prepareOrderReview($token = null) /** * Return callback response with shipping options * - * @param array $request * @return string */ public function getShippingOptionsCallbackResponse(array $request) @@ -784,7 +783,6 @@ protected function _getApi() * Returns empty array if it was impossible to obtain any shipping rate * If there are shipping rates obtained, the method must return one of them as default. * - * @param Mage_Sales_Model_Quote_Address $address * @param bool $mayReturnEmpty * @return array */ @@ -865,8 +863,6 @@ protected function _prepareShippingOptions( * This function is used as a callback comparison function in shipping options sorting process * @see self::_prepareShippingOptions() * - * @param Varien_Object $option1 - * @param Varien_Object $option2 * @return int */ protected static function cmpShippingOptions(Varien_Object $option1, Varien_Object $option2) @@ -883,7 +879,6 @@ protected static function cmpShippingOptions(Varien_Object $option1, Varien_Obje * If in future the issue is fixed, we don't need to attempt to match it. It would be enough to set the method code * before collecting shipping rates * - * @param Mage_Sales_Model_Quote_Address $address * @param string $selectedCode * @return string */ diff --git a/app/code/core/Mage/Paypal/Model/Hostedpro.php b/app/code/core/Mage/Paypal/Model/Hostedpro.php index 23ea50542fd..29a77d03a80 100644 --- a/app/code/core/Mage/Paypal/Model/Hostedpro.php +++ b/app/code/core/Mage/Paypal/Model/Hostedpro.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -146,8 +146,6 @@ public function initialize($paymentAction, $stateObject) /** * Sends API request to PayPal to get form URL, then sets this URL to $payment object. - * - * @param Mage_Payment_Model_Info $payment */ protected function _setPaymentFormUrl(Mage_Payment_Model_Info $payment) { @@ -163,7 +161,6 @@ protected function _setPaymentFormUrl(Mage_Payment_Model_Info $payment) /** * Returns request object with needed data for API request to PayPal to get form URL. * - * @param Mage_Payment_Model_Info $payment * @return Mage_Paypal_Model_Hostedpro_Request */ protected function _buildFormUrlRequest(Mage_Payment_Model_Info $payment) @@ -176,7 +173,6 @@ protected function _buildFormUrlRequest(Mage_Payment_Model_Info $payment) /** * Returns form URL from request to PayPal. * - * @param Mage_Paypal_Model_Hostedpro_Request $request * @return string | false */ protected function _sendFormUrlRequest(Mage_Paypal_Model_Hostedpro_Request $request) diff --git a/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php b/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php index 86bdb822d86..98b1ce9fbf5 100644 --- a/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php +++ b/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,14 +36,14 @@ class Mage_Paypal_Model_Hostedpro_Request extends Varien_Object protected $_paymentMethod; /** - * Name formate for button variables + * Name format for button variables * * @var string */ protected $_buttonVarFormat = 'L_BUTTONVAR%d'; /** - * Request Parameters which dont have to wrap as button vars + * Request Parameters which don't have to wrap as button vars * * @var array */ @@ -109,7 +109,6 @@ public function setOrder($order) /** * Get peymet request data as array * - * @param Mage_Paypal_Model_Hostedpro $paymentMethod * @return array */ protected function _getPaymentData(Mage_Paypal_Model_Hostedpro $paymentMethod) @@ -135,7 +134,6 @@ protected function _getPaymentData(Mage_Paypal_Model_Hostedpro $paymentMethod) /** * Get order request data as array * - * @param Mage_Sales_Model_Order $order * @return array */ protected function _getOrderData(Mage_Sales_Model_Order $order) @@ -171,7 +169,6 @@ protected function _getOrderData(Mage_Sales_Model_Order $order) /** * Get shipping address request data * - * @param Varien_Object $address * @return array */ protected function _getShippingAddress(Varien_Object $address) @@ -198,7 +195,6 @@ protected function _getShippingAddress(Varien_Object $address) /** * Get billing address request data * - * @param Varien_Object $address * @return array */ protected function _getBillingAddress(Varien_Object $address) diff --git a/app/code/core/Mage/Paypal/Model/Info.php b/app/code/core/Mage/Paypal/Model/Info.php index 17c839d6a0e..a08fb02a767 100644 --- a/app/code/core/Mage/Paypal/Model/Info.php +++ b/app/code/core/Mage/Paypal/Model/Info.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -154,7 +154,6 @@ class Mage_Paypal_Model_Info /** * All available payment info getter * - * @param Mage_Payment_Model_Info $payment * @param bool $labelValuesOnly * @return array */ @@ -178,7 +177,6 @@ public function getPaymentInfo(Mage_Payment_Model_Info $payment, $labelValuesOnl /** * Public payment info getter * - * @param Mage_Payment_Model_Info $payment * @param bool $labelValuesOnly * @return array */ @@ -191,7 +189,6 @@ public function getPublicPaymentInfo(Mage_Payment_Model_Info $payment, $labelVal * Grab data from source and map it into payment * * @param array|Varien_Object|callback $from - * @param Mage_Payment_Model_Info $payment */ public function importToPayment($from, Mage_Payment_Model_Info $payment) { @@ -205,9 +202,7 @@ public function importToPayment($from, Mage_Payment_Model_Info $payment) /** * Grab data from payment and map it into target * - * @param Mage_Payment_Model_Info $payment * @param array|Varien_Object|callback $to - * @param array|null $map * @return array|Varien_Object */ public function &exportFromPayment(Mage_Payment_Model_Info $payment, $to, ?array $map = null) @@ -224,7 +219,6 @@ public function &exportFromPayment(Mage_Payment_Model_Info $payment, $to, ?array /** * Check whether the payment is in review state * - * @param Mage_Payment_Model_Info $payment * @return bool */ public static function isPaymentReviewRequired(Mage_Payment_Model_Info $payment) @@ -240,7 +234,6 @@ public static function isPaymentReviewRequired(Mage_Payment_Model_Info $payment) /** * Check whether fraud order review detected and can be reviewed * - * @param Mage_Payment_Model_Info $payment * @return bool */ public static function isFraudReviewAllowed(Mage_Payment_Model_Info $payment) @@ -252,7 +245,6 @@ public static function isFraudReviewAllowed(Mage_Payment_Model_Info $payment) /** * Check whether the payment is completed * - * @param Mage_Payment_Model_Info $payment * @return bool */ public static function isPaymentCompleted(Mage_Payment_Model_Info $payment) @@ -264,7 +256,6 @@ public static function isPaymentCompleted(Mage_Payment_Model_Info $payment) /** * Check whether the payment was processed successfully * - * @param Mage_Payment_Model_Info $payment * @return bool */ public static function isPaymentSuccessful(Mage_Payment_Model_Info $payment) @@ -285,7 +276,6 @@ public static function isPaymentSuccessful(Mage_Payment_Model_Info $payment) /** * Check whether the payment was processed unsuccessfully or failed * - * @param Mage_Payment_Model_Info $payment * @return bool */ public static function isPaymentFailed(Mage_Payment_Model_Info $payment) @@ -398,8 +388,6 @@ public static function isReversalDisputable($code) /** * Render info item * - * @param array $keys - * @param Mage_Payment_Model_Info $payment * @param bool $labelValuesOnly * @return array */ diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php index 665613a9124..29138652be6 100644 --- a/app/code/core/Mage/Paypal/Model/Ipn.php +++ b/app/code/core/Mage/Paypal/Model/Ipn.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,8 +85,6 @@ public function getRequestData($key = null) /** * Get ipn data, send verification to PayPal, run corresponding handler * - * @param array $request - * @param Zend_Http_Client_Adapter_Interface|null $httpAdapter * @throws Mage_Core_Exception */ public function processIpnRequest(array $request, ?Zend_Http_Client_Adapter_Interface $httpAdapter = null) @@ -120,7 +118,6 @@ public function processIpnRequest(array $request, ?Zend_Http_Client_Adapter_Inte /** * Post back to PayPal to check whether this request is a valid one * - * @param Zend_Http_Client_Adapter_Interface $httpAdapter * @throws Exception */ protected function _postBack(Zend_Http_Client_Adapter_Interface $httpAdapter) diff --git a/app/code/core/Mage/Paypal/Model/Method/Agreement.php b/app/code/core/Mage/Paypal/Model/Method/Agreement.php index dc7b436ed6a..2d10a5d4643 100644 --- a/app/code/core/Mage/Paypal/Model/Method/Agreement.php +++ b/app/code/core/Mage/Paypal/Model/Method/Agreement.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -86,7 +86,6 @@ public function setStore($store) /** * Init billing agreement * - * @param Mage_Payment_Model_Billing_AgreementAbstract $agreement * @return $this */ public function initBillingAgreementToken(Mage_Payment_Model_Billing_AgreementAbstract $agreement) @@ -106,7 +105,6 @@ public function initBillingAgreementToken(Mage_Payment_Model_Billing_AgreementAb /** * Retrieve billing agreement customer details by token * - * @param Mage_Payment_Model_Billing_AgreementAbstract $agreement * @return array */ public function getBillingAgreementTokenInfo(Mage_Payment_Model_Billing_AgreementAbstract $agreement) @@ -127,7 +125,6 @@ public function getBillingAgreementTokenInfo(Mage_Payment_Model_Billing_Agreemen /** * Create billing agreement by token specified in request * - * @param Mage_Payment_Model_Billing_AgreementAbstract $agreement * @return $this */ public function placeBillingAgreement(Mage_Payment_Model_Billing_AgreementAbstract $agreement) @@ -142,7 +139,6 @@ public function placeBillingAgreement(Mage_Payment_Model_Billing_AgreementAbstra /** * Update billing agreement status * - * @param Mage_Payment_Model_Billing_AgreementAbstract $agreement * @return $this */ public function updateBillingAgreementStatus(Mage_Payment_Model_Billing_AgreementAbstract $agreement) @@ -167,7 +163,6 @@ public function updateBillingAgreementStatus(Mage_Payment_Model_Billing_Agreemen /** * Authorize payment * - * @param Varien_Object $payment * @param float $amount * @return $this */ @@ -266,7 +261,6 @@ public function denyPayment(Mage_Payment_Model_Info $payment) /** * Fetch transaction details info * - * @param Mage_Payment_Model_Info $payment * @param string $transactionId * @return array */ @@ -278,7 +272,6 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact /** * Place an order with authorization or capture action * - * @param Mage_Sales_Model_Order_Payment $payment * @param float $amount * @return $this */ diff --git a/app/code/core/Mage/Paypal/Model/Observer.php b/app/code/core/Mage/Paypal/Model/Observer.php index 7bfdc0a1eb8..22e37a36aae 100644 --- a/app/code/core/Mage/Paypal/Model/Observer.php +++ b/app/code/core/Mage/Paypal/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +56,6 @@ public function cleanTransactions() /** * Save order into registry to use it in the overloaded controller. * - * @param Varien_Event_Observer $observer * @return $this */ public function saveOrderAfterSubmit(Varien_Event_Observer $observer) @@ -71,7 +70,6 @@ public function saveOrderAfterSubmit(Varien_Event_Observer $observer) /** * Set data for response of frontend saveOrder action * - * @param Varien_Event_Observer $observer * @return $this */ public function setResponseAfterSaveOrder(Varien_Event_Observer $observer) @@ -109,8 +107,6 @@ public function setResponseAfterSaveOrder(Varien_Event_Observer $observer) /** * Load country dependent PayPal solutions system configuration - * - * @param Varien_Event_Observer $observer */ public function loadCountryDependentSolutionsConfig(Varien_Event_Observer $observer) { @@ -137,8 +133,6 @@ public function loadCountryDependentSolutionsConfig(Varien_Event_Observer $obser /** * Update transaction with HTML representation of txn_id - * - * @param Varien_Event_Observer $observer */ public function observeHtmlTransactionId(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Paypal/Model/Payflow/Request.php b/app/code/core/Mage/Paypal/Model/Payflow/Request.php index 56b8f9cf305..bc02ffd1a3f 100644 --- a/app/code/core/Mage/Paypal/Model/Payflow/Request.php +++ b/app/code/core/Mage/Paypal/Model/Payflow/Request.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php index 3df873ac52b..79168be3f53 100644 --- a/app/code/core/Mage/Paypal/Model/Payflowlink.php +++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -199,7 +199,6 @@ public function getResponse() /** * Fill response with data. * - * @param array $postData * @return $this */ public function setResponseData(array $postData) @@ -252,8 +251,6 @@ public function process($responseData) /** * Operate with order using information from silent post - * - * @param Mage_Sales_Model_Order $order */ protected function _processOrder(Mage_Sales_Model_Order $order) { @@ -368,7 +365,6 @@ protected function _getOrderFromResponse() /** * Build request for getting token * - * @param Mage_Sales_Model_Order_Payment $payment * @return Varien_Object */ protected function _buildTokenRequest(Mage_Sales_Model_Order_Payment $payment) @@ -438,11 +434,10 @@ protected function _getStoreId() } /** - * Return request object with basic information for gateway request - * - * @param Varien_Object $payment - * @return Mage_Paypal_Model_Payflow_Request - */ + * Return request object with basic information for gateway request + * + * @return Mage_Paypal_Model_Payflow_Request + */ protected function _buildBasicRequest(Varien_Object $payment) { $request = Mage::getModel('paypal/payflow_request'); @@ -568,7 +563,6 @@ protected function _addTransaction($payment, $txnId) * Initialize request * * @deprecated since 1.6.2.0 - * @param Varien_Object $payment * @param mixed $amount * @return $this */ @@ -591,7 +585,6 @@ public function prepareOrderReview($token = null) * Additional authorization logic for Account Verification * * @deprecated since 1.6.2.0 - * @param Varien_Object $payment * @param mixed $amount * @param Mage_Paypal_Model_Payment_Transaction $transaction * @param string $txnId @@ -606,7 +599,6 @@ protected function _authorize(Varien_Object $payment, $amount, $transaction, $tx * Operate with order or quote using information from silent post * * @deprecated since 1.6.2.0 - * @param Varien_Object $document */ protected function _process(Varien_Object $document) { diff --git a/app/code/core/Mage/Paypal/Model/Payflowpro.php b/app/code/core/Mage/Paypal/Model/Payflowpro.php index c40b3ba2e17..479de665bad 100644 --- a/app/code/core/Mage/Paypal/Model/Payflowpro.php +++ b/app/code/core/Mage/Paypal/Model/Payflowpro.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -244,7 +244,6 @@ public function void(Varien_Object $payment) /** * Check void availability * - * @param Varien_Object $payment * @return bool */ public function canVoid(Varien_Object $payment) @@ -264,7 +263,6 @@ public function canVoid(Varien_Object $payment) /** * Attempt to void the authorization on cancelling * - * @param Varien_Object $payment * @return $this|false */ public function cancel(Varien_Object $payment) @@ -302,7 +300,6 @@ public function refund(Varien_Object $payment, $amount) /** * Fetch transaction details info * - * @param Mage_Payment_Model_Info $payment * @param string $transactionId * @return array */ @@ -361,7 +358,6 @@ protected function _getTransactionUrl($testMode = null) /** * Post request to gateway and return response * - * @param Varien_Object $request * @return Varien_Object */ protected function _postRequest(Varien_Object $request) @@ -541,8 +537,6 @@ protected function _processErrors(Varien_Object $response) /** * Adopt specified address object to be compatible with Paypal * Puerto Rico should be as state of USA and not as a country - * - * @param Varien_Object $address */ protected function _applyCountryWorkarounds(Varien_Object $address) { @@ -555,7 +549,6 @@ protected function _applyCountryWorkarounds(Varien_Object $address) /** * Set reference transaction data into request * - * @param Varien_Object $payment * @param Varien_Object $request * @return $this */ diff --git a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php index e4b48b46060..6cb3824e618 100644 --- a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Pro.php b/app/code/core/Mage/Paypal/Model/Pro.php index d3447219888..a2e31a813f0 100644 --- a/app/code/core/Mage/Paypal/Model/Pro.php +++ b/app/code/core/Mage/Paypal/Model/Pro.php @@ -9,12 +9,12 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * PayPal Website Payments Pro implementation for payment method instaces + * PayPal Website Payments Pro implementation for payment method instances * This model was created because right now PayPal Direct and PayPal Express payment methods cannot have same abstract * * @category Mage @@ -92,7 +92,6 @@ public function setMethod($code, $storeId = null) /** * Config instance setter * - * @param Mage_Paypal_Model_Config $instace * @param int $storeId * @return $this */ @@ -159,7 +158,6 @@ public function getInfo() * Transfer transaction/payment information from API instance to order payment * * @param Mage_Paypal_Model_Api_Abstract $from - * @param Mage_Payment_Model_Info $to * @return $this */ public function importPaymentInfo(Varien_Object $from, Mage_Payment_Model_Info $to) @@ -190,8 +188,6 @@ public function importPaymentInfo(Varien_Object $from, Mage_Payment_Model_Info $ /** * Void transaction - * - * @param Varien_Object $payment */ public function void(Varien_Object $payment) { @@ -208,7 +204,6 @@ public function void(Varien_Object $payment) * Attempt to capture payment * Will return false if the payment is not supposed to be captured * - * @param Varien_Object $payment * @param float $amount * @return false|null */ @@ -234,7 +229,6 @@ public function capture(Varien_Object $payment, $amount) /** * Refund a capture transaction * - * @param Varien_Object $payment * @param float $amount */ public function refund(Varien_Object $payment, $amount) @@ -262,8 +256,6 @@ public function refund(Varien_Object $payment, $amount) /** * Cancel payment - * - * @param Varien_Object $payment */ public function cancel(Varien_Object $payment) { @@ -285,7 +277,6 @@ public function canReviewPayment(Mage_Payment_Model_Info $payment) /** * Perform the payment review * - * @param Mage_Payment_Model_Info $payment * @param string $action * @return bool */ @@ -310,7 +301,6 @@ public function reviewPayment(Mage_Payment_Model_Info $payment, $action) /** * Fetch transaction details info * - * @param Mage_Payment_Model_Info $payment * @param string $transactionId * @return array */ @@ -328,7 +318,6 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact /** * Validate RP data * - * @param Mage_Payment_Model_Recurring_Profile $profile * @throws Mage_Core_Exception */ public function validateRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile) @@ -353,8 +342,6 @@ public function validateRecurringProfile(Mage_Payment_Model_Recurring_Profile $p /** * Submit RP to the gateway * - * @param Mage_Payment_Model_Recurring_Profile $profile - * @param Mage_Payment_Model_Info $paymentInfo * @throws Mage_Core_Exception */ public function submitRecurringProfile( @@ -384,7 +371,6 @@ public function submitRecurringProfile( * Fetch RP details * * @param string $referenceId - * @param Varien_Object $result */ public function getRecurringProfileDetails($referenceId, Varien_Object $result) { @@ -396,8 +382,6 @@ public function getRecurringProfileDetails($referenceId, Varien_Object $result) /** * Update RP data - * - * @param Mage_Payment_Model_Recurring_Profile $profile */ public function updateRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile) { @@ -405,8 +389,6 @@ public function updateRecurringProfile(Mage_Payment_Model_Recurring_Profile $pro /** * Manage status - * - * @param Mage_Payment_Model_Recurring_Profile $profile */ public function updateRecurringProfileStatus(Mage_Payment_Model_Recurring_Profile $profile) { @@ -464,7 +446,6 @@ protected function _importRefundResultToPayment($api, $payment, $canRefundMore) /** * Parent transaction id getter * - * @param Varien_Object $payment * @return string */ protected function _getParentTransactionId(Varien_Object $payment) diff --git a/app/code/core/Mage/Paypal/Model/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Report/Settlement.php index fca1da12888..d9915990f39 100644 --- a/app/code/core/Mage/Paypal/Model/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Report/Settlement.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -299,7 +299,7 @@ public function parseCsv($localCsv, $format = 'new') } /** - * Load report by unique key (accoutn + report date) + * Load report by unique key (account + report date) * * @return $this */ diff --git a/app/code/core/Mage/Paypal/Model/Resource/Cert.php b/app/code/core/Mage/Paypal/Model/Resource/Cert.php index 15bcbaa92f0..b83bf8bae91 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Cert.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Cert.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Set date of last update * - * @param Mage_Core_Model_Abstract $object * @return Mage_Core_Model_Resource_Db_Abstract */ protected function _beforeSave(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php index 5ad154ebc7c..726b4fe6ff1 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,7 +63,6 @@ protected function _unserializeField(Varien_Object $object, $field, $defaultValu /** * Load the transaction object by specified txn_id * - * @param Mage_Paypal_Model_Payment_Transaction $transaction * @param string $txnId */ public function loadObjectByTxnId(Mage_Paypal_Model_Payment_Transaction $transaction, $txnId) diff --git a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php index d4bf134aba7..7a27f24fb76 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php index fca1a3d661e..3d7b3350496 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -90,7 +90,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) /** * Check if report with same account and report date already fetched * - * @param Mage_Paypal_Model_Report_Settlement $report * @param string $accountId * @param string $reportDate * @return $this diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php index f8591fb3f1f..c3de294a60f 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php b/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php index 4f11ff29f50..0bcb2c4d134 100644 --- a/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php +++ b/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php @@ -101,7 +101,7 @@ protected function _initAction() { $this->_title($this->__('Reports'))->_title($this->__('Sales'))->_title($this->__('PayPal Settlement Reports')); $this->loadLayout() - ->_setActiveMenu('report/sales') + ->_setActiveMenu('report/salesroot/paypal_settlement_reports') ->_addBreadcrumb(Mage::helper('paypal')->__('Reports'), Mage::helper('paypal')->__('Reports')) ->_addBreadcrumb(Mage::helper('paypal')->__('Sales'), Mage::helper('paypal')->__('Sales')) ->_addBreadcrumb(Mage::helper('paypal')->__('PayPal Settlement Reports'), Mage::helper('paypal')->__('PayPal Settlement Reports')); diff --git a/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php b/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php index 58ea967ab14..44c2565f7e1 100644 --- a/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php +++ b/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_PaypalUk * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -524,9 +524,6 @@ public function callGetTransactionDetails() /** * Get FMF results from response, if any - * - * @param array $from - * @param array $collectedWarnings */ protected function _importFraudFiltersResult(array $from, array $collectedWarnings) { @@ -577,7 +574,6 @@ protected function _applyCountryWorkarounds(&$request) /** * Checking negative line items * - * @param array $request * @param int $i * @return null|true */ diff --git a/app/code/core/Mage/PaypalUk/Model/Pro.php b/app/code/core/Mage/PaypalUk/Model/Pro.php index dbf42a84bc1..2c226e476e7 100644 --- a/app/code/core/Mage/PaypalUk/Model/Pro.php +++ b/app/code/core/Mage/PaypalUk/Model/Pro.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_PaypalUk * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,7 +47,6 @@ class Mage_PaypalUk_Model_Pro extends Mage_Paypal_Model_Pro /** * Refund a capture transaction * - * @param Varien_Object $payment * @param float $amount */ public function refund(Varien_Object $payment, $amount) @@ -72,7 +71,6 @@ protected function _isCaptureNeeded() /** * Get payflow transaction id from parent transaction * - * @param Varien_Object $payment * @return string */ protected function _getParentTransactionId(Varien_Object $payment) @@ -107,7 +105,6 @@ protected function _importCaptureResultToPayment($api, $payment) /** * Fetch transaction details info method does not exists in PaypalUK * - * @param Mage_Payment_Model_Info $payment * @param string $transactionId * @throws Mage_Core_Exception * @return void diff --git a/app/code/core/Mage/Persistent/Helper/Data.php b/app/code/core/Mage/Persistent/Helper/Data.php index f866ddeb953..357156f1e93 100644 --- a/app/code/core/Mage/Persistent/Helper/Data.php +++ b/app/code/core/Mage/Persistent/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/Model/Observer.php b/app/code/core/Mage/Persistent/Model/Observer.php index 60681b62406..3e6b86a1af1 100644 --- a/app/code/core/Mage/Persistent/Model/Observer.php +++ b/app/code/core/Mage/Persistent/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -465,8 +465,6 @@ public function setQuoteGuest($checkQuote = false) /** * Check and clear session data if persistent session expired - * - * @param Varien_Event_Observer $observer */ public function checkExpirePersistentQuote(Varien_Event_Observer $observer) { @@ -511,7 +509,6 @@ protected function _expirePersistentSession() /** * Clear expired persistent sessions * - * @param Mage_Cron_Model_Schedule $schedule * @return $this */ public function clearExpiredCronJob(Mage_Cron_Model_Schedule $schedule) @@ -530,8 +527,6 @@ public function clearExpiredCronJob(Mage_Cron_Model_Schedule $schedule) /** * Create handle for persistent session if persistent cookie and customer not logged in - * - * @param Varien_Event_Observer $observer */ public function createPersistentHandleLayout(Varien_Event_Observer $observer) { @@ -549,8 +544,6 @@ public function createPersistentHandleLayout(Varien_Event_Observer $observer) /** * Update customer id and customer group id if user is in persistent session - * - * @param Varien_Event_Observer $observer */ public function updateCustomerCookies(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Persistent/Model/Observer/Session.php b/app/code/core/Mage/Persistent/Model/Observer/Session.php index aa5b7db9c0c..5a335971909 100644 --- a/app/code/core/Mage/Persistent/Model/Observer/Session.php +++ b/app/code/core/Mage/Persistent/Model/Observer/Session.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ class Mage_Persistent_Model_Observer_Session { /** * Create/Update and Load session when customer log in - * - * @param Varien_Event_Observer $observer */ public function synchronizePersistentOnLogin(Varien_Event_Observer $observer) { @@ -72,8 +70,6 @@ public function synchronizePersistentOnLogin(Varien_Event_Observer $observer) /** * Unload persistent session (if set in config) - * - * @param Varien_Event_Observer $observer */ public function synchronizePersistentOnLogout(Varien_Event_Observer $observer) { @@ -96,8 +92,6 @@ public function synchronizePersistentOnLogout(Varien_Event_Observer $observer) /** * Synchronize persistent session info - * - * @param Varien_Event_Observer $observer */ public function synchronizePersistentInfo(Varien_Event_Observer $observer) { @@ -120,8 +114,6 @@ public function synchronizePersistentInfo(Varien_Event_Observer $observer) /** * Set Checked status of "Remember Me" - * - * @param Varien_Event_Observer $observer */ public function setRememberMeCheckedStatus(Varien_Event_Observer $observer) { @@ -145,8 +137,6 @@ public function setRememberMeCheckedStatus(Varien_Event_Observer $observer) /** * Renew persistent cookie - * - * @param Varien_Event_Observer $observer */ public function renewCookie(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php b/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php index 00f52859224..aca685880dd 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ProductAlert * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -92,8 +92,6 @@ public function reset() /** * Add product to collection - * - * @param Mage_Catalog_Model_Product $product */ public function addProduct(Mage_Catalog_Model_Product $product) { @@ -126,7 +124,6 @@ protected function _getUrlParams() /** * Get filtered product short description to be inserted into mail * - * @param Mage_Catalog_Model_Product $product * @return string|null */ public function _getFilteredProductShortDescription(Mage_Catalog_Model_Product $product) diff --git a/app/code/core/Mage/ProductAlert/Model/Email.php b/app/code/core/Mage/ProductAlert/Model/Email.php index 94115385eda..e3e143d2be1 100644 --- a/app/code/core/Mage/ProductAlert/Model/Email.php +++ b/app/code/core/Mage/ProductAlert/Model/Email.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ProductAlert * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -97,7 +97,6 @@ public function getType() /** * Set website model * - * @param Mage_Core_Model_Website $website * @return $this */ public function setWebsite(Mage_Core_Model_Website $website) @@ -133,7 +132,6 @@ public function setCustomerId($customerId) /** * Set customer model * - * @param Mage_Customer_Model_Customer $customer * @return $this */ public function setCustomer(Mage_Customer_Model_Customer $customer) @@ -159,7 +157,6 @@ public function clean() /** * Add product (price change) to collection * - * @param Mage_Catalog_Model_Product $product * @return $this */ public function addPriceProduct(Mage_Catalog_Model_Product $product) @@ -171,7 +168,6 @@ public function addPriceProduct(Mage_Catalog_Model_Product $product) /** * Add product (back in stock) to collection * - * @param Mage_Catalog_Model_Product $product * @return $this */ public function addStockProduct(Mage_Catalog_Model_Product $product) diff --git a/app/code/core/Mage/ProductAlert/Model/Observer.php b/app/code/core/Mage/ProductAlert/Model/Observer.php index dc3a1ee0a3f..fdd9acbe30a 100644 --- a/app/code/core/Mage/ProductAlert/Model/Observer.php +++ b/app/code/core/Mage/ProductAlert/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ProductAlert * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -82,7 +82,6 @@ protected function _getWebsites() /** * Process price emails * - * @param Mage_ProductAlert_Model_Email $email * @return $this */ protected function _processPrice(Mage_ProductAlert_Model_Email $email) @@ -167,7 +166,6 @@ protected function _processPrice(Mage_ProductAlert_Model_Email $email) /** * Process stock emails * - * @param Mage_ProductAlert_Model_Email $email * @return $this */ protected function _processStock(Mage_ProductAlert_Model_Email $email) diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php b/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php index 2c81ddeac23..1ee3810c46d 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_ProductAlert * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ abstract class Mage_ProductAlert_Model_Resource_Abstract extends Mage_Core_Model /** * Retrieve alert row by object parameters * - * @param Mage_Core_Model_Abstract $object * @return array|false */ protected function _getAlertRow(Mage_Core_Model_Abstract $object) @@ -49,7 +48,6 @@ protected function _getAlertRow(Mage_Core_Model_Abstract $object) /** * Load object data by parameters * - * @param Mage_Core_Model_Abstract $object * @return Mage_ProductAlert_Model_Resource_Abstract */ public function loadByParam(Mage_Core_Model_Abstract $object) @@ -64,7 +62,6 @@ public function loadByParam(Mage_Core_Model_Abstract $object) /** * Delete all customer alerts on website * - * @param Mage_Core_Model_Abstract $object * @param int $customerId * @param int $websiteId * @return Mage_ProductAlert_Model_Resource_Abstract diff --git a/app/code/core/Mage/Rating/Model/Observer.php b/app/code/core/Mage/Rating/Model/Observer.php index 20d6f890158..28931f270cd 100644 --- a/app/code/core/Mage/Rating/Model/Observer.php +++ b/app/code/core/Mage/Rating/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Rating_Model_Observer /** * Cleanup product ratings after product delete * - * @param Varien_Event_Observer $observer * @return Mage_Rating_Model_Observer */ public function processProductAfterDeleteEvent(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating.php b/app/code/core/Mage/Rating/Model/Resource/Rating.php index 04accb0f1ce..8a37aa99893 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,7 +71,6 @@ protected function _getLoadSelect($field, $value, $object) /** * Actions after load * - * @param Mage_Core_Model_Abstract|Mage_Rating_Model_Rating $object * @return $this */ protected function _afterLoad(Mage_Core_Model_Abstract $object) @@ -117,7 +116,6 @@ public function getStores($ratingId) /** * Actions after save * - * @param Mage_Core_Model_Abstract|Mage_Rating_Model_Rating $object * @return $this */ protected function _afterSave(Mage_Core_Model_Abstract $object) @@ -213,7 +211,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) * Perform actions after object delete * Prepare rating data for reaggregate all data for reviews * - * @param Mage_Core_Model_Abstract|Mage_Rating_Model_Rating $object * @return $this */ protected function _afterDelete(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php index 8eb345ab13a..c4f9e89c769 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Helper/Data.php b/app/code/core/Mage/Reports/Helper/Data.php index 9d3b969bb0e..0222fa911d0 100644 --- a/app/code/core/Mage/Reports/Helper/Data.php +++ b/app/code/core/Mage/Reports/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Event/Observer.php b/app/code/core/Mage/Reports/Model/Event/Observer.php index 14cc97a1379..45a4b67bbf5 100644 --- a/app/code/core/Mage/Reports/Model/Event/Observer.php +++ b/app/code/core/Mage/Reports/Model/Event/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -70,7 +70,6 @@ protected function _event($eventTypeId, $objectId, $subjectId = null, $subtype = /** * Customer login action * - * @param Varien_Event_Observer $observer * @return $this */ public function customerLogin(Varien_Event_Observer $observer) @@ -97,7 +96,6 @@ public function customerLogin(Varien_Event_Observer $observer) /** * Customer logout processing * - * @param Varien_Event_Observer $observer * @return $this */ public function customerLogout(Varien_Event_Observer $observer) @@ -117,7 +115,6 @@ public function customerLogout(Varien_Event_Observer $observer) /** * View Catalog Product action * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductView(Varien_Event_Observer $observer) @@ -139,7 +136,6 @@ public function catalogProductView(Varien_Event_Observer $observer) /** * Send Product link to friends action * - * @param Varien_Event_Observer $observer * @return $this */ public function sendfriendProduct(Varien_Event_Observer $observer) @@ -159,7 +155,6 @@ public function sendfriendProduct(Varien_Event_Observer $observer) * * Reset count of compared products cache * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductCompareRemoveProduct(Varien_Event_Observer $observer) @@ -176,7 +171,6 @@ public function catalogProductCompareRemoveProduct(Varien_Event_Observer $observ * * Reset count of compared products cache * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductCompareClear(Varien_Event_Observer $observer) @@ -193,7 +187,6 @@ public function catalogProductCompareClear(Varien_Event_Observer $observer) * * Reset count of compared products cache * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductCompareAddProduct(Varien_Event_Observer $observer) @@ -215,7 +208,6 @@ public function catalogProductCompareAddProduct(Varien_Event_Observer $observer) /** * Add product to shopping cart action * - * @param Varien_Event_Observer $observer * @return $this */ public function checkoutCartAddProduct(Varien_Event_Observer $observer) @@ -235,7 +227,6 @@ public function checkoutCartAddProduct(Varien_Event_Observer $observer) /** * Add product to wishlist action * - * @param Varien_Event_Observer $observer * @return $this */ public function wishlistAddProduct(Varien_Event_Observer $observer) @@ -253,7 +244,6 @@ public function wishlistAddProduct(Varien_Event_Observer $observer) /** * Share customer wishlist action * - * @param Varien_Event_Observer $observer * @return $this */ public function wishlistShare(Varien_Event_Observer $observer) @@ -273,7 +263,6 @@ public function wishlistShare(Varien_Event_Observer $observer) * * @see Global Log Clean Settings * - * @param Varien_Event_Observer $observer * @return $this */ public function eventClean(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php index cbf1ab01cb2..64ccfd6e0cc 100644 --- a/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -124,7 +124,7 @@ public function getStoreId() } /** - * On customer loggin merge visitor/customer index + * On customer login merge visitor/customer index * * @return Mage_Reports_Model_Product_Index_Abstract */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php index 9cf8ed63411..6c4135d0522 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php index 252ca5549ef..45ff23d485e 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Event.php b/app/code/core/Mage/Reports/Model/Resource/Event.php index b2a81ecd901..9872c2e1c19 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +33,6 @@ protected function _construct() /** * Update customer type after customer login * - * @param Mage_Reports_Model_Event $model * @param int $visitorId * @param int $customerId * @param array $types @@ -57,10 +56,9 @@ public function updateCustomerType(Mage_Reports_Model_Event $model, $visitorId, /** * Add events log to a collection - * The collection id field is used without corellation, so it must be unique. + * The collection id field is used without correlation, so it must be unique. * DESC ordering by event will be added to the collection * - * @param Varien_Data_Collection_Db $collection * @param int $eventTypeId * @param int $eventSubjectId * @param int $subtype @@ -108,7 +106,6 @@ public function applyLogToCollection( /** * Obtain all current store ids, depending on configuration * - * @param array|null $predefinedStoreIds * @return array * @throws Mage_Core_Model_Store_Exception */ @@ -151,7 +148,6 @@ public function getCurrentStoreIds(?array $predefinedStoreIds = null) /** * Clean report event table * - * @param Mage_Reports_Model_Event $object * @return $this */ public function clean(Mage_Reports_Model_Event $object) diff --git a/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php index 64bcb5eaf42..56f27666828 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,7 +47,6 @@ protected function _construct() /** * Add store ids filter * - * @param array $storeIds * @return $this */ public function addStoreFilter(array $storeIds) diff --git a/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php index 35d50f2f686..e3cceb0d692 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php index 3bc2d3d57b3..e3300319bc9 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -334,8 +334,8 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects = break; case '7d': - // substract 6 days we need to include - // only today and not hte last one from range + // subtract 6 days we need to include + // only today and not the last one from range $dateStart->subDay(6); break; diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php index c2da53b10d7..7b3b9eb8f3c 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php index a2049512e65..0d6f065caa6 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ abstract class Mage_Reports_Model_Resource_Product_Index_Abstract extends Mage_C /** * Update Customer from visitor (Customer logged in) * - * @param Mage_Reports_Model_Product_Index_Abstract $object * @return Mage_Reports_Model_Resource_Product_Index_Abstract */ public function updateCustomerFromVisitor(Mage_Reports_Model_Product_Index_Abstract $object) @@ -88,7 +87,6 @@ public function updateCustomerFromVisitor(Mage_Reports_Model_Product_Index_Abstr /** * Purge visitor data by customer (logout) * - * @param Mage_Reports_Model_Product_Index_Abstract $object * @return Mage_Reports_Model_Resource_Product_Index_Abstract */ public function purgeVisitorByCustomer(Mage_Reports_Model_Product_Index_Abstract $object) @@ -110,7 +108,6 @@ public function purgeVisitorByCustomer(Mage_Reports_Model_Product_Index_Abstract /** * Save Product Index data (forced save) * - * @param Mage_Core_Model_Abstract|Mage_Reports_Model_Product_Index_Abstract $object * @return Mage_Reports_Model_Resource_Product_Index_Abstract * @throws Mage_Core_Exception */ @@ -179,7 +176,6 @@ public function clean() * Add information about product ids to visitor/customer * * - * @param Mage_Reports_Model_Product_Index_Abstract|Varien_Object $object * @param array $productIds * @return Mage_Reports_Model_Resource_Product_Index_Abstract */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php index 3219bd8df50..e6d614b6a10 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -144,7 +144,6 @@ public function setAddedAtOrder($dir = self::SORT_ORDER_DESC) /** * Set list of ids with expected order * - * @param array $ids * @return Mage_Reports_Model_Resource_Product_Index_Collection_Abstract */ public function setSortIds(array $ids) diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php index 78e835754b2..96ef04e36b9 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php index 80f73ca45ca..2f8bd2c3f40 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,7 @@ protected function _construct() { parent::_construct(); $this->_useAnalyticFunction = true; - // skip adding stock information to collection for perfromance reasons + // skip adding stock information to collection for performance reasons $this->setFlag('no_stock_data', true); } /** diff --git a/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php index 2ac7a6c8289..4401e9938ac 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2015-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2015-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php index 92aa5cab177..09bc0225cf1 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php index 5b9295f4658..68bf5a82a9d 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -80,7 +80,6 @@ class Mage_Reports_Model_Resource_Report_Collection_Abstract extends Mage_Core_M /** * Set array of columns that should be aggregated * - * @param array $columns * @return $this */ public function setAggregatedColumns(array $columns) @@ -158,7 +157,6 @@ public function addStoreFilter($storeIds) /** * Apply stores filter to select object * - * @param Zend_Db_Select $select * @return $this */ protected function _applyStoresFilterToSelect(Zend_Db_Select $select) diff --git a/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php index 4b36f9ec023..75718e3bb5b 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php index bc3c522d55f..6094fce5672 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php index 18a52825887..aae58a14df7 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php index 1a0a59a76c4..a550325b0ac 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php index 36dd6c98241..a4487bd9a1e 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Test.php b/app/code/core/Mage/Reports/Model/Test.php index 3148f231b21..12d7f0b93f0 100644 --- a/app/code/core/Mage/Reports/Model/Test.php +++ b/app/code/core/Mage/Reports/Model/Test.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Totals.php b/app/code/core/Mage/Reports/Model/Totals.php index e4181308677..f182d477091 100644 --- a/app/code/core/Mage/Reports/Model/Totals.php +++ b/app/code/core/Mage/Reports/Model/Totals.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Block/Product/View.php b/app/code/core/Mage/Review/Block/Product/View.php index 47b18b6757e..7f35e2afb17 100644 --- a/app/code/core/Mage/Review/Block/Product/View.php +++ b/app/code/core/Mage/Review/Block/Product/View.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,7 +40,6 @@ protected function _toHtml() * Replace review summary html with more detailed review summary * Reviews collection count will be jerked here * - * @param Mage_Catalog_Model_Product $product * @param bool $templateType * @param bool $displayIfNoReviews * @return string diff --git a/app/code/core/Mage/Review/Model/Observer.php b/app/code/core/Mage/Review/Model/Observer.php index 008a971dec5..6ca3375cdcf 100644 --- a/app/code/core/Mage/Review/Model/Observer.php +++ b/app/code/core/Mage/Review/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Review_Model_Observer /** * Add review summary info for tagged product collection * - * @param Varien_Event_Observer $observer * @return $this */ public function tagProductCollectionLoadAfter(Varien_Event_Observer $observer) @@ -40,7 +39,6 @@ public function tagProductCollectionLoadAfter(Varien_Event_Observer $observer) /** * Cleanup product reviews after product delete * - * @param Varien_Event_Observer $observer * @return $this */ public function processProductAfterDeleteEvent(Varien_Event_Observer $observer) @@ -57,7 +55,6 @@ public function processProductAfterDeleteEvent(Varien_Event_Observer $observer) /** * Append review summary before rendering html * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogBlockProductCollectionBeforeToHtml(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Review/Model/Resource/Review.php b/app/code/core/Mage/Review/Model/Resource/Review.php index f04dd65e16f..777ddeea9ac 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review.php +++ b/app/code/core/Mage/Review/Model/Resource/Review.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -105,7 +105,6 @@ protected function _getLoadSelect($field, $value, $object) /** * Perform actions before object save * - * @param Mage_Core_Model_Abstract|Mage_Review_Model_Review $object * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $object) @@ -126,7 +125,6 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) /** * Perform actions after object save * - * @param Mage_Core_Model_Abstract|Mage_Review_Model_Review $object * @return $this * @throws Zend_Db_Adapter_Exception */ @@ -191,7 +189,6 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) /** * Perform actions after object load * - * @param Mage_Core_Model_Abstract|Mage_Review_Model_Review $object * @return $this * @throws Mage_Core_Model_Store_Exception */ @@ -213,7 +210,6 @@ protected function _afterLoad(Mage_Core_Model_Abstract $object) /** * Action before delete * - * @param Mage_Core_Model_Abstract|Mage_Review_Model_Review $object * @return $this */ protected function _beforeDelete(Mage_Core_Model_Abstract $object) @@ -229,7 +225,6 @@ protected function _beforeDelete(Mage_Core_Model_Abstract $object) /** * Perform actions after object delete * - * @param Mage_Core_Model_Abstract $object * @return $this */ public function afterDeleteCommit(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php index 15df70d30f0..4a055123e37 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -128,7 +128,6 @@ public function setStoreFilter($storeId) /** * Applies all store filters in one place to prevent multiple joins in select * - * @param null|Zend_Db_Select $select * @return $this */ protected function _applyStoresFilterToSelect(?Zend_Db_Select $select = null) diff --git a/app/code/core/Mage/Review/Model/Review.php b/app/code/core/Mage/Review/Model/Review.php index a451e0c849b..4b0f05cfad9 100644 --- a/app/code/core/Mage/Review/Model/Review.php +++ b/app/code/core/Mage/Review/Model/Review.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/controllers/ProductController.php b/app/code/core/Mage/Review/controllers/ProductController.php index f8fb67d9c89..3075ffe85b1 100644 --- a/app/code/core/Mage/Review/controllers/ProductController.php +++ b/app/code/core/Mage/Review/controllers/ProductController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -308,7 +308,6 @@ protected function _initProductLayout($product) /** * Crops POST values - * @param array $reviewData * @return array */ protected function _cropReviewData(array $reviewData) diff --git a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php index 406d08ec2cc..568eb843714 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php +++ b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rss * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Catalog/Special.php b/app/code/core/Mage/Rss/Block/Catalog/Special.php index 01d390954e1..aaae8a2d1c7 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Special.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Special.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rss * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Rss_Block_Catalog_Special extends Mage_Rss_Block_Catalog_Abstract { /** - * Zend_Date object for date comparsions + * Zend_Date object for date comparisons * * @var Zend_Date|null */ diff --git a/app/code/core/Mage/Rss/Model/Observer.php b/app/code/core/Mage/Rss/Model/Observer.php index 20cef8933a4..07a124d6835 100644 --- a/app/code/core/Mage/Rss/Model/Observer.php +++ b/app/code/core/Mage/Rss/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rss * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,9 +35,6 @@ class Mage_Rss_Model_Observer */ protected $_app; - /** - * @param array $args - */ public function __construct(array $args = []) { $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory'); @@ -46,8 +43,6 @@ public function __construct(array $args = []) /** * Clean cache for catalog review rss - * - * @param Varien_Event_Observer $observer */ public function reviewSaveAfter(Varien_Event_Observer $observer) { @@ -56,8 +51,6 @@ public function reviewSaveAfter(Varien_Event_Observer $observer) /** * Clean cache for notify stock rss - * - * @param Varien_Event_Observer $observer */ public function salesOrderItemSaveAfterNotifyStock(Varien_Event_Observer $observer) { @@ -66,8 +59,6 @@ public function salesOrderItemSaveAfterNotifyStock(Varien_Event_Observer $observ /** * Clean cache for catalog new orders rss - * - * @param Varien_Event_Observer $observer */ public function salesOrderItemSaveAfterOrderNew(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Rule/Block/Actions.php b/app/code/core/Mage/Rule/Block/Actions.php index 1feea05ab1f..7ab0ace7479 100644 --- a/app/code/core/Mage/Rule/Block/Actions.php +++ b/app/code/core/Mage/Rule/Block/Actions.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Rule_Block_Actions implements Varien_Data_Form_Element_Renderer_Interface { /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Rule/Block/Conditions.php b/app/code/core/Mage/Rule/Block/Conditions.php index 2b2f09e88ea..a14a13c7d6b 100644 --- a/app/code/core/Mage/Rule/Block/Conditions.php +++ b/app/code/core/Mage/Rule/Block/Conditions.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Rule_Block_Conditions implements Varien_Data_Form_Element_Renderer_Interface { /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Rule/Block/Editable.php b/app/code/core/Mage/Rule/Block/Editable.php index b2f62ff2d76..592fc1cc164 100644 --- a/app/code/core/Mage/Rule/Block/Editable.php +++ b/app/code/core/Mage/Rule/Block/Editable.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Rule_Block_Editable extends Mage_Core_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface { /** - * @param Varien_Data_Form_Element_Abstract $element * @see Varien_Data_Form_Element_Renderer_Interface::render() * @return string */ diff --git a/app/code/core/Mage/Rule/Block/Newchild.php b/app/code/core/Mage/Rule/Block/Newchild.php index 81635e80901..602f7e85280 100644 --- a/app/code/core/Mage/Rule/Block/Newchild.php +++ b/app/code/core/Mage/Rule/Block/Newchild.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Rule_Block_Newchild extends Mage_Core_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface { /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Rule/Model/Abstract.php b/app/code/core/Mage/Rule/Model/Abstract.php index 711075dcc4e..b20323241b9 100644 --- a/app/code/core/Mage/Rule/Model/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -284,7 +284,6 @@ public function getForm() /** * Initialize rule model data from array * - * @param array $data * * @return Mage_Rule_Model_Abstract */ @@ -306,7 +305,6 @@ public function loadPost(array $data) * Set conditions and actions recursively. * Convert dates into Zend_Date. * - * @param array $data * * @return array */ @@ -347,7 +345,6 @@ protected function _convertFlatToRecursive(array $data) /** * Validate rule conditions to determine if rule can run * - * @param Varien_Object $object * * @return bool */ @@ -359,7 +356,6 @@ public function validate(Varien_Object $object) /** * Validate rule data * - * @param Varien_Object $object * * @return bool|array - return true if validation passed successfully. Array with errors description otherwise */ @@ -485,7 +481,6 @@ public function asHtml() * * @deprecated since 1.7.0.0 * - * @param array $arrAttributes * * @return array */ diff --git a/app/code/core/Mage/Rule/Model/Action/Abstract.php b/app/code/core/Mage/Rule/Model/Action/Abstract.php index ce3b7befe28..0cd8d40b1dc 100644 --- a/app/code/core/Mage/Rule/Model/Action/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Action/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,7 +71,6 @@ public function getForm() } /** - * @param array $arrAttributes * @return array */ public function asArray(array $arrAttributes = []) @@ -96,7 +95,6 @@ public function asXml() } /** - * @param array $arr * @return $this */ public function loadArray(array $arr) diff --git a/app/code/core/Mage/Rule/Model/Action/Collection.php b/app/code/core/Mage/Rule/Model/Action/Collection.php index 5e0322669dd..04ac972f7e3 100644 --- a/app/code/core/Mage/Rule/Model/Action/Collection.php +++ b/app/code/core/Mage/Rule/Model/Action/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,7 +42,6 @@ public function __construct() * {action::asArray} * ) * - * @param array $arrAttributes * @return array */ public function asArray(array $arrAttributes = []) @@ -56,7 +55,6 @@ public function asArray(array $arrAttributes = []) } /** - * @param array $arr * @return $this|Mage_Rule_Model_Action_Abstract */ public function loadArray(array $arr) @@ -75,7 +73,6 @@ public function loadArray(array $arr) } /** - * @param Mage_Rule_Model_Action_Interface $action * @return $this */ public function addAction(Mage_Rule_Model_Action_Interface $action) diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php index e31fbdda29c..b9c51171e61 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -174,7 +174,6 @@ public function getForm() } /** - * @param array $arrAttributes * @return array */ public function asArray(array $arrAttributes = []) @@ -824,7 +823,6 @@ protected function _compareValues($validatedValue, $value, $strict = true) } /** - * @param Varien_Object $object * @return bool */ public function validate(Varien_Object $object) diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php index 3c856176cdf..c89a17fe239 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Combine.php +++ b/app/code/core/Mage/Rule/Model/Condition/Combine.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -210,7 +210,6 @@ public function getValueElementType() * ) * ) * - * @param array $arrAttributes * @return array */ public function asArray(array $arrAttributes = []) @@ -346,7 +345,6 @@ public function asStringRecursive($level = 0) } /** - * @param Varien_Object $object * @return bool */ public function validate(Varien_Object $object) diff --git a/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php index 5b778862b03..1b2a3c3e503 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -116,8 +116,6 @@ public function prepareConditionSql() /** * Rule condition SQL builder setter - * - * @param Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder $ruleHelper */ public function setRuleResourceHelper(Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder $ruleHelper) { @@ -157,8 +155,6 @@ public function getAttributeObject() /** * Add special attributes - * - * @param array $attributes */ protected function _addSpecialAttributes(array &$attributes) { @@ -501,7 +497,6 @@ public function loadArray($arr) /** * Validate product attribute value for condition * - * @param Varien_Object $object * @return bool */ public function validate(Varien_Object $object) diff --git a/app/code/core/Mage/Rule/Model/Renderer/Actions.php b/app/code/core/Mage/Rule/Model/Renderer/Actions.php index 209477cfd34..4016a0ce34e 100644 --- a/app/code/core/Mage/Rule/Model/Renderer/Actions.php +++ b/app/code/core/Mage/Rule/Model/Renderer/Actions.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Rule_Model_Renderer_Actions implements Varien_Data_Form_Element_Renderer_Interface { /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Rule/Model/Renderer/Conditions.php b/app/code/core/Mage/Rule/Model/Renderer/Conditions.php index 6aa7b260503..a334c5ad6ec 100644 --- a/app/code/core/Mage/Rule/Model/Renderer/Conditions.php +++ b/app/code/core/Mage/Rule/Model/Renderer/Conditions.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Rule_Model_Renderer_Conditions implements Varien_Data_Form_Element_Renderer_Interface { /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Rule/Model/Resource/Abstract.php b/app/code/core/Mage/Rule/Model/Resource/Abstract.php index 60af13dee3e..d310e24c4e5 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Resource/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +46,6 @@ abstract class Mage_Rule_Model_Resource_Abstract extends Mage_Core_Model_Resourc /** * Prepare rule's active "from" and "to" dates * - * @param Mage_Core_Model_Abstract $object * * @return Mage_Rule_Model_Resource_Abstract */ diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php index e96de3c44ad..540bf67b8de 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -168,7 +168,6 @@ protected function _getAssociatedEntityInfo($entityType) /** * Set environment for all rules in collection * - * @param Mage_Rule_Model_Environment|null $env * @return $this * @deprecated after 1.6.2.0 * diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php index 296d232f9bf..b48038d6cf7 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,9 +25,6 @@ class Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder */ protected $_adapter; - /** - * @param array $config - */ public function __construct(array $config = []) { $this->_adapter = $config['adapter'] ?? Mage::getSingleton('core/resource')->getConnection(Mage_Core_Model_Resource::DEFAULT_READ_RESOURCE); diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php index 713bee21bab..46b76de6a3a 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php index 43cca27f90e..083ee6849d5 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,7 +52,6 @@ class Mage_Sales_Block_Adminhtml_Recurring_Profile_Edit_Form extends Mage_Adminh /** * Setter for parent element * - * @param Varien_Data_Form_Element_Abstract $element * @return Mage_Sales_Block_Adminhtml_Recurring_Profile_Edit_Form */ public function setParentElement(Varien_Data_Form_Element_Abstract $element) @@ -64,7 +63,6 @@ public function setParentElement(Varien_Data_Form_Element_Abstract $element) /** * Setter for current product * - * @param Mage_Catalog_Model_Product $product * @return Mage_Sales_Block_Adminhtml_Recurring_Profile_Edit_Form */ public function setProductEntity(Mage_Catalog_Model_Product $product) @@ -111,7 +109,7 @@ protected function _prepareForm() /** * if there is a parent element defined, it will be replaced by a hidden element with the same name - * and overriden by the form elements + * and overridden by the form elements * It is needed to maintain HTML consistency of the parent element's form */ if ($this->_parentElement) { diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php index 5e4ccd16c32..aae8714d543 100644 --- a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php +++ b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -75,7 +75,6 @@ public function getRelatedOrders() /** * Retrieve order item value by key * - * @param Mage_Sales_Model_Order $order * @param string $key * @return string */ diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreements.php b/app/code/core/Mage/Sales/Block/Billing/Agreements.php index 5f7549318ac..3c77fd9b754 100644 --- a/app/code/core/Mage/Sales/Block/Billing/Agreements.php +++ b/app/code/core/Mage/Sales/Block/Billing/Agreements.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -70,7 +70,6 @@ public function getBillingAgreements() /** * Retrieve item value by key * - * @param Mage_Sales_Model_Billing_Agreement $item * @param string $key * @return string */ diff --git a/app/code/core/Mage/Sales/Block/Items/Abstract.php b/app/code/core/Mage/Sales/Block/Items/Abstract.php index 9a0490126f9..bfdb89567f7 100644 --- a/app/code/core/Mage/Sales/Block/Items/Abstract.php +++ b/app/code/core/Mage/Sales/Block/Items/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -83,7 +83,6 @@ public function getItemRenderer($type) /** * Prepare item before output * - * @param Mage_Core_Block_Abstract $renderer * @return $this */ protected function _prepareItem(Mage_Core_Block_Abstract $renderer) @@ -94,7 +93,6 @@ protected function _prepareItem(Mage_Core_Block_Abstract $renderer) /** * Return product type for quote/order item * - * @param Varien_Object $item * @return string */ protected function _getItemType(Varien_Object $item) @@ -112,7 +110,6 @@ protected function _getItemType(Varien_Object $item) /** * Get item row html * - * @param Varien_Object $item * @return string */ public function getItemHtml(Varien_Object $item) diff --git a/app/code/core/Mage/Sales/Block/Order/Comments.php b/app/code/core/Mage/Sales/Block/Order/Comments.php index de763ca26d1..14481951f20 100644 --- a/app/code/core/Mage/Sales/Block/Order/Comments.php +++ b/app/code/core/Mage/Sales/Block/Order/Comments.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,7 +27,7 @@ class Mage_Sales_Block_Order_Comments extends Mage_Core_Block_Template protected $_entity; /** - * Currect comments collection + * Current comments collection * * @var Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract|null */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php index 3588c522507..d9cb6ec0dd4 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php index fc76f78481b..8c723e07014 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php index 3ed317cde58..e47aa23e13a 100644 --- a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Sales_Block_Order_Item_Renderer_Default extends Mage_Core_Block_Template { /** - * @param Varien_Object $item * @return $this */ public function setItem(Varien_Object $item) diff --git a/app/code/core/Mage/Sales/Block/Order/Print.php b/app/code/core/Mage/Sales/Block/Order/Print.php index 914b989c847..8b7d6250292 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print.php +++ b/app/code/core/Mage/Sales/Block/Order/Print.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +59,6 @@ public function getOrder() } /** - * @param Mage_Core_Block_Abstract $renderer * @return Mage_Sales_Block_Items_Abstract */ protected function _prepareItem(Mage_Core_Block_Abstract $renderer) diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php b/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php index c1b0b554be3..03437949e54 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -83,7 +83,6 @@ public function getCreditmemo() } /** - * @param Mage_Core_Block_Abstract $renderer * @return Mage_Sales_Block_Items_Abstract */ protected function _prepareItem(Mage_Core_Block_Abstract $renderer) diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php b/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php index 7c5b45940e5..609a19e92ca 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -83,7 +83,6 @@ public function getInvoice() } /** - * @param Mage_Core_Block_Abstract $renderer * @return Mage_Sales_Block_Items_Abstract */ protected function _prepareItem(Mage_Core_Block_Abstract $renderer) diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php index 307ae1448cc..d7942d82983 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -121,7 +121,6 @@ public function getShipment() } /** - * @param Mage_Core_Block_Abstract $renderer * @inheritDoc */ protected function _prepareItem(Mage_Core_Block_Abstract $renderer) diff --git a/app/code/core/Mage/Sales/Block/Order/Totals.php b/app/code/core/Mage/Sales/Block/Order/Totals.php index 2c5ebf5f074..aa686cae572 100644 --- a/app/code/core/Mage/Sales/Block/Order/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Totals.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -155,7 +155,6 @@ protected function _initTotals() /** * Add new total to totals array after specific total or before last total by default * - * @param Varien_Object $total * @param null|string $after accepted values: 'first', 'last' * @return Mage_Sales_Block_Order_Totals */ @@ -193,7 +192,6 @@ public function addTotal(Varien_Object $total, $after = null) /** * Add new total to totals array before specific total or after first total by default * - * @param Varien_Object $total * @param null|array|string $before * @return Mage_Sales_Block_Order_Totals */ diff --git a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php index 0736755d06c..903bc284c0d 100644 --- a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php +++ b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -310,7 +310,6 @@ public function prepareRelatedOrdersFrontendGrid() /** * Get rendered row value * - * @param Varien_Object $row * @return string */ public function renderRowValue(Varien_Object $row) @@ -347,7 +346,6 @@ protected function _prepareRelatedOrders($fieldsToSelect = '*') /** * Add specified data to the $_info * - * @param array $data * @param string $key = null */ protected function _addInfo(array $data, $key = null) diff --git a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php index 569c2009ae7..436cc526b9b 100644 --- a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php +++ b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,7 +85,6 @@ public function getItems() /** * Check item product availability for reorder * - * @param Mage_Sales_Model_Order_Item $orderItem * @return bool */ public function isItemAvailableForReorder(Mage_Sales_Model_Order_Item $orderItem) diff --git a/app/code/core/Mage/Sales/Helper/Data.php b/app/code/core/Mage/Sales/Helper/Data.php index 375692a5ea5..b5e60d8e198 100644 --- a/app/code/core/Mage/Sales/Helper/Data.php +++ b/app/code/core/Mage/Sales/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,7 +36,6 @@ class Mage_Sales_Helper_Data extends Mage_Core_Helper_Data /** * Check quote amount * - * @param Mage_Sales_Model_Quote $quote * @param float $amount * @return $this */ diff --git a/app/code/core/Mage/Sales/Helper/Reorder.php b/app/code/core/Mage/Sales/Helper/Reorder.php index 59b831de524..17ed7afbaed 100644 --- a/app/code/core/Mage/Sales/Helper/Reorder.php +++ b/app/code/core/Mage/Sales/Helper/Reorder.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +48,6 @@ public function isAllowed($store = null) } /** - * @param Mage_Sales_Model_Order $order * @return bool */ public function canReorder(Mage_Sales_Model_Order $order) diff --git a/app/code/core/Mage/Sales/Model/Api/Resource.php b/app/code/core/Mage/Sales/Model/Api/Resource.php index 9e1617c2086..ac9ccc55f33 100644 --- a/app/code/core/Mage/Sales/Model/Api/Resource.php +++ b/app/code/core/Mage/Sales/Model/Api/Resource.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,7 +45,6 @@ class Mage_Sales_Model_Api_Resource extends Mage_Api_Model_Resource_Abstract * @param array $data * @param Mage_Core_Model_Abstract $object * @param string $type - * @param array|null $attributes * @return $this */ protected function _updateAttributes($data, $object, $type, ?array $attributes = null) @@ -64,7 +63,6 @@ protected function _updateAttributes($data, $object, $type, ?array $attributes = * * @param Mage_Core_Model_Abstract $object * @param string $type - * @param array|null $attributes * @return array */ protected function _getAttributes($object, $type, ?array $attributes = null) @@ -101,7 +99,6 @@ protected function _getAttributes($object, $type, ?array $attributes = null) * * @param string $attributeCode * @param string $type - * @param array|null $attributes * @return bool */ protected function _isAllowedAttribute($attributeCode, $type, ?array $attributes = null) diff --git a/app/code/core/Mage/Sales/Model/Api2/Order.php b/app/code/core/Mage/Sales/Model/Api2/Order.php index 51b0df1f9a7..dab2973bebd 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +33,6 @@ class Mage_Sales_Model_Api2_Order extends Mage_Api2_Model_Resource /** * Add gift message info to select * - * @param Mage_Sales_Model_Resource_Order_Collection $collection * @return $this */ protected function _addGiftMessageInfo(Mage_Sales_Model_Resource_Order_Collection $collection) @@ -54,7 +53,6 @@ protected function _addGiftMessageInfo(Mage_Sales_Model_Resource_Order_Collectio /** * Add order payment method field to select * - * @param Mage_Sales_Model_Resource_Order_Collection $collection * @return $this */ protected function _addPaymentMethodInfo(Mage_Sales_Model_Resource_Order_Collection $collection) @@ -71,7 +69,6 @@ protected function _addPaymentMethodInfo(Mage_Sales_Model_Resource_Order_Collect /** * Add order tax information to select * - * @param Mage_Sales_Model_Resource_Order_Collection $collection * @return $this */ protected function _addTaxInfo(Mage_Sales_Model_Resource_Order_Collection $collection) diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php index 8d07978b014..36ed8ea44fb 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Api2_Order_Comment_Rest_Admin_V1 extends Mage_Sales_Model /** * Add comment to order * - * @param array $data * @return string */ protected function _create(array $data) diff --git a/app/code/core/Mage/Sales/Model/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Billing/Agreement.php index 9efd5e36944..6115a2d972b 100644 --- a/app/code/core/Mage/Sales/Model/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Model/Billing/Agreement.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -231,7 +231,6 @@ public function isValid() * [billing_agreement_id] => string * [method_code] => string * - * @param Mage_Sales_Model_Order_Payment $payment * @return $this */ public function importOrderPayment(Mage_Sales_Model_Order_Payment $payment) diff --git a/app/code/core/Mage/Sales/Model/Convert/Order.php b/app/code/core/Mage/Sales/Model/Convert/Order.php index d03de8c6e70..6d86d17e190 100644 --- a/app/code/core/Mage/Sales/Model/Convert/Order.php +++ b/app/code/core/Mage/Sales/Model/Convert/Order.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Convert_Order extends Varien_Object /** * Converting order object to quote object * - * @param Mage_Sales_Model_Order $order * @param null|Mage_Sales_Model_Quote $quote * @return Mage_Sales_Model_Quote */ @@ -46,7 +45,6 @@ public function toQuote(Mage_Sales_Model_Order $order, $quote = null) /** * Convert order to shipping address * - * @param Mage_Sales_Model_Order $order * @return Mage_Sales_Model_Quote_Address */ public function toQuoteShippingAddress(Mage_Sales_Model_Order $order) @@ -60,7 +58,6 @@ public function toQuoteShippingAddress(Mage_Sales_Model_Order $order) /** * Convert order address to quote address * - * @param Mage_Sales_Model_Order_Address $address * @return Mage_Sales_Model_Quote_Address */ public function addressToQuoteAddress(Mage_Sales_Model_Order_Address $address) @@ -78,7 +75,6 @@ public function addressToQuoteAddress(Mage_Sales_Model_Order_Address $address) /** * Convert order payment to quote payment * - * @param Mage_Sales_Model_Order_Payment $payment * @param null|Mage_Sales_Model_Quote_Payment $quotePayment * @return Mage_Sales_Model_Quote_Payment */ @@ -98,7 +94,6 @@ public function paymentToQuotePayment(Mage_Sales_Model_Order_Payment $payment, $ /** * Retrieve * - * @param Mage_Sales_Model_Order_Item $item * @return Mage_Sales_Model_Quote_Item */ public function itemToQuoteItem(Mage_Sales_Model_Order_Item $item) @@ -116,7 +111,6 @@ public function itemToQuoteItem(Mage_Sales_Model_Order_Item $item) /** * Convert order object to invoice * - * @param Mage_Sales_Model_Order $order * @return Mage_Sales_Model_Order_Invoice */ public function toInvoice(Mage_Sales_Model_Order $order) @@ -135,7 +129,6 @@ public function toInvoice(Mage_Sales_Model_Order $order) /** * Convert order item object to invoice item * - * @param Mage_Sales_Model_Order_Item $item * @return Mage_Sales_Model_Order_Invoice_Item */ public function itemToInvoiceItem(Mage_Sales_Model_Order_Item $item) @@ -151,7 +144,6 @@ public function itemToInvoiceItem(Mage_Sales_Model_Order_Item $item) /** * Convert order object to Shipment * - * @param Mage_Sales_Model_Order $order * @return Mage_Sales_Model_Order_Shipment */ public function toShipment(Mage_Sales_Model_Order $order) @@ -170,7 +162,6 @@ public function toShipment(Mage_Sales_Model_Order $order) /** * Convert order item object to Shipment item * - * @param Mage_Sales_Model_Order_Item $item * @return Mage_Sales_Model_Order_Shipment_Item */ public function itemToShipmentItem(Mage_Sales_Model_Order_Item $item) @@ -186,7 +177,6 @@ public function itemToShipmentItem(Mage_Sales_Model_Order_Item $item) /** * Convert order object to creditmemo * - * @param Mage_Sales_Model_Order $order * @return Mage_Sales_Model_Order_Creditmemo */ public function toCreditmemo(Mage_Sales_Model_Order $order) @@ -205,7 +195,6 @@ public function toCreditmemo(Mage_Sales_Model_Order $order) /** * Convert order item object to Creditmemo item * - * @param Mage_Sales_Model_Order_Item $item * @return Mage_Sales_Model_Order_Creditmemo_Item */ public function itemToCreditmemoItem(Mage_Sales_Model_Order_Item $item) diff --git a/app/code/core/Mage/Sales/Model/Convert/Quote.php b/app/code/core/Mage/Sales/Model/Convert/Quote.php index 58045eaafa7..c5620307c27 100644 --- a/app/code/core/Mage/Sales/Model/Convert/Quote.php +++ b/app/code/core/Mage/Sales/Model/Convert/Quote.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Convert_Quote extends Varien_Object /** * Convert quote model to order model * - * @param Mage_Sales_Model_Quote $quote * @param null|Mage_Sales_Model_Order $order * @return Mage_Sales_Model_Order */ @@ -48,7 +47,6 @@ public function toOrder(Mage_Sales_Model_Quote $quote, $order = null) /** * Convert quote address model to order * - * @param Mage_Sales_Model_Quote_Address $address * @param null|Mage_Sales_Model_Order $order * @return Mage_Sales_Model_Order */ @@ -67,7 +65,6 @@ public function addressToOrder(Mage_Sales_Model_Quote_Address $address, $order = /** * Convert quote address to order address * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Order_Address */ public function addressToOrderAddress(Mage_Sales_Model_Quote_Address $address) @@ -91,7 +88,6 @@ public function addressToOrderAddress(Mage_Sales_Model_Quote_Address $address) /** * Convert quote payment to order payment * - * @param Mage_Sales_Model_Quote_Payment $payment * @return Mage_Sales_Model_Order_Payment */ public function paymentToOrderPayment(Mage_Sales_Model_Quote_Payment $payment) @@ -112,7 +108,6 @@ public function paymentToOrderPayment(Mage_Sales_Model_Quote_Payment $payment) /** * Convert quote item to order item * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return Mage_Sales_Model_Order_Item */ public function itemToOrderItem(Mage_Sales_Model_Quote_Item_Abstract $item) diff --git a/app/code/core/Mage/Sales/Model/Email/Template.php b/app/code/core/Mage/Sales/Model/Email/Template.php index 74cddc4d680..e7beb53fe01 100644 --- a/app/code/core/Mage/Sales/Model/Email/Template.php +++ b/app/code/core/Mage/Sales/Model/Email/Template.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -21,7 +21,6 @@ class Mage_Sales_Model_Email_Template extends Mage_Core_Model_Email_Template { /** * @param string $template - * @param array $variables * @return false|string */ public function getInclude($template, array $variables) diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php index d2ed099421a..19b4117dced 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ public function __construct() } /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function collectTotals(Mage_Sales_Model_Quote_Address $address) @@ -47,7 +46,6 @@ public function collectTotals(Mage_Sales_Model_Quote_Address $address) } /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php index 74a9b05846d..3d9251db0fb 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function collectTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php index 4d95cb2c1b9..3a08d384dcb 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract { /** - * @param Mage_Sales_Model_Quote_Address $address * @return array */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php index 0e26a162f96..63f4c0f0aab 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php index ab561ea44f5..9b5f66f3bb9 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php index a52f4851274..66ebbd4e4f9 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php index a01adfee018..b975b5e9aaf 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php index c20a76a537e..1f7c83965a4 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php index f066b1891f7..891b7a144d4 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php index 0cbf9838518..812d79fe36a 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +56,6 @@ public function __construct() } /** - * @param Mage_Customer_Model_Customer $customer * @return $this */ public function setCustomerFilter(Mage_Customer_Model_Customer $customer) diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php index cde0481ce00..1c6a67c18a7 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php @@ -9,12 +9,12 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Quote addresses shiping rates collection + * Quote addresses shipping rates collection * * @category Mage * @package Mage_Sales diff --git a/app/code/core/Mage/Sales/Model/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php index 0be7dd2ac34..addc69fd134 100644 --- a/app/code/core/Mage/Sales/Model/Observer.php +++ b/app/code/core/Mage/Sales/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -75,7 +75,6 @@ public function getExpireQuotesAdditionalFilterFields() /** * Set expire quotes additional fields to filter * - * @param array $fields * @return $this */ public function setExpireQuotesAdditionalFilterFields(array $fields) @@ -85,10 +84,9 @@ public function setExpireQuotesAdditionalFilterFields(array $fields) } /** - * When deleting product, substract it from all quotes quantities + * When deleting product, subtract it from all quotes quantities * * @throws Exception - * @param Varien_Event_Observer $observer * @return $this */ public function substractQtyFromQuotes(Varien_Event_Observer $observer) @@ -102,7 +100,6 @@ public function substractQtyFromQuotes(Varien_Event_Observer $observer) /** * When applying a catalog price rule, make related quotes recollect on demand * - * @param Varien_Event_Observer $observer * @return $this */ public function markQuotesRecollectOnCatalogRules(Varien_Event_Observer $observer) @@ -132,7 +129,6 @@ public function markQuotesRecollectOnCatalogRules(Varien_Event_Observer $observe /** * Catalog Product After Save (change status process) * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductSaveAfter(Varien_Event_Observer $observer) @@ -151,7 +147,6 @@ public function catalogProductSaveAfter(Varien_Event_Observer $observer) /** * Catalog Mass Status update process * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogProductStatusUpdate(Varien_Event_Observer $observer) @@ -290,7 +285,7 @@ public function restrictAdminBillingAgreementUsage($observer) if (!($methodInstance instanceof Mage_Sales_Model_Payment_Method_Billing_AgreementAbstract)) { return; } - if (!Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/use')) { + if (!Mage::getSingleton('admin/session')->isAllowed('sales/billing_agreement/actions/use')) { $observer->getEvent()->getResult()->isAvailable = false; } } @@ -298,7 +293,6 @@ public function restrictAdminBillingAgreementUsage($observer) /** * Set new customer group to all his quotes * - * @param Varien_Event_Observer $observer * @return $this */ public function customerSaveAfter(Varien_Event_Observer $observer) @@ -335,8 +329,6 @@ public function customerSaveAfter(Varien_Event_Observer $observer) /** * Set Quote information about MSRP price enabled - * - * @param Varien_Event_Observer $observer */ public function setQuoteCanApplyMsrp(Varien_Event_Observer $observer) { @@ -358,8 +350,6 @@ public function setQuoteCanApplyMsrp(Varien_Event_Observer $observer) /** * Add VAT validation request date and identifier to order comments - * - * @param Varien_Event_Observer $observer */ public function addVatRequestParamsOrderComment(Varien_Event_Observer $observer) { @@ -407,7 +397,6 @@ protected function _getVatRequiredSalesAddress($salesModel, $store = null) /** * Retrieve customer address (default billing or default shipping) ID on which tax calculation must be based * - * @param Mage_Customer_Model_Customer $customer * @param Mage_Core_Model_Store|string|int|null $store * @return int|string */ @@ -427,8 +416,6 @@ protected function _getVatRequiredCustomerAddress(Mage_Customer_Model_Customer $ /** * Handle customer VAT number if needed on collect_totals_before event of quote address - * - * @param Varien_Event_Observer $observer */ public function changeQuoteCustomerGroupId(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php index ec00ea9bd88..7e9ceac1745 100644 --- a/app/code/core/Mage/Sales/Model/Order.php +++ b/app/code/core/Mage/Sales/Model/Order.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2015-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2015-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -999,7 +999,6 @@ public function getPayment() /** * Declare order billing address * - * @param Mage_Sales_Model_Order_Address $address * @return $this */ public function setBillingAddress(Mage_Sales_Model_Order_Address $address) @@ -1015,7 +1014,6 @@ public function setBillingAddress(Mage_Sales_Model_Order_Address $address) /** * Declare order shipping address * - * @param Mage_Sales_Model_Order_Address $address * @return $this */ public function setShippingAddress(Mage_Sales_Model_Order_Address $address) @@ -1061,7 +1059,7 @@ public function getShippingAddress() /** * Order state setter. * If status is specified, will add order status history with specified comment - * the setData() cannot be overriden because of compatibility issues with resource model + * the setData() cannot be overridden because of compatibility issues with resource model * * @param string $state * @param string|bool $status @@ -1636,7 +1634,6 @@ public function getAddressById($addressId) } /** - * @param Mage_Sales_Model_Order_Address $address * @return $this * @throws Exception */ @@ -1791,7 +1788,6 @@ public function getItemByQuoteItemId($quoteItemId) } /** - * @param Mage_Sales_Model_Order_Item $item * @return $this * @throws Exception */ @@ -1868,7 +1864,6 @@ public function getPaymentById($paymentId) } /** - * @param Mage_Sales_Model_Order_Payment $payment * @return $this * @throws Exception */ @@ -1883,7 +1878,6 @@ public function addPayment(Mage_Sales_Model_Order_Payment $payment) } /** - * @param Mage_Sales_Model_Order_Payment $payment * @return Mage_Sales_Model_Order_Payment */ public function setPayment(Mage_Sales_Model_Order_Payment $payment) @@ -1970,7 +1964,6 @@ public function getStatusHistoryById($statusId) * See the entity_id attribute backend model. * Or the history record can be saved standalone after this. * - * @param Mage_Sales_Model_Order_Status_History $history * @return $this */ public function addStatusHistory(Mage_Sales_Model_Order_Status_History $history) @@ -2290,7 +2283,6 @@ public function getCustomerName() /** * Add New object to related array * - * @param Mage_Core_Model_Abstract $object * @return $this */ public function addRelatedObject(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Sales/Model/Order/Address.php b/app/code/core/Mage/Sales/Model/Order/Address.php index 158424c1c53..a6e68c240ba 100644 --- a/app/code/core/Mage/Sales/Model/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Order/Address.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -106,7 +106,6 @@ protected function _initOldFieldsMap() /** * Set order * - * @param Mage_Sales_Model_Order $order * @return $this */ public function setOrder(Mage_Sales_Model_Order $order) diff --git a/app/code/core/Mage/Sales/Model/Order/Api.php b/app/code/core/Mage/Sales/Model/Order/Api.php index 9bbf7d519c0..65401ece439 100644 --- a/app/code/core/Mage/Sales/Model/Order/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Config.php b/app/code/core/Mage/Sales/Model/Order/Config.php index 44f2076cc25..0d9c1b012f8 100644 --- a/app/code/core/Mage/Sales/Model/Order/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php index f1cfe339c9c..8a3acb46e26 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -239,7 +239,6 @@ public function getStore() /** * Declare order for creditmemo * - * @param Mage_Sales_Model_Order $order * @return $this */ public function setOrder(Mage_Sales_Model_Order $order) @@ -346,7 +345,6 @@ public function getItemByOrderId($orderId) } /** - * @param Mage_Sales_Model_Order_Creditmemo_Item $item * @return $this * @throws Exception */ @@ -756,7 +754,7 @@ public function sendEmail($notifyCustomer = true, $comment = '') // Get the destination email addresses to send copies to $copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO); $copyMethod = Mage::getStoreConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId); - // Check if at least one recepient is found + // Check if at least one recipient is found if (!$notifyCustomer && !$copyTo) { return $this; } @@ -856,7 +854,7 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '') // Get the destination email addresses to send copies to $copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO); $copyMethod = Mage::getStoreConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId); - // Check if at least one recepient is found + // Check if at least one recipient is found if (!$notifyCustomer && !$copyTo) { return $this; } diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php index 7703ff88deb..868ef35afba 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +48,6 @@ protected function _construct() /** * Declare Creditmemo instance * - * @param Mage_Sales_Model_Order_Creditmemo $creditmemo * @return Mage_Sales_Model_Order_Creditmemo_Comment */ public function setCreditmemo(Mage_Sales_Model_Order_Creditmemo $creditmemo) diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php index 88177437351..a1637f91bd0 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -119,7 +119,6 @@ public function _construct() /** * Declare creditmemo instance * - * @param Mage_Sales_Model_Order_Creditmemo $creditmemo * @return $this */ public function setCreditmemo(Mage_Sales_Model_Order_Creditmemo $creditmemo) @@ -156,7 +155,6 @@ public function getCreditmemo() /** * Declare order item instance * - * @param Mage_Sales_Model_Order_Item $item * @return $this */ public function setOrderItem(Mage_Sales_Model_Order_Item $item) diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php index aa48ed60641..95bd343779a 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ abstract class Mage_Sales_Model_Order_Creditmemo_Total_Abstract extends Mage_Sal /** * Collect credit memo subtotal * - * @param Mage_Sales_Model_Order_Creditmemo $creditmemo * @return Mage_Sales_Model_Order_Creditmemo_Total_Abstract */ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php index 9b54018103d..c456b43f5ae 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Sales_Model_Order_Creditmemo_Total_Cost extends Mage_Sales_Model_Orde /** * Collect total cost of refunded items * - * @param Mage_Sales_Model_Order_Creditmemo $creditmemo * @return $this */ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php index 07a280115d3..77d94a6b95f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Order_Creditmemo_Total_Discount extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { /** - * @param Mage_Sales_Model_Order_Creditmemo $creditmemo * @return $this */ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php index 278bf66b38f..6d71f737686 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Order_Creditmemo_Total_Grand extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { /** - * @param Mage_Sales_Model_Order_Creditmemo $creditmemo * @return $this */ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php index 91e37aa0d97..c9fe8021c49 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Sales_Model_Order_Creditmemo_Total_Shipping extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { /** - * @param Mage_Sales_Model_Order_Creditmemo $creditmemo * @return $this * @throws Mage_Core_Exception * @throws Mage_Core_Model_Store_Exception diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php index b135354df2a..cc795a12a7c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Sales_Model_Order_Creditmemo_Total_Subtotal extends Mage_Sales_Model_ /** * Collect Creditmemo subtotal * - * @param Mage_Sales_Model_Order_Creditmemo $creditmemo * @return Mage_Sales_Model_Order_Creditmemo_Total_Subtotal */ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php index 47d048693ed..4e9a83e7be0 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Order_Creditmemo_Total_Tax extends Mage_Sales_Model_Order /** * Collects the total tax for the credit memo * - * @param Mage_Sales_Model_Order_Creditmemo $creditmemo * @return $this */ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Invoice.php index 812f614da9d..925d9e7f749 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -253,7 +253,6 @@ public function getStore() /** * Declare order for invoice * - * @param Mage_Sales_Model_Order $order * @return $this */ public function setOrder(Mage_Sales_Model_Order $order) @@ -576,7 +575,6 @@ public function getItemById($itemId) } /** - * @param Mage_Sales_Model_Order_Invoice_Item $item * @return $this * @throws Exception */ @@ -788,7 +786,7 @@ public function sendEmail($notifyCustomer = true, $comment = '') // Get the destination email addresses to send copies to $copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO); $copyMethod = Mage::getStoreConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId); - // Check if at least one recepient is found + // Check if at least one recipient is found if (!$notifyCustomer && !$copyTo) { return $this; } @@ -888,7 +886,7 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '') // Get the destination email addresses to send copies to $copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO); $copyMethod = Mage::getStoreConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId); - // Check if at least one recepient is found + // Check if at least one recipient is found if (!$notifyCustomer && !$copyTo) { return $this; } diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php index 89cabd945f4..7cb47afd0d9 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +48,6 @@ protected function _construct() /** * Declare invoice instance * - * @param Mage_Sales_Model_Order_Invoice $invoice * @return Mage_Sales_Model_Order_Invoice_Comment */ public function setInvoice(Mage_Sales_Model_Order_Invoice $invoice) diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php index dccf8f37865..f0de5264d06 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -121,7 +121,6 @@ protected function _initOldFieldsMap() /** * Declare invoice instance * - * @param Mage_Sales_Model_Order_Invoice $invoice * @return $this */ public function setInvoice(Mage_Sales_Model_Order_Invoice $invoice) @@ -143,7 +142,6 @@ public function getInvoice() /** * Declare order item instance * - * @param Mage_Sales_Model_Order_Item $item * @return $this */ public function setOrderItem(Mage_Sales_Model_Order_Item $item) diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php index 085ce4aa5f9..d3ce24a02f7 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ abstract class Mage_Sales_Model_Order_Invoice_Total_Abstract extends Mage_Sales_ /** * Collect invoice subtotal * - * @param Mage_Sales_Model_Order_Invoice $invoice * @return Mage_Sales_Model_Order_Invoice_Total_Abstract */ public function collect(Mage_Sales_Model_Order_Invoice $invoice) diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php index ca509380b33..c85b3a77a0f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Sales_Model_Order_Invoice_Total_Cost extends Mage_Sales_Model_Order_I /** * Collect total cost of invoiced items * - * @param Mage_Sales_Model_Order_Invoice $invoice * @return $this */ public function collect(Mage_Sales_Model_Order_Invoice $invoice) diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php index b74d398cbfc..217a3faa7c4 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Order_Invoice_Total_Discount extends Mage_Sales_Model_Order_Invoice_Total_Abstract { /** - * @param Mage_Sales_Model_Order_Invoice $invoice * @return $this */ public function collect(Mage_Sales_Model_Order_Invoice $invoice) @@ -62,10 +61,10 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) /** * Resolve rounding problems * - * We dont want to include the weee discount amount as the right amount + * We don't want to include the weee discount amount as the right amount * is added when calculating the taxes. * - * Also the subtotal is without weee + * Also, the subtotal is without weee */ $discount = $orderItemDiscount - $orderItem->getDiscountInvoiced(); diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php index 56f62f37736..c752338a501 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Order_Invoice_Total_Grand extends Mage_Sales_Model_Order_Invoice_Total_Abstract { /** - * @param Mage_Sales_Model_Order_Invoice $invoice * @return $this */ public function collect(Mage_Sales_Model_Order_Invoice $invoice) diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php index 548c2f613ed..084d4c3d8cb 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Sales_Model_Order_Invoice_Total_Shipping extends Mage_Sales_Model_Order_Invoice_Total_Abstract { /** - * @param Mage_Sales_Model_Order_Invoice $invoice * @return $this */ public function collect(Mage_Sales_Model_Order_Invoice $invoice) @@ -35,7 +34,7 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) $baseShippingInclTax = $invoice->getOrder()->getBaseShippingInclTax(); if ($orderShippingAmount) { /** - * Check shipping amount in previus invoices + * Check shipping amount in previous invoices */ foreach ($invoice->getOrder()->getInvoiceCollection() as $previusInvoice) { if ($previusInvoice->getShippingAmount() && !$previusInvoice->isCanceled()) { diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php index 415a7702915..705092866c0 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Sales_Model_Order_Invoice_Total_Subtotal extends Mage_Sales_Model_Ord /** * Collect invoice subtotal * - * @param Mage_Sales_Model_Order_Invoice $invoice * @return Mage_Sales_Model_Order_Invoice_Total_Subtotal */ public function collect(Mage_Sales_Model_Order_Invoice $invoice) diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php index fc940b65341..9b1ec9d345f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Order_Invoice_Total_Tax extends Mage_Sales_Model_Order_In /** * Collect invoice tax amount * - * @param Mage_Sales_Model_Order_Invoice $invoice * @return $this */ public function collect(Mage_Sales_Model_Order_Invoice $invoice) diff --git a/app/code/core/Mage/Sales/Model/Order/Item.php b/app/code/core/Mage/Sales/Model/Order/Item.php index c55c7a80917..64c474a2262 100644 --- a/app/code/core/Mage/Sales/Model/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -425,7 +425,6 @@ public function getQtyToCancelBundleItem() /** * Declare order * - * @param Mage_Sales_Model_Order $order * @return $this */ public function setOrder(Mage_Sales_Model_Order $order) @@ -602,7 +601,6 @@ public function getOriginalPrice() /** * Set product options * - * @param array $options * @return $this */ public function setProductOptions(array $options) diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php index 1db8c9289f9..dadc3bd1a8d 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -263,7 +263,6 @@ protected function _construct() /** * Declare order model object * - * @param Mage_Sales_Model_Order $order * @return $this */ public function setOrder(Mage_Sales_Model_Order $order) @@ -650,7 +649,6 @@ protected function _invoice() /** * Check order payment void availability * - * @param Varien_Object $document * @return bool * @throws Mage_Core_Exception */ @@ -670,7 +668,6 @@ public function canVoid(Varien_Object $document) * Void payment online * * @see self::_void() - * @param Varien_Object $document * @return $this */ public function void(Varien_Object $document) @@ -866,7 +863,7 @@ public function registerRefundNotification($amount) } /** - * Cancel a creditmemo: substract its totals from the payment + * Cancel a credit memo: subtract its totals from the payment * * @param Mage_Sales_Model_Order_Creditmemo $creditmemo * @return $this @@ -1319,7 +1316,7 @@ protected function _addTransaction($type, $salesDocument = null, $failsafe = fal } /** - * Public acces to _addTransaction method + * Public access to _addTransaction method * * @param string $type * @param Mage_Sales_Model_Abstract $salesDocument @@ -1343,7 +1340,6 @@ public function addTransaction($type, $salesDocument = null, $failsafe = false, /** * Import details data of specified transaction * - * @param Mage_Sales_Model_Order_Payment_Transaction $transactionTo * @return $this */ public function importTransactionInfo(Mage_Sales_Model_Order_Payment_Transaction $transactionTo) @@ -1644,7 +1640,7 @@ protected function _createBillingAgreement() } /** - * Additionnal transaction info setter + * Additional transaction info setter * * @param string $key * @param string $value @@ -1659,7 +1655,7 @@ public function setTransactionAdditionalInfo($key, $value) } /** - * Additionnal transaction info getter + * Additional transaction info getter * * @param string $key * @return mixed diff --git a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php index 6927359620a..b519f525eaa 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -86,7 +86,7 @@ class Mage_Sales_Model_Order_Payment_Transaction extends Mage_Core_Model_Abstrac /** * Child transactions, assoc array of txn_id => instance * Filled only in case when all child transactions have txn_id - * Used for quicker search of child transactions using isset() as oposite to foreaching $_children + * Used for quicker search of child transactions using isset() as opposite to foreaching $_children * @var array|false */ protected $_identifiedChildren = null; @@ -135,7 +135,6 @@ protected function _construct() /** * Payment instance setter - * @param Mage_Sales_Model_Order_Payment $payment * @return $this */ public function setOrderPaymentObject(Mage_Sales_Model_Order_Payment $payment) diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php index be3bd15544d..b1a8efd37ec 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -103,7 +103,6 @@ public function widthForStringUsingFontSize($string, $font, $fontSize) * @param string $string * @param int $x * @param int $columnWidth - * @param Zend_Pdf_Resource_Font $font * @param int $fontSize * @param int $padding * @return int @@ -120,7 +119,6 @@ public function getAlignRight($string, $x, $columnWidth, Zend_Pdf_Resource_Font * @param string $string * @param int $x * @param int $columnWidth - * @param Zend_Pdf_Resource_Font $font * @param int $fontSize * @return int */ @@ -499,7 +497,6 @@ protected function insertOrder(&$page, $obj, $putOrderId = true) /** * Insert title and number for concrete document type * - * @param Zend_Pdf_Page $page * @param string $text */ public function insertDocumentNumber(Zend_Pdf_Page $page, $text) @@ -727,9 +724,6 @@ public function getRenderer($type) /** * Render item * - * @param Varien_Object $item - * @param Zend_Pdf_Page $page - * @param Mage_Sales_Model_Order $order * @param Mage_Sales_Model_Order_Pdf_Items_Abstract $renderer * * @return Mage_Sales_Model_Order_Pdf_Abstract @@ -749,9 +743,6 @@ public function renderItem(Varien_Object $item, Zend_Pdf_Page $page, Mage_Sales_ /** * Draw Item process * - * @param Varien_Object $item - * @param Zend_Pdf_Page $page - * @param Mage_Sales_Model_Order $order * @return Zend_Pdf_Page */ protected function _drawItem(Varien_Object $item, Zend_Pdf_Page $page, Mage_Sales_Model_Order $order) @@ -823,7 +814,6 @@ protected function _setFontItalic($object, $size = 7) /** * Set PDF object * - * @param Zend_Pdf $pdf * @return Mage_Sales_Model_Order_Pdf_Abstract */ protected function _setPdf(Zend_Pdf $pdf) @@ -850,7 +840,6 @@ protected function _getPdf() /** * Create new page and assign to PDF object * - * @param array $settings * @return Zend_Pdf_Page */ public function newPage(array $settings = []) @@ -879,12 +868,9 @@ public function newPage(array $settings = []) * font string; font style, optional: bold, italic, regular * font_file string; path to font file (optional for use your custom font) * font_size int; font size (default 7) - * align string; text align (also see feed parametr), optional left, right + * align string; text align (also see feed parameter), optional left, right * height int;line spacing (default 10) * - * @param Zend_Pdf_Page $page - * @param array $draw - * @param array $pageSettings * @throws Mage_Core_Exception * @return Zend_Pdf_Page */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php index fb455873c23..f89eb31ea47 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ class Mage_Sales_Model_Order_Pdf_Creditmemo extends Mage_Sales_Model_Order_Pdf_A { /** * Draw table header for product items - * - * @param Zend_Pdf_Page $page */ protected function _drawHeader(Zend_Pdf_Page $page) { @@ -154,7 +152,6 @@ public function getPdf($creditmemos = []) /** * Create new page and assign to PDF object * - * @param array $settings * @return Zend_Pdf_Page */ public function newPage(array $settings = []) diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php index b0064fe7be8..09be554bfa7 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ class Mage_Sales_Model_Order_Pdf_Invoice extends Mage_Sales_Model_Order_Pdf_Abst { /** * Draw header for item table - * - * @param Zend_Pdf_Page $page */ protected function _drawHeader(Zend_Pdf_Page $page) { @@ -145,7 +143,6 @@ public function getPdf($invoices = []) /** * Create new page and assign to PDF object * - * @param array $settings * @return Zend_Pdf_Page */ public function newPage(array $settings = []) diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php index 79dd95e47eb..1008d55c15e 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +59,6 @@ abstract class Mage_Sales_Model_Order_Pdf_Items_Abstract extends Mage_Core_Model /** * Set order model * - * @param Mage_Sales_Model_Order $order * @return Mage_Sales_Model_Order_Pdf_Items_Abstract */ public function setOrder(Mage_Sales_Model_Order $order) @@ -71,7 +70,6 @@ public function setOrder(Mage_Sales_Model_Order $order) /** * Set Source model * - * @param Mage_Core_Model_Abstract $source * @return Mage_Sales_Model_Order_Pdf_Items_Abstract */ public function setSource(Mage_Core_Model_Abstract $source) @@ -83,7 +81,6 @@ public function setSource(Mage_Core_Model_Abstract $source) /** * Set item object * - * @param Varien_Object $item * @return Mage_Sales_Model_Order_Pdf_Items_Abstract */ public function setItem(Varien_Object $item) @@ -95,7 +92,6 @@ public function setItem(Varien_Object $item) /** * Set Pdf model * - * @param Mage_Sales_Model_Order_Pdf_Abstract $pdf * @return Mage_Sales_Model_Order_Pdf_Items_Abstract */ public function setPdf(Mage_Sales_Model_Order_Pdf_Abstract $pdf) @@ -107,7 +103,6 @@ public function setPdf(Mage_Sales_Model_Order_Pdf_Abstract $pdf) /** * Set current page * - * @param Zend_Pdf_Page $page * @return Mage_Sales_Model_Order_Pdf_Items_Abstract */ public function setPage(Zend_Pdf_Page $page) diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php index f304773b7c8..aaa19eecd1e 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ class Mage_Sales_Model_Order_Pdf_Shipment extends Mage_Sales_Model_Order_Pdf_Abs { /** * Draw table header for product items - * - * @param Zend_Pdf_Page $page */ protected function _drawHeader(Zend_Pdf_Page $page) { @@ -123,7 +121,6 @@ public function getPdf($shipments = []) /** * Create new page and assign to PDF object * - * @param array $settings * @return Zend_Pdf_Page */ public function newPage(array $settings = []) diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php index c25eed78172..18ae9c789da 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,7 +58,6 @@ public function getPdf($shipment = null) /** * Draw header block * - * @param Zend_Pdf_Page $page * @return $this */ protected function _drawHeaderBlock(Zend_Pdf_Page $page) @@ -77,7 +76,6 @@ protected function _drawHeaderBlock(Zend_Pdf_Page $page) /** * Draw packages block * - * @param Zend_Pdf_Page $page * @return $this */ protected function _drawPackageBlock(Zend_Pdf_Page $page) diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php index 094ced0461a..4eaa3353c9d 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -140,7 +140,6 @@ public function loadByIncrementId($incrementId) /** * Declare order for shipment * - * @param Mage_Sales_Model_Order $order * @return $this */ public function setOrder(Mage_Sales_Model_Order $order) @@ -273,7 +272,6 @@ public function getItemById($itemId) } /** - * @param Mage_Sales_Model_Order_Shipment_Item $item * @return $this * @throws Exception */ @@ -335,7 +333,6 @@ public function getTrackById($trackId) } /** - * @param Mage_Sales_Model_Order_Shipment_Track $track * @return $this * @throws Exception */ @@ -431,7 +428,7 @@ public function sendEmail($notifyCustomer = true, $comment = '') // Get the destination email addresses to send copies to $copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO); $copyMethod = Mage::getStoreConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId); - // Check if at least one recepient is found + // Check if at least one recipient is found if (!$notifyCustomer && !$copyTo) { return $this; } @@ -526,7 +523,7 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '') // Get the destination email addresses to send copies to $copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO); $copyMethod = Mage::getStoreConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId); - // Check if at least one recepient is found + // Check if at least one recipient is found if (!$notifyCustomer && !$copyTo) { return $this; } diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php index 3e813a0ac27..4bf24ecec67 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,7 +51,6 @@ protected function _construct() /** * Declare Shipment instance * - * @param Mage_Sales_Model_Order_Shipment $shipment * @return $this */ public function setShipment(Mage_Sales_Model_Order_Shipment $shipment) diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php index b1855c009a4..496e27a12aa 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -61,7 +61,6 @@ public function _construct() /** * Declare Shipment instance * - * @param Mage_Sales_Model_Order_Shipment $shipment * @return $this */ public function setShipment(Mage_Sales_Model_Order_Shipment $shipment) @@ -83,7 +82,6 @@ public function getShipment() /** * Declare order item instance * - * @param Mage_Sales_Model_Order_Item $item * @return $this */ public function setOrderItem(Mage_Sales_Model_Order_Item $item) diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php index d283ab371eb..5836a067589 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -64,7 +64,7 @@ public function _construct() * Init mapping array of short fields to * its full names * - * @resturn Varien_Object + * @return void */ protected function _initOldFieldsMap() { @@ -86,7 +86,6 @@ public function getNumber() /** * Declare Shipment instance * - * @param Mage_Sales_Model_Order_Shipment $shipment * @return $this */ public function setShipment(Mage_Sales_Model_Order_Shipment $shipment) diff --git a/app/code/core/Mage/Sales/Model/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Order/Status/History.php index 64421952693..09888e6de70 100644 --- a/app/code/core/Mage/Sales/Model/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Order/Status/History.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,7 +63,6 @@ protected function _construct() /** * Set order object * - * @param Mage_Sales_Model_Order $order * @return $this */ public function setOrder(Mage_Sales_Model_Order $order) diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php index aa59600757f..aae237101c1 100644 --- a/app/code/core/Mage/Sales/Model/Quote.php +++ b/app/code/core/Mage/Sales/Model/Quote.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -277,7 +277,6 @@ public function getStore() /** * Declare quote store model * - * @param Mage_Core_Model_Store $store * @return $this */ public function setStore(Mage_Core_Model_Store $store) @@ -439,7 +438,6 @@ public function loadByIdWithoutStore($quoteId) /** * Assign customer model object data to quote * - * @param Mage_Customer_Model_Customer $customer * @return $this */ public function assignCustomer(Mage_Customer_Model_Customer $customer) @@ -450,9 +448,6 @@ public function assignCustomer(Mage_Customer_Model_Customer $customer) /** * Assign customer model to quote with billing and shipping address change * - * @param Mage_Customer_Model_Customer $customer - * @param Mage_Sales_Model_Quote_Address|null $billingAddress - * @param Mage_Sales_Model_Quote_Address|null $shippingAddress * @return $this * @throws Mage_Core_Exception */ @@ -493,7 +488,6 @@ public function assignCustomerWithAddressChange( /** * Define customer object * - * @param Mage_Customer_Model_Customer $customer * @return $this */ public function setCustomer(Mage_Customer_Model_Customer $customer) @@ -743,7 +737,6 @@ public function removeAllAddresses() } /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this * @throws Mage_Core_Exception */ @@ -757,7 +750,6 @@ public function addAddress(Mage_Sales_Model_Quote_Address $address) } /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function setBillingAddress(Mage_Sales_Model_Quote_Address $address) @@ -773,7 +765,6 @@ public function setBillingAddress(Mage_Sales_Model_Quote_Address $address) } /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function setShippingAddress(Mage_Sales_Model_Quote_Address $address) @@ -793,7 +784,6 @@ public function setShippingAddress(Mage_Sales_Model_Quote_Address $address) } /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function addShippingAddress(Mage_Sales_Model_Quote_Address $address) @@ -921,7 +911,6 @@ public function getItemById($itemId) /** * Delete quote item. If it does not have identifier then it will be only removed from collection * - * @param Mage_Sales_Model_Quote_Item $item * @return $this */ public function deleteItem(Mage_Sales_Model_Quote_Item $item) @@ -1002,7 +991,6 @@ public function removeAllItems() /** * Adding new item to quote * - * @param Mage_Sales_Model_Quote_Item $item * @return $this */ public function addItem(Mage_Sales_Model_Quote_Item $item) @@ -1033,7 +1021,6 @@ public function addItem(Mage_Sales_Model_Quote_Item $item) * Advanced func to add product to quote - processing mode can be specified there. * Returns error message if product type instance can't prepare product. * - * @param Mage_Catalog_Model_Product $product * @param null|float|Varien_Object $request * @param null|string $processMode * @return Mage_Sales_Model_Quote_Item|string @@ -1117,7 +1104,6 @@ public function addProductAdvanced(Mage_Catalog_Model_Product $product, $request * * return error message if product type instance can't prepare product * - * @param Mage_Catalog_Model_Product $product * @param null|float|Varien_Object $request * @return Mage_Sales_Model_Quote_Item|string */ @@ -1133,7 +1119,6 @@ public function addProduct(Mage_Catalog_Model_Product $product, $request = null) /** * Adding catalog product object data to quote * - * @param Mage_Catalog_Model_Product $product * @param int $qty * @return Mage_Sales_Model_Quote_Item * @throws Mage_Core_Model_Store_Exception @@ -1372,7 +1357,6 @@ public function getPaymentById($paymentId) } /** - * @param Mage_Sales_Model_Quote_Payment $payment * @return $this * @throws Mage_Core_Exception */ @@ -1386,7 +1370,6 @@ public function addPayment(Mage_Sales_Model_Quote_Payment $payment) } /** - * @param Mage_Sales_Model_Quote_Payment $payment * @return Mage_Sales_Model_Quote_Payment */ public function setPayment(Mage_Sales_Model_Quote_Payment $payment) @@ -1857,7 +1840,6 @@ public function hasVirtualItems() /** * Merge quotes * - * @param Mage_Sales_Model_Quote $quote * @return $this */ public function merge(Mage_Sales_Model_Quote $quote) @@ -2041,7 +2023,7 @@ protected function _afterLoad() * Return quote checkout method code * * @deprecated after 1.4 beta1 it is checkout module responsibility - * @param bool $originalMethod if true return defined method from begining + * @param bool $originalMethod if true return defined method from beginning * @return string */ public function getCheckoutMethod($originalMethod = false) @@ -2087,16 +2069,12 @@ public function save() return parent::save(); } - /** - * @return string - */ public function getCouponCode(): string { return (string)$this->_getData('coupon_code'); } /** - * @param string|null $couponCode * @return $this */ public function setCouponCode(?string $couponCode) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php index beeabfbdb31..bd1522aa303 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -406,9 +406,8 @@ protected function _afterSave() } /** - * Declare adress quote model object + * Declare address quote model object * - * @param Mage_Sales_Model_Quote $quote * @return $this */ public function setQuote(Mage_Sales_Model_Quote $quote) @@ -436,7 +435,6 @@ public function getQuote() /** * Import quote address data from customer address object * - * @param Mage_Customer_Model_Address $address * @return $this */ public function importCustomerAddress(Mage_Customer_Model_Address $address) @@ -469,7 +467,6 @@ public function exportCustomerAddress() /** * Import address data from order address * - * @param Mage_Sales_Model_Order_Address $address * @return $this */ public function importOrderAddress(Mage_Sales_Model_Order_Address $address) @@ -487,7 +484,6 @@ public function importOrderAddress(Mage_Sales_Model_Order_Address $address) /** * Convert object to array * - * @param array $arrAttributes * @return array */ public function toArray(array $arrAttributes = []) @@ -761,7 +757,6 @@ public function removeItem($itemId) /** * Add item to address * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @param int $qty * @return $this */ @@ -925,7 +920,6 @@ public function removeAllShippingRates() /** * Add shipping rate * - * @param Mage_Sales_Model_Quote_Address_Rate $rate * @return $this */ public function addShippingRate(Mage_Sales_Model_Quote_Address_Rate $rate) @@ -969,7 +963,6 @@ public function collectShippingRates() * Request shipping rates for entire address or specified address item * Returns true if current selected shipping method code corresponds to one of the found rates * - * @param Mage_Sales_Model_Quote_Item_Abstract|null $item * @return bool */ public function requestShippingRates(?Mage_Sales_Model_Quote_Item_Abstract $item = null) @@ -1341,9 +1334,6 @@ public function getSubtotalWithDiscount() return $this->getSubtotal() + $this->getDiscountAmount(); } - /** - * @return string - */ public function getCouponCode(): string { return (string)$this->_getData('coupon_code'); diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php index 9cfe95a17eb..e156742d153 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -137,7 +137,6 @@ protected function _beforeSave() /** * Declare address model * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function setAddress(Mage_Sales_Model_Quote_Address $address) @@ -170,7 +169,6 @@ public function getQuote() /** * Import item to quote * - * @param Mage_Sales_Model_Quote_Item $quoteItem * @return $this */ public function importQuoteItem(Mage_Sales_Model_Quote_Item $quoteItem) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php index a076a09f7f0..832fe0661b1 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,7 +67,6 @@ protected function _beforeSave() } /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function setAddress(Mage_Sales_Model_Quote_Address $address) @@ -85,7 +84,6 @@ public function getAddress() } /** - * @param Mage_Shipping_Model_Rate_Result_Abstract $rate * @return $this */ public function importShippingRate(Mage_Shipping_Model_Rate_Result_Abstract $rate) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total.php index 53579cfeb45..cb8034bac33 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ class Mage_Sales_Model_Quote_Address_Total extends Varien_Object /** * Merge numeric total values * - * @param Mage_Sales_Model_Quote_Address_Total $total * @return $this */ public function merge(Mage_Sales_Model_Quote_Address_Total $total) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php index a61546dad4f..fa8626505c7 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -82,7 +82,6 @@ public function getLabel() /** * Collect totals process. * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -99,7 +98,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address) /** * Fetch (Retrieve data as array) * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ public function fetch(Mage_Sales_Model_Quote_Address $address) @@ -111,7 +109,6 @@ public function fetch(Mage_Sales_Model_Quote_Address $address) /** * Set address which can be used inside totals calculation * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Total_Abstract */ protected function _setAddress(Mage_Sales_Model_Quote_Address $address) @@ -195,7 +192,6 @@ protected function _addBaseAmount($baseAmount) /** * Get all items except nominals * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Item[] */ protected function _getAddressItems(Mage_Sales_Model_Quote_Address $address) @@ -206,7 +202,6 @@ protected function _getAddressItems(Mage_Sales_Model_Quote_Address $address) /** * Getter for row default total * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return float */ public function getItemRowTotal(Mage_Sales_Model_Quote_Item_Abstract $item) @@ -220,7 +215,6 @@ public function getItemRowTotal(Mage_Sales_Model_Quote_Item_Abstract $item) /** * Getter for row default base total * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return float */ public function getItemBaseRowTotal(Mage_Sales_Model_Quote_Item_Abstract $item) @@ -234,7 +228,6 @@ public function getItemBaseRowTotal(Mage_Sales_Model_Quote_Item_Abstract $item) /** * Whether the item row total may be compounded with others * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return bool */ public function getIsItemRowTotalCompoundable(Mage_Sales_Model_Quote_Item_Abstract $item) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php index b0a84ea544b..70e76f041d4 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Sales_Model_Quote_Address_Total_Custbalance extends Mage_Sales_Model_Quote_Address_Total_Abstract { /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function collect(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php index 4ded052d203..e2805e2c224 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Sales_Model_Quote_Address_Total_Discount extends Mage_Sales_Model_Quote_Address_Total_Abstract { /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this * @throws Mage_Core_Model_Store_Exception */ @@ -131,7 +130,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address) } /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetch(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php index 2c11b30fbb0..fb36df311a0 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Quote_Address_Total_Grand extends Mage_Sales_Model_Quote_ /** * Collect grand total address amount * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Total_Grand */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -46,7 +45,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address) /** * Add grand total information to address * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Total_Grand */ public function fetch(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php index 8b682fbb585..c0d2daadc39 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,7 +25,6 @@ class Mage_Sales_Model_Quote_Address_Total_Msrp extends Mage_Sales_Model_Quote_A /** * Collect information about MSRP price enabled * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Total_Msrp */ public function collect(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php index 8c58595232e..71068222085 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +26,6 @@ class Mage_Sales_Model_Quote_Address_Total_Nominal extends Mage_Sales_Model_Quot /** * Invoke collector for nominal items * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Total_Nominal */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -74,7 +73,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address) /** * Fetch collected nominal items * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetch(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/RecurringAbstract.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/RecurringAbstract.php index 038af7d7492..9ebcdecdb30 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/RecurringAbstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/RecurringAbstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,7 +45,6 @@ abstract class Mage_Sales_Model_Quote_Address_Total_Nominal_RecurringAbstract ex /** * Collect recurring item parameters and copy to the address items * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Total_Nominal_RecurringAbstract */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -70,7 +69,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address) /** * Don't fetch anything * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ public function fetch(Mage_Sales_Model_Quote_Address $address) @@ -81,7 +79,6 @@ public function fetch(Mage_Sales_Model_Quote_Address $address) /** * Get nominal items only * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ protected function _getAddressItems(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php index 114c5e0471d..13d5b87db3b 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,7 +45,6 @@ class Mage_Sales_Model_Quote_Address_Total_Nominal_Shipping extends Mage_Sales_M /** * Collect shipping amount individually for each item * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -79,7 +78,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address) /** * Don't fetch anything * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ public function fetch(Mage_Sales_Model_Quote_Address $address) @@ -90,7 +88,6 @@ public function fetch(Mage_Sales_Model_Quote_Address $address) /** * Get nominal items only or indeed get all items, depending on current logic requirements * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ protected function _getAddressItems(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php index 0463b8a569b..45cf52591a5 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ class Mage_Sales_Model_Quote_Address_Total_Nominal_Subtotal extends Mage_Sales_M /** * Don't fetch anything * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ public function fetch(Mage_Sales_Model_Quote_Address $address) @@ -59,7 +58,6 @@ public function getLabel() /** * Get nominal items only * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ protected function _getAddressItems(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php index 8868b9aa696..c0f2e649207 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,7 +27,6 @@ public function __construct() /** * Collect totals information about shipping * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Total_Shipping */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -166,7 +165,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address) /** * Add shipping totals information to address object * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Total_Shipping */ public function fetch(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php index d8db19657e3..ca5468b7afa 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Quote_Address_Total_Subtotal extends Mage_Sales_Model_Quo /** * Collect address subtotal * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Total_Subtotal */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -41,7 +40,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address) foreach ($items as $item) { if ($this->_initItem($address, $item) && $item->getQty() > 0) { /** - * Separatly calculate subtotal only for virtual products + * Separately calculate subtotal only for virtual products */ if ($item->getProduct()->isVirtual()) { $virtualAmount += $item->getRowTotal(); @@ -143,7 +142,6 @@ protected function _removeItem($address, $item) /** * Assign subtotal amount and label to address object * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Total_Subtotal */ public function fetch(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php index 19d8f95af0c..ee2129c3037 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,7 +27,6 @@ public function __construct() } /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -191,7 +190,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address) } /** - * @param Mage_Sales_Model_Quote_Address $address * @param array $applied * @param float $amount * @param float $baseAmount @@ -236,7 +234,6 @@ protected function _saveAppliedTaxes(Mage_Sales_Model_Quote_Address $address, $a } /** - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetch(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Quote/Item.php b/app/code/core/Mage/Sales/Model/Quote/Item.php index 212a78f0ce2..05033f7b546 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -253,7 +253,6 @@ protected function _beforeSave() /** * Declare quote model object * - * @param Mage_Sales_Model_Quote $quote * @return $this */ public function setQuote(Mage_Sales_Model_Quote $quote) @@ -575,7 +574,6 @@ public function getRealProductType() /** * Convert Quote Item to array * - * @param array $arrAttributes * @return array */ public function toArray(array $arrAttributes = []) @@ -655,10 +653,9 @@ public function addOption($option) /** * Can specify specific actions for ability to change given quote options values - * Exemple: cataloginventory decimal qty validation may change qty to int, + * Example: cataloginventory decimal qty validation may change qty to int, * so need to change quote item qty option value. * - * @param Varien_Object|Mage_Sales_Model_Quote_Item_Option $option * @param int|float|null $value * @return $this */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php index 9886867755f..9fca0704bcf 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -625,7 +625,7 @@ public function getBaseOriginalPrice() } /** - * Specify custom item price (used in case whe we have apply not product price to item) + * Specify custom item price (used in case when we have applied not product price to item) * * @param float $value * @return $this diff --git a/app/code/core/Mage/Sales/Model/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Quote/Payment.php index 8c644c72b7b..c291c5e90e6 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Quote/Payment.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -98,7 +98,6 @@ protected function _construct() /** * Declare quote model instance * - * @param Mage_Sales_Model_Quote $quote * @return $this */ public function setQuote(Mage_Sales_Model_Quote $quote) @@ -125,7 +124,6 @@ public function getQuote() * Method calls quote totals collect because payment method availability * can be related to quote totals * - * @param array $data * @throws Mage_Core_Exception * @return $this */ diff --git a/app/code/core/Mage/Sales/Model/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Recurring/Profile.php index fa81c529470..93a7de17203 100644 --- a/app/code/core/Mage/Sales/Model/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Model/Recurring/Profile.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -352,7 +352,6 @@ public function isValid() /** * Import quote information to the profile * - * @param Mage_Sales_Model_Quote $quote * @return $this * @throws Exception */ @@ -387,7 +386,6 @@ public function importQuote(Mage_Sales_Model_Quote $quote) /** * Import quote item information to the profile * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return $this */ public function importQuoteItem(Mage_Sales_Model_Quote_Item_Abstract $item) diff --git a/app/code/core/Mage/Sales/Model/Resource/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Abstract.php index 3aaf6285a93..130d6f927c7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ abstract class Mage_Sales_Model_Resource_Abstract extends Mage_Core_Model_Resour /** * Prepare data for save * - * @param Mage_Core_Model_Abstract $object * @return array */ protected function _prepareDataForSave(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Sales/Model/Resource/Order.php b/app/code/core/Mage/Sales/Model/Resource/Order.php index 9adad48e276..86c8b3881ef 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php index 3d2e44d5c55..c618e4f1b73 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -197,7 +197,6 @@ public function getUpdateGridRecordsSelect($ids, &$flatColumnsToSelect, $gridCol * Join virtual grid columns to select * * @param string $mainTableAlias - * @param Zend_Db_Select $select * @param array $columnsToSelect * @return $this */ @@ -267,7 +266,6 @@ public function getGridTable() /** * Before save object attribute * - * @param Mage_Core_Model_Abstract $object * @param string $attribute * @return $this */ @@ -286,7 +284,6 @@ protected function _beforeSaveAttribute(Mage_Core_Model_Abstract $object, $attri /** * After save object attribute * - * @param Mage_Core_Model_Abstract $object * @param string $attribute * @return $this */ @@ -305,7 +302,6 @@ protected function _afterSaveAttribute(Mage_Core_Model_Abstract $object, $attrib /** * Perform actions after object save * - * @param Mage_Core_Model_Abstract $object * @param string|string[]|Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return $this */ @@ -349,7 +345,6 @@ public function saveAttribute(Mage_Core_Model_Abstract $object, $attribute) /** * Perform actions before object save * - * @param Mage_Core_Model_Abstract $object * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $object) @@ -400,7 +395,6 @@ public function setMainTable($table) /** * Save object data * - * @param Mage_Core_Model_Abstract $object * @return $this */ public function save(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Address.php b/app/code/core/Mage/Sales/Model/Resource/Order/Address.php index 96f06d055e6..bed81d9ca3c 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Address.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,7 +58,6 @@ public function getAllAttributes() /** * Update related grid table after object save * - * @param Mage_Core_Model_Abstract|Mage_Sales_Model_Order_Address $object * @return Mage_Core_Model_Resource_Db_Abstract */ protected function _afterSave(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php index 98de0296819..525f89dd614 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php index 0283be9d621..a0c39d73cbb 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,7 +43,6 @@ protected function _construct() /** * Unserialize Varien_Object field in an object * - * @param Varien_Object $object * @param string $field * @param mixed $defaultValue */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php index 91a5b01f98a..ee41ac05a4a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,7 +42,6 @@ protected function _construct() /** * Unserialize Varien_Object field in an object * - * @param Varien_Object $object * @param string $field * @param mixed $defaultValue */ @@ -66,8 +65,6 @@ protected function _unserializeField(Varien_Object $object, $field, $defaultValu /** * Update transactions in database using provided transaction as parent for them * have to repeat the business logic to avoid accidental injection of wrong transactions - * - * @param Mage_Sales_Model_Order_Payment_Transaction $transaction */ public function injectAsParent(Mage_Sales_Model_Order_Payment_Transaction $transaction) { @@ -106,7 +103,6 @@ public function injectAsParent(Mage_Sales_Model_Order_Payment_Transaction $trans /** * Load the transaction object by specified txn_id * - * @param Mage_Sales_Model_Order_Payment_Transaction $transaction * @param int $orderId * @param int $paymentId * @param string $txnId diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php index 1450bbf1c8d..682b5f569a1 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -89,7 +89,6 @@ protected function _construct() /** * Join order information * - * @param array $keys * @return $this */ public function addOrderInformation(array $keys) @@ -102,7 +101,6 @@ public function addOrderInformation(array $keys) /** * Join payment information * - * @param array $keys * @return $this */ public function addPaymentInformation(array $keys) diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status.php index d0eff50a707..c696740dda1 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -76,7 +76,6 @@ protected function _getLoadSelect($field, $value, $object) /** * Store labels getter * - * @param Mage_Core_Model_Abstract|Mage_Sales_Model_Order_Status $status * @return array */ public function getStoreLabels(Mage_Core_Model_Abstract $status) diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php index 3332842efb5..97665e54b9d 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend extends Mage_Eav /** * Collect totals * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function collectTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php index 4ef0d49651d..46d9821028d 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend extends Mage_Ea /** * Fetch totals * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php index 87d4af5c239..60a999ee57d 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance ext /** * Fetch customer balance * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php index 7ba0f519748..e6d4db053cc 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount extend /** * Fetch discount * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php index a0d9139db7e..5c3a0d0206b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand extends M /** * Fetch grand total * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php index 38ec1682d1b..71af2c4765d 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping extend /** * Fetch totals * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php index a8f2a61a170..0e9941590b8 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal extend /** * Add total * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php index 7f6974f9075..9d81e8179f8 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax extends Mag /** * Fetch totals * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php index 3c59512e2ce..af080d6823b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php @@ -9,12 +9,12 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Quote addresses shiping rates collection + * Quote addresses shipping rates collection * * @category Mage * @package Mage_Sales diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php index da3be48b733..161ac71b444 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,7 +40,6 @@ protected function _construct() } /** - * @param Varien_Object $object * @param string $field * @param mixed $defaultValue * @see Mage_Core_Model_Resource_Abstract::_unserializeField() diff --git a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php index 595b0f0649a..ea8b2556f0e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,7 +43,6 @@ protected function _construct() /** * Unserialize Varien_Object field in an object * - * @param Varien_Object $object * @param string $field * @param mixed $defaultValue */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php index f51a5f967a6..85b781fe743 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -358,7 +358,6 @@ protected function _beforeLoad() /** * Apply filter to exclude certain product types from the collection * - * @param Zend_Db_Select $select * @return Mage_Sales_Model_Resource_Report_Collection_Abstract */ protected function _applyProductTypeFilter(Zend_Db_Select $select) diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php index 9f9e8662e5a..424791d50be 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php index 6810a3b9029..e7a5d83f337 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php index a9971351972..7c9bc59dd57 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php index 1872af34d95..0051dc0cbf6 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php index 3054e6597b8..09449a37594 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php index f2972e84cc9..e5046c99677 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,7 +68,6 @@ public function __construct() /** * Set filter by customer * - * @param Mage_Customer_Model_Customer $customer * @return $this */ public function setCustomerFilter(Mage_Customer_Model_Customer $customer) diff --git a/app/code/core/Mage/Sales/Model/Resource/Setup.php b/app/code/core/Mage/Sales/Model/Resource/Setup.php index 3dec4212987..68c3666b1b0 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Setup.php +++ b/app/code/core/Mage/Sales/Model/Resource/Setup.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -79,7 +79,6 @@ protected function _flatTableExist($table) * * @param int|string $entityTypeId * @param string $code - * @param array $attr * @return $this */ public function addAttribute($entityTypeId, $code, array $attr) diff --git a/app/code/core/Mage/Sales/Model/Service/Order.php b/app/code/core/Mage/Sales/Model/Service/Order.php index ab10ac3893d..c75334687ed 100644 --- a/app/code/core/Mage/Sales/Model/Service/Order.php +++ b/app/code/core/Mage/Sales/Model/Service/Order.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,8 +39,6 @@ class Mage_Sales_Model_Service_Order /** * Class constructor - * - * @param Mage_Sales_Model_Order $order */ public function __construct(Mage_Sales_Model_Order $order) { @@ -49,9 +47,8 @@ public function __construct(Mage_Sales_Model_Order $order) } /** - * Quote convertor declaration + * Quote converter declaration * - * @param Mage_Sales_Model_Convert_Order $convertor * @return Mage_Sales_Model_Service_Order */ public function setConvertor(Mage_Sales_Model_Convert_Order $convertor) diff --git a/app/code/core/Mage/Sales/Model/Service/Quote.php b/app/code/core/Mage/Sales/Model/Service/Quote.php index cc753406346..24205622883 100644 --- a/app/code/core/Mage/Sales/Model/Service/Quote.php +++ b/app/code/core/Mage/Sales/Model/Service/Quote.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,7 +57,7 @@ class Mage_Sales_Model_Service_Quote protected $_order = null; /** - * If it is true, quote will be inactivate after submitting order or nominal items + * If it is true, quote will be inactivated after submitting order or nominal items * * @var bool */ @@ -65,8 +65,6 @@ class Mage_Sales_Model_Service_Quote /** * Class constructor - * - * @param Mage_Sales_Model_Quote $quote */ public function __construct(Mage_Sales_Model_Quote $quote) { @@ -75,9 +73,8 @@ public function __construct(Mage_Sales_Model_Quote $quote) } /** - * Quote convertor declaration + * Quote converter declaration * - * @param Mage_Sales_Model_Convert_Quote $convertor * @return Mage_Sales_Model_Service_Quote */ public function setConvertor(Mage_Sales_Model_Convert_Quote $convertor) @@ -99,7 +96,6 @@ public function getQuote() /** * Specify additional order data * - * @param array $data * @return $this */ public function setOrderData(array $data) @@ -224,7 +220,7 @@ public function submitNominalItems() */ public function submitAll() { - // don't allow submitNominalItems() to inactivate quote + // don't allow submitNominalItems() to deactivate quote $shouldInactivateQuoteOld = $this->_shouldInactivateQuote; $this->_shouldInactivateQuote = false; try { @@ -263,7 +259,7 @@ public function getOrder() } /** - * Inactivate quote + * Deactivate quote * * @return $this */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php index a907f09cb27..c3f595e0765 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php index 1ea2f9a34fc..24d8797ab10 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php index 69722481f54..8e2e035f168 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php index 32081b4db0c..51967465028 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Helper/Coupon.php b/app/code/core/Mage/SalesRule/Helper/Coupon.php index 1cc6858dd6a..1ace85ab903 100644 --- a/app/code/core/Mage/SalesRule/Helper/Coupon.php +++ b/app/code/core/Mage/SalesRule/Helper/Coupon.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Helper/Data.php b/app/code/core/Mage/SalesRule/Helper/Data.php index bb28917a628..810f2dbcae4 100644 --- a/app/code/core/Mage/SalesRule/Helper/Data.php +++ b/app/code/core/Mage/SalesRule/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_SalesRule_Helper_Data extends Mage_Core_Helper_Abstract /** * Set store and base price which will be used during discount calculation to item object * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @param float $basePrice * @param float $price * @return $this @@ -39,7 +38,6 @@ public function setItemDiscountPrices(Mage_Sales_Model_Quote_Item_Abstract $item /** * Add additional amounts to discount calculation prices * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @param float $basePrice * @param float $price * @return $this diff --git a/app/code/core/Mage/SalesRule/Model/Coupon.php b/app/code/core/Mage/SalesRule/Model/Coupon.php index 5d2033bbced..443499d0eba 100644 --- a/app/code/core/Mage/SalesRule/Model/Coupon.php +++ b/app/code/core/Mage/SalesRule/Model/Coupon.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,7 +71,6 @@ protected function _beforeSave() /** * Set rule instance * - * @param Mage_SalesRule_Model_Rule $rule * @return $this */ public function setRule(Mage_SalesRule_Model_Rule $rule) diff --git a/app/code/core/Mage/SalesRule/Model/Observer.php b/app/code/core/Mage/SalesRule/Model/Observer.php index c3c0f19c8d7..76694397645 100644 --- a/app/code/core/Mage/SalesRule/Model/Observer.php +++ b/app/code/core/Mage/SalesRule/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -242,7 +242,6 @@ protected function _removeAttributeFromConditions($combine, $attributeCode) /** * After save attribute if it is not used for promo rules already check rules for containing this attribute * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogAttributeSaveAfter(Varien_Event_Observer $observer) @@ -260,7 +259,6 @@ public function catalogAttributeSaveAfter(Varien_Event_Observer $observer) * After delete attribute check rules that contains deleted attribute * If rules was found they will seted to inactive and added notice to admin session * - * @param Varien_Event_Observer $observer * @return $this */ public function catalogAttributeDeleteAfter(Varien_Event_Observer $observer) @@ -277,7 +275,6 @@ public function catalogAttributeDeleteAfter(Varien_Event_Observer $observer) /** * Append sales rule product attributes to select by quote item collection * - * @param Varien_Event_Observer $observer * @return $this */ public function addProductAttributes(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php index cc6e2f49127..c6fe7f7cd68 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,7 +40,6 @@ public function __construct() /** * Collect address discount amount * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_SalesRule_Model_Quote_Discount */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -135,7 +134,6 @@ protected function _aggregateItemDiscount($item) /** * Add discount total information to address * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_SalesRule_Model_Quote_Discount */ public function fetch(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php b/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php index 67dd2f36c7a..f94f344a912 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,7 +37,6 @@ public function __construct() /** * Collect information about free shipping for all address items * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_SalesRule_Model_Quote_Freeshipping */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -91,7 +90,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address) * Add information about free shipping for all address items to address object * By default we not present such information * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_SalesRule_Model_Quote_Freeshipping */ public function fetch(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php index 38bb17d2d35..ce34a650e86 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ class Mage_SalesRule_Model_Quote_Nominal_Discount extends Mage_SalesRule_Model_Q /** * Don't fetch anything * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ public function fetch(Mage_Sales_Model_Quote_Address $address) @@ -42,7 +41,6 @@ public function fetch(Mage_Sales_Model_Quote_Address $address) /** * Get nominal items only * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ protected function _getAddressItems(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php index 2d04d99ef85..0267397a3b7 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +33,6 @@ protected function _construct() /** * Perform actions before object save * - * @param Mage_Core_Model_Abstract|Mage_SalesRule_Model_Coupon $object * @return Mage_Core_Model_Resource_Db_Abstract */ public function _beforeSave(Mage_Core_Model_Abstract $object) @@ -54,7 +53,6 @@ public function _beforeSave(Mage_Core_Model_Abstract $object) * Load primary coupon (is_primary = 1) for specified rule * * - * @param Mage_SalesRule_Model_Coupon $object * @param Mage_SalesRule_Model_Rule|int $rule * @return bool */ @@ -106,7 +104,6 @@ public function exists($code) /** * Update auto generated Specific Coupon if it's rule changed * - * @param Mage_SalesRule_Model_Rule $rule * @return $this */ public function updateSpecificCoupons(Mage_SalesRule_Model_Rule $rule) diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php index 0375795ed85..6b25201400e 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,7 +50,6 @@ public function addRuleToFilter($rule) /** * Add rule IDs to filter * - * @param array $ruleIds * * @return $this */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php index ff86da9e93a..85f9873fc81 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,7 +74,6 @@ public function updateCustomerCouponTimesUsed($customerId, $couponId, $decrement * Load an object by customer_id & coupon_id * * - * @param Varien_Object $object * @param int $customerId * @param int $couponId * @return $this diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php index 93ed63c9c28..cca12a170c4 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule.php index 3e4e7798fa9..75137f66858 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,7 +50,6 @@ protected function _construct() /** * Add customer group ids and website ids to rule data after load * - * @param Mage_Core_Model_Abstract $object * * @return $this */ @@ -66,7 +65,6 @@ protected function _afterLoad(Mage_Core_Model_Abstract $object) /** * Prepare sales rule's discount quantity * - * @param Mage_Core_Model_Abstract|Mage_SalesRule_Model_Rule $object * * @return $this */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php index 04f17f7e582..dfbcdc9c1ed 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule.php b/app/code/core/Mage/SalesRule/Model/Rule.php index b0352bd76bc..82a3da68798 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Rule.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -223,7 +223,6 @@ protected function _afterSave() * Initialize rule model data from array. * Set store labels if applicable. * - * @param array $data * * @return $this */ @@ -273,8 +272,6 @@ public static function getCouponCodeGenerator() /** * Set code generator instance for auto generated coupons - * - * @param Mage_SalesRule_Model_Coupon_CodegeneratorInterface $codeGenerator */ public static function setCouponCodeGenerator(Mage_SalesRule_Model_Coupon_CodegeneratorInterface $codeGenerator) { diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php index 6a3765c6cac..70ee0ebb40c 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ class Mage_SalesRule_Model_Rule_Condition_Product extends Mage_Rule_Model_Condit { /** * Add special attributes - * - * @param array $attributes */ protected function _addSpecialAttributes(array &$attributes) { @@ -37,7 +35,6 @@ protected function _addSpecialAttributes(array &$attributes) /** * Validate Product Rule Condition * - * @param Varien_Object $object * * @return bool */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php index 22abedd023c..77b816097a7 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +59,6 @@ protected function _getHelper() /** * Retrieve a product instance and initialize if needed - * @param Varien_Object $object * * @return Mage_Catalog_Model_Product */ @@ -115,7 +114,6 @@ public function getOperatorName() /** * Validate a product, check whether the attribute is assigned to the product - * @param Varien_Object $object * * @return bool */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php index e2e81c47c08..3c109bc54f7 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -191,7 +191,6 @@ public function collectValidatedAttributes($productCollection) /** * Validate a condition with the checking of the child value - * @param Varien_Object $object * * @return bool */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php index aab91530b7e..99c2fe31951 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php index 02a0c54a9f2..695546ed79d 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php index 9ef38c446f0..8a313c18b6c 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -134,7 +134,6 @@ protected function _getRules() /** * Get address object which can be used for discount calculation * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return Mage_Sales_Model_Quote_Address */ protected function _getAddress(Mage_Sales_Model_Quote_Item_Abstract $item) @@ -238,7 +237,6 @@ protected function _canProcessRule($rule, $address) * This process not affect information about applied rules, coupon code etc. * This information will be added during discount amounts processing * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return Mage_SalesRule_Model_Validator */ public function processFreeShipping(Mage_Sales_Model_Quote_Item_Abstract $item) @@ -275,7 +273,6 @@ public function processFreeShipping(Mage_Sales_Model_Quote_Item_Abstract $item) /** * Reset quote and address applied rules * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function reset(Mage_Sales_Model_Quote_Address $address) @@ -293,7 +290,6 @@ public function reset(Mage_Sales_Model_Quote_Address $address) /** * Quote item discount calculation process * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return Mage_SalesRule_Model_Validator * @throws Mage_Core_Exception */ @@ -525,7 +521,6 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item) /** * Apply discount amount to FPT * - * @param Mage_Sales_Model_Quote_Address $address * @param array $items * @return $this */ @@ -577,7 +572,7 @@ public function processWeeeAmount(Mage_Sales_Model_Quote_Address $address, $item $totalBaseWeeeDiscount = 0; foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { - /* we get the discount by row since we dont need to display the individual amounts */ + /* we get the discount by row since we don't need to display the individual amounts */ $weeeTaxAppliedRowAmount = $weeeTaxAppliedAmount['row_amount']; $baseWeeeTaxAppliedRowAmount = $weeeTaxAppliedAmount['base_row_amount']; $request->setProductClassId($item->getProduct()->getTaxClassId()); @@ -743,7 +738,6 @@ protected function _roundWithDeltasForBase($key, $amount, $store) /** * Apply discounts to shipping amount * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_SalesRule_Model_Validator */ public function processShippingAmount(Mage_Sales_Model_Quote_Address $address) @@ -881,7 +875,6 @@ public function getCartFixedRuleUsedForAddress($ruleId) * Calculate quote totals for each rule and save results * * @param mixed $items - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function initTotals($items, Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php index 3f9175e6147..bcf9d63b9ef 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Helper/Data.php b/app/code/core/Mage/Sendfriend/Helper/Data.php index 096cd7829e2..df5ae0fca4b 100644 --- a/app/code/core/Mage/Sendfriend/Helper/Data.php +++ b/app/code/core/Mage/Sendfriend/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sendfriend * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Observer.php b/app/code/core/Mage/Sendfriend/Model/Observer.php index 8a2f2ee672b..97ebfc42b2f 100644 --- a/app/code/core/Mage/Sendfriend/Model/Observer.php +++ b/app/code/core/Mage/Sendfriend/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sendfriend * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Sendfriend_Model_Observer /** * Register Sendfriend Model in global registry * - * @param Varien_Event_Observer $observer * @return $this */ public function register(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php index 5dbf8ee1aad..5c0e7834175 100644 --- a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php +++ b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sendfriend * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Sendfriend.php index a202f9acba6..fb38c7cf01f 100644 --- a/app/code/core/Mage/Sendfriend/Model/Sendfriend.php +++ b/app/code/core/Mage/Sendfriend/Model/Sendfriend.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sendfriend * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/controllers/ProductController.php b/app/code/core/Mage/Sendfriend/controllers/ProductController.php index 42592be7091..09fb1248a52 100644 --- a/app/code/core/Mage/Sendfriend/controllers/ProductController.php +++ b/app/code/core/Mage/Sendfriend/controllers/ProductController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sendfriend * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php index 4666a1bc916..54685a3af9e 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -135,7 +135,6 @@ public function getConfigFlag($field) * Collect and get rates * * @abstract - * @param Mage_Shipping_Model_Rate_Request $request * @return Mage_Shipping_Model_Rate_Result|bool|null */ abstract public function collectRates(Mage_Shipping_Model_Rate_Request $request); @@ -144,7 +143,6 @@ abstract public function collectRates(Mage_Shipping_Model_Rate_Request $request) * Do request to shipment * Implementation must be in overridden method * - * @param Mage_Shipping_Model_Shipment_Request $request * @return Varien_Object */ public function requestToShipment(Mage_Shipping_Model_Shipment_Request $request) @@ -167,7 +165,6 @@ public function returnOfShipment($request) /** * Return container types of carrier * - * @param Varien_Object|null $params * @return array */ public function getContainerTypes(?Varien_Object $params = null) @@ -178,7 +175,6 @@ public function getContainerTypes(?Varien_Object $params = null) /** * Get allowed containers of carrier * - * @param Varien_Object|null $params * @return array|bool */ protected function _getAllowedContainers(?Varien_Object $params = null) @@ -241,7 +237,6 @@ public function getCustomizableContainerTypes() /** * Return delivery confirmation types of carrier * - * @param Varien_Object|null $params * @return array */ public function getDeliveryConfirmationTypes(?Varien_Object $params = null) @@ -250,7 +245,6 @@ public function getDeliveryConfirmationTypes(?Varien_Object $params = null) } /** - * @param Mage_Shipping_Model_Rate_Request $request * @return $this|bool|false|Mage_Core_Model_Abstract */ public function checkAvailableShipCountries(Mage_Shipping_Model_Rate_Request $request) @@ -289,7 +283,6 @@ public function checkAvailableShipCountries(Mage_Shipping_Model_Rate_Request $re /** * Processing additional validation to check is carrier applicable. * - * @param Mage_Shipping_Model_Rate_Request $request * @return Mage_Shipping_Model_Carrier_Abstract|Mage_Shipping_Model_Rate_Result_Error|bool */ public function proccessAdditionalValidation(Mage_Shipping_Model_Rate_Request $request) @@ -593,7 +586,6 @@ public function getCarrierCode() /** * Return content types of package * - * @param Varien_Object $params * @return array */ public function getContentTypes(Varien_Object $params) diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php b/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php index 9f3b772c617..fb20814732c 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,7 +28,6 @@ class Mage_Shipping_Model_Carrier_Flatrate extends Mage_Shipping_Model_Carrier_A protected $_isFixed = true; /** - * @param Mage_Shipping_Model_Rate_Request $request * @return Mage_Shipping_Model_Rate_Result|false */ public function collectRates(Mage_Shipping_Model_Rate_Request $request) diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php index a8ec53ba878..e6dc6c4e8e7 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ class Mage_Shipping_Model_Carrier_Freeshipping extends Mage_Shipping_Model_Carri /** * FreeShipping Rates Collector * - * @param Mage_Shipping_Model_Rate_Request $request * @return Mage_Shipping_Model_Rate_Result|false */ public function collectRates(Mage_Shipping_Model_Rate_Request $request) diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php b/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php index 7e10567825d..6b73f9087a7 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,7 +23,6 @@ class Mage_Shipping_Model_Carrier_Pickup extends Mage_Shipping_Model_Carrier_Abs protected $_isFixed = true; /** - * @param Mage_Shipping_Model_Rate_Request $request * @return Mage_Shipping_Model_Rate_Result|false */ public function collectRates(Mage_Shipping_Model_Rate_Request $request) diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php index ae66d66e2e0..1f1aabfde8a 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,7 +58,6 @@ public function __construct() /** * Collect and get rates * - * @param Mage_Shipping_Model_Rate_Request $request * @return false|Mage_Shipping_Model_Rate_Result */ public function collectRates(Mage_Shipping_Model_Rate_Request $request) @@ -201,7 +200,6 @@ protected function _getModel($modelName) /** * Get Rate * - * @param Mage_Shipping_Model_Rate_Request $request * @return Mage_Core_Model_Abstract */ public function getRate(Mage_Shipping_Model_Rate_Request $request) diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result.php b/app/code/core/Mage/Shipping/Model/Rate/Result.php index bc7ad148a12..926f8979c63 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php index 1e4854703f5..631225e1868 100644 --- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -93,7 +93,6 @@ protected function _construct() /** * Return table rate array or false by rate request * - * @param Mage_Shipping_Model_Rate_Request $request * @return array|bool */ public function getRate(Mage_Shipping_Model_Rate_Request $request) @@ -177,7 +176,6 @@ public function getRate(Mage_Shipping_Model_Rate_Request $request) /** * Upload table rate file and import data from it * - * @param Varien_Object|Mage_Adminhtml_Block_System_Config_Form $object * @throws Mage_Core_Exception * @return $this */ @@ -418,7 +416,6 @@ protected function _getImportRow($row, $rowNumber = 0) /** * Save import data batch * - * @param array $data * @return $this */ protected function _saveImportData(array $data) diff --git a/app/code/core/Mage/Shipping/Model/Shipping.php b/app/code/core/Mage/Shipping/Model/Shipping.php index e41a52d0f3a..a4d6ea39a21 100644 --- a/app/code/core/Mage/Shipping/Model/Shipping.php +++ b/app/code/core/Mage/Shipping/Model/Shipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -97,7 +97,6 @@ public function getConfig() /** * Retrieve all methods for supplied shipping data * - * @param Mage_Shipping_Model_Rate_Request $request * @return $this * @todo make it ordered */ @@ -217,7 +216,7 @@ public function collectCarrierRates($carrierCode, $request) /** * Compose Packages For Carrier. - * Devides order into items and items into parts if it's neccesary + * Divides order into items and items into parts if it's necessary * * @param Mage_Shipping_Model_Carrier_Abstract $carrier * @param Mage_Shipping_Model_Rate_Request $request @@ -354,7 +353,6 @@ protected function _makePieces($items, $maxWeight) /** * Collect rates by address * - * @param Varien_Object $address * @param null|bool|array $limitCarrier * @return $this */ @@ -421,7 +419,6 @@ public function getCarrierByCode($carrierCode, $storeId = null) /** * Prepare and do request to shipment * - * @param Mage_Sales_Model_Order_Shipment $orderShipment * @return Varien_Object */ public function requestToShipment(Mage_Sales_Model_Order_Shipment $orderShipment) diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php index 4aa491df2b3..f146148787c 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,8 +44,6 @@ abstract class Mage_Sitemap_Model_Resource_Catalog_Abstract extends Mage_Core_Mo /** * Initialize factory instance - * - * @param array $args */ public function __construct(array $args = []) { @@ -131,7 +129,6 @@ protected function _addFilter($storeId, $attributeCode, $value, $type = '=') /** * Prepare catalog object * - * @param array $row * @return Varien_Object */ protected function _prepareObject(array $row) diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php index 9e7a64cf83c..8bfefd7c824 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -70,7 +70,6 @@ public function getCollection($storeId) * * @deprecated after 1.7.0.2 * - * @param array $categoryRow * @return Varien_Object */ protected function _prepareCategory(array $categoryRow) diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php index 8ffa22d408b..ae3e8776250 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,7 +74,6 @@ public function getCollection($storeId) * * @deprecated after 1.7.0.2 * - * @param array $productRow * @return Varien_Object */ protected function _prepareProduct(array $productRow) diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php b/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php index 252d924dfb5..5bc67750e21 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,7 +60,6 @@ public function getCollection($storeId) /** * Prepare page object * - * @param array $data * @return Varien_Object */ protected function _prepareObject(array $data) diff --git a/app/code/core/Mage/Sitemap/Model/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Sitemap.php index 91f0fe97217..9bc0e043880 100644 --- a/app/code/core/Mage/Sitemap/Model/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Sitemap.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -225,11 +225,9 @@ public function generateXml() /** * Get sitemap row * - * @param string $url * @param null|string $lastmod * @param null|string $changefreq * @param null|string $priority - * @return string */ protected function getSitemapRow(string $url, $lastmod = null, $changefreq = null, $priority = null): string { diff --git a/app/code/core/Mage/Tag/Block/Customer/Tags.php b/app/code/core/Mage/Tag/Block/Customer/Tags.php index 01ce223e417..a520663aed3 100644 --- a/app/code/core/Mage/Tag/Block/Customer/Tags.php +++ b/app/code/core/Mage/Tag/Block/Customer/Tags.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/Product/List.php b/app/code/core/Mage/Tag/Block/Product/List.php index d69ee562fa1..24c03dd4e11 100644 --- a/app/code/core/Mage/Tag/Block/Product/List.php +++ b/app/code/core/Mage/Tag/Block/Product/List.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/Product/Result.php b/app/code/core/Mage/Tag/Block/Product/Result.php index bd5da0fb927..18225afbce0 100644 --- a/app/code/core/Mage/Tag/Block/Product/Result.php +++ b/app/code/core/Mage/Tag/Block/Product/Result.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Helper/Data.php b/app/code/core/Mage/Tag/Helper/Data.php index a2de68080cc..d7ebc7cb6ab 100644 --- a/app/code/core/Mage/Tag/Helper/Data.php +++ b/app/code/core/Mage/Tag/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,7 +68,6 @@ public function extractTags($tagNamesInString) /** * Clear tag from the separating characters * - * @param array $tagNamesArr * @return array */ public function cleanTags(array $tagNamesArr) diff --git a/app/code/core/Mage/Tag/Model/Api.php b/app/code/core/Mage/Tag/Model/Api.php index bb8debcee0e..bfd04212abd 100644 --- a/app/code/core/Mage/Tag/Model/Api.php +++ b/app/code/core/Mage/Tag/Model/Api.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Api/V2.php b/app/code/core/Mage/Tag/Model/Api/V2.php index 0684d77772a..36d2483b8d0 100644 --- a/app/code/core/Mage/Tag/Model/Api/V2.php +++ b/app/code/core/Mage/Tag/Model/Api/V2.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php index d358c941611..97c9d056c59 100644 --- a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php +++ b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Indexer/Summary.php index 60d7e50512d..8807c526d4a 100644 --- a/app/code/core/Mage/Tag/Model/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Indexer/Summary.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -98,8 +98,6 @@ protected function _getProductAttributesDependOn() /** * Register data required by process in event object - * - * @param Mage_Index_Model_Event $event */ protected function _registerEvent(Mage_Index_Model_Event $event) { @@ -114,8 +112,6 @@ protected function _registerEvent(Mage_Index_Model_Event $event) /** * Register data required by catalog product save process - * - * @param Mage_Index_Model_Event $event */ protected function _registerCatalogProductSaveEvent(Mage_Index_Model_Event $event) { @@ -134,8 +130,6 @@ protected function _registerCatalogProductSaveEvent(Mage_Index_Model_Event $even /** * Register data required by catalog product delete process - * - * @param Mage_Index_Model_Event $event */ protected function _registerCatalogProductDeleteEvent(Mage_Index_Model_Event $event) { @@ -149,8 +143,6 @@ protected function _registerCatalogProductDeleteEvent(Mage_Index_Model_Event $ev /** * Register data required by catalog product massaction process - * - * @param Mage_Index_Model_Event $event */ protected function _registerCatalogProductMassActionEvent(Mage_Index_Model_Event $event) { @@ -185,9 +177,6 @@ protected function _registerCatalogProductMassActionEvent(Mage_Index_Model_Event } } - /** - * @param Mage_Index_Model_Event $event - */ protected function _registerCatalogProduct(Mage_Index_Model_Event $event) { switch ($event->getType()) { @@ -205,9 +194,6 @@ protected function _registerCatalogProduct(Mage_Index_Model_Event $event) } } - /** - * @param Mage_Index_Model_Event $event - */ protected function _registerTag(Mage_Index_Model_Event $event) { if ($event->getType() == Mage_Index_Model_Event::TYPE_SAVE) { @@ -215,9 +201,6 @@ protected function _registerTag(Mage_Index_Model_Event $event) } } - /** - * @param Mage_Index_Model_Event $event - */ protected function _registerTagRelation(Mage_Index_Model_Event $event) { if ($event->getType() == Mage_Index_Model_Event::TYPE_SAVE) { @@ -227,8 +210,6 @@ protected function _registerTagRelation(Mage_Index_Model_Event $event) /** * Process event - * - * @param Mage_Index_Model_Event $event */ protected function _processEvent(Mage_Index_Model_Event $event) { diff --git a/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php index 167552ad0f2..422e9bac0c8 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php +++ b/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php index 6920af00766..04ae7abea4a 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +29,6 @@ protected function _construct() /** * Process tag save * - * @param Mage_Index_Model_Event $event * @return $this */ public function tagSave(Mage_Index_Model_Event $event) @@ -44,7 +43,6 @@ public function tagSave(Mage_Index_Model_Event $event) /** * Process tag relation save * - * @param Mage_Index_Model_Event $event * @return $this */ public function tagRelationSave(Mage_Index_Model_Event $event) @@ -60,7 +58,6 @@ public function tagRelationSave(Mage_Index_Model_Event $event) * Process product save. * Method is responsible for index support when product was saved. * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductSave(Mage_Index_Model_Event $event) @@ -81,7 +78,6 @@ public function catalogProductSave(Mage_Index_Model_Event $event) * Process product delete. * Method is responsible for index support when product was deleted * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductDelete(Mage_Index_Model_Event $event) @@ -96,7 +92,6 @@ public function catalogProductDelete(Mage_Index_Model_Event $event) /** * Process product massaction * - * @param Mage_Index_Model_Event $event * @return $this */ public function catalogProductMassAction(Mage_Index_Model_Event $event) diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag.php b/app/code/core/Mage/Tag/Model/Resource/Tag.php index 76f1aa09fce..ee7b7b78b8a 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Tag.php +++ b/app/code/core/Mage/Tag/Model/Resource/Tag.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -331,7 +331,6 @@ public function aggregate($object) /** * Decrementing tag products quantity as action for product delete * - * @param array $tagsId * @return int The number of affected rows */ public function decrementProducts(array $tagsId) @@ -409,7 +408,6 @@ protected function _getLoadSelect($field, $value, $object) /** * Fetch store ids in which tag visible * - * @param Mage_Core_Model_Abstract|Mage_Tag_Model_Tag $object * @return $this */ protected function _afterLoad(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php index b551409dfc8..860ffff8b8d 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php +++ b/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Tag.php b/app/code/core/Mage/Tag/Model/Tag.php index 1dc6ee88c3a..43dbd60c09b 100644 --- a/app/code/core/Mage/Tag/Model/Tag.php +++ b/app/code/core/Mage/Tag/Model/Tag.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -121,7 +121,6 @@ public function getAddBasePopularity() /** * Product event tags collection getter * - * @param Varien_Event_Observer $observer * @return Mage_Tag_Model_Resource_Tag_Collection */ protected function _getProductEventTagsCollection(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Tag/Model/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Tag/Relation.php index 16061a13323..260057ed3f0 100644 --- a/app/code/core/Mage/Tag/Model/Tag/Relation.php +++ b/app/code/core/Mage/Tag/Model/Tag/Relation.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -138,7 +138,6 @@ public function deactivate() /** * Add TAG to PRODUCT relations * - * @param Mage_Tag_Model_Tag $model * @param array $productIds * @return $this */ diff --git a/app/code/core/Mage/Tag/controllers/IndexController.php b/app/code/core/Mage/Tag/controllers/IndexController.php index 833837c75b6..46221e14c81 100644 --- a/app/code/core/Mage/Tag/controllers/IndexController.php +++ b/app/code/core/Mage/Tag/controllers/IndexController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +81,7 @@ public function saveAction() } /** - * Checks inputed tags on the correctness of symbols and split string to array of tags + * Checks inputted tags on the correctness of symbols and split string to array of tags * * @param string $tagNamesInString * @return array @@ -94,7 +94,6 @@ protected function _extractTags($tagNamesInString) /** * Clears the tag from the separating characters. * - * @param array $tagNamesArr * @return array */ protected function _cleanTags(array $tagNamesArr) diff --git a/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php index 2c98d5026a8..e4de74aee28 100644 --- a/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php +++ b/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Tax_Block_Adminhtml_Frontend_Region_Updater extends Mage_Adminhtml_Block_System_Config_Form_Field { /** - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php b/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php index 897a61c30d2..18c72cebc24 100644 --- a/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php +++ b/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,8 +37,6 @@ class Mage_Tax_Block_Adminhtml_Notifications extends Mage_Adminhtml_Block_Templa /** * Initialize block instance - * - * @param array $args */ public function __construct(array $args = []) { diff --git a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php index df1caa70785..931fee84633 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,8 +38,6 @@ class Mage_Tax_Block_Checkout_Subtotal extends Mage_Checkout_Block_Total_Default /** * Initialize factory instance - * - * @param array $args */ public function __construct(array $args = []) { diff --git a/app/code/core/Mage/Tax/Block/Checkout/Tax.php b/app/code/core/Mage/Tax/Block/Checkout/Tax.php index 84a15ddc7b5..e947e0efc92 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Tax.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,8 +35,6 @@ class Mage_Tax_Block_Checkout_Tax extends Mage_Checkout_Block_Total_Default /** * Initialize factory instance - * - * @param array $args */ public function __construct(array $args = []) { diff --git a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php index 57e95c88a17..c0d7023d690 100644 --- a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,7 +44,7 @@ protected function _construct() } /** - * Check if we nedd display full tax total info + * Check if we need display full tax total info * * @return bool */ diff --git a/app/code/core/Mage/Tax/Helper/Data.php b/app/code/core/Mage/Tax/Helper/Data.php index 88dbf246ad8..123eff45f85 100644 --- a/app/code/core/Mage/Tax/Helper/Data.php +++ b/app/code/core/Mage/Tax/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -110,8 +110,6 @@ class Mage_Tax_Helper_Data extends Mage_Core_Helper_Abstract /** * Initialize helper instance - * - * @param array $args */ public function __construct(array $args = []) { @@ -466,7 +464,7 @@ protected function _getAllRatesByProductClass($store = null) * Get product price with all tax settings processing * * @param Mage_Catalog_Model_Product $product - * @param float $price inputed product price + * @param float $price inputted product price * @param bool $includingTax return price include tax flag * @param null|Mage_Customer_Model_Address $shippingAddress * @param null|Mage_Customer_Model_Address $billingAddress @@ -1211,7 +1209,6 @@ public function isCrossBorderTradeEnabled($store = null) * Use flag to store ignore setting rather than config to avoid config reinit/save * Read config value for backwards compatibility. * - * @param string $key * @return bool * @throws Mage_Core_Model_Store_Exception * @throws Throwable @@ -1231,8 +1228,6 @@ protected function _isIgnored(string $key) } /** - * @param string $key - * @param bool $value * @return void * @throws Throwable */ diff --git a/app/code/core/Mage/Tax/Model/Calculation.php b/app/code/core/Mage/Tax/Model/Calculation.php index 3841d490f5b..05708a39d26 100644 --- a/app/code/core/Mage/Tax/Model/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Calculation.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -127,8 +127,6 @@ protected function _construct() /** * Initialize tax helper - * - * @param array $args */ public function __construct(array $args = []) { @@ -139,7 +137,6 @@ public function __construct(array $args = []) /** * Specify customer object which can be used for rate calculation * - * @param Mage_Customer_Model_Customer $customer * @return Mage_Tax_Model_Calculation */ public function setCustomer(Mage_Customer_Model_Customer $customer) diff --git a/app/code/core/Mage/Tax/Model/Config.php b/app/code/core/Mage/Tax/Model/Config.php index f4aff53b37d..400657fab61 100644 --- a/app/code/core/Mage/Tax/Model/Config.php +++ b/app/code/core/Mage/Tax/Model/Config.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -157,7 +157,7 @@ protected function _getStoreConfig($path, $store) } /** - * Check if product prices inputed include tax + * Check if product prices inputted include tax * * @param null|string|bool|int|Mage_Core_Model_Store $store * @return bool @@ -276,7 +276,7 @@ public function getNeedUseShippingExcludeTax() } /** - * Get defined tax calculation agorithm + * Get defined tax calculation algorithm * * @param mixed $store * @return string diff --git a/app/code/core/Mage/Tax/Model/Config/Notification.php b/app/code/core/Mage/Tax/Model/Config/Notification.php index 9ab85d0c14a..c662aaa5fc6 100644 --- a/app/code/core/Mage/Tax/Model/Config/Notification.php +++ b/app/code/core/Mage/Tax/Model/Config/Notification.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,8 +34,6 @@ class Mage_Tax_Model_Config_Notification extends Mage_Core_Model_Config_Data /** * Initialize class instance - * - * @param array $args */ public function __construct(array $args = []) { diff --git a/app/code/core/Mage/Tax/Model/Observer.php b/app/code/core/Mage/Tax/Model/Observer.php index cc431c23dae..7ebd4d429c5 100644 --- a/app/code/core/Mage/Tax/Model/Observer.php +++ b/app/code/core/Mage/Tax/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,8 +23,6 @@ class Mage_Tax_Model_Observer { /** * Put quote address tax information into order - * - * @param Varien_Event_Observer $observer */ public function salesEventConvertQuoteAddressToOrder(Varien_Event_Observer $observer) { @@ -45,8 +43,6 @@ public function salesEventConvertQuoteAddressToOrder(Varien_Event_Observer $obse /** * Save order tax information - * - * @param Varien_Event_Observer $observer */ public function salesEventOrderAfterSave(Varien_Event_Observer $observer) { @@ -148,7 +144,6 @@ public function salesEventOrderAfterSave(Varien_Event_Observer $observer) /** * Prepare select which is using to select index data for layered navigation * - * @param Varien_Event_Observer $observer * @return Mage_Tax_Model_Observer */ public function prepareCatalogIndexPriceSelect(Varien_Event_Observer $observer) @@ -227,7 +222,6 @@ public function aggregateSalesReportTaxData($schedule) /** * Reset extra tax amounts on quote addresses before recollecting totals * - * @param Varien_Event_Observer $observer * @return $this */ public function quoteCollectTotalsBefore(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation.php b/app/code/core/Mage/Tax/Model/Resource/Calculation.php index d73a7bcc559..4d593b8dac6 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php index 291994d8c6a..230395f2be7 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php index 3e92672e2c0..03238ed0cda 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Tax_Model_Sales_Total_Quote_Discount extends Mage_Sales_Model_Quote_A /** * Calculate discount tac amount * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function collect(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php index 9b25416bfd0..e4f393d576b 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +31,6 @@ class Mage_Tax_Model_Sales_Total_Quote_Nominal_Subtotal extends Mage_Tax_Model_S /** * Don't fetch anything * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ public function fetch(Mage_Sales_Model_Quote_Address $address) @@ -42,7 +41,6 @@ public function fetch(Mage_Sales_Model_Quote_Address $address) /** * Get nominal items only * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ protected function _getAddressItems(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php index dfee85c1cf6..f8dce6a17a3 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ class Mage_Tax_Model_Sales_Total_Quote_Nominal_Tax extends Mage_Tax_Model_Sales_ /** * Don't fetch anything * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ public function fetch(Mage_Sales_Model_Quote_Address $address) @@ -49,7 +48,6 @@ public function fetch(Mage_Sales_Model_Quote_Address $address) /** * Get nominal items only * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ protected function _getAddressItems(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php index e70c3996304..21ca45919b5 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,7 +71,6 @@ public function __construct() /** * Collect totals information about shipping * - * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Tax_Model_Sales_Total_Quote_Shipping */ public function collect(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php index d0a63646805..e12c18b8587 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -115,7 +115,6 @@ public function __construct() * and subtotal including/excluding tax. * Determine discount price if needed * - * @param Mage_Sales_Model_Quote_Address $address * * @return Mage_Tax_Model_Sales_Total_Quote_Subtotal */ @@ -717,7 +716,6 @@ protected function _deltaRound($price, $rate, $direction, $type = 'regular') /** * Recalculate row information for item based on children calculation * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * * @return Mage_Tax_Model_Sales_Total_Quote_Subtotal */ @@ -789,7 +787,6 @@ protected function _getAddressTaxRequest($address) /** * Add row total item amount to subtotal * - * @param Mage_Sales_Model_Quote_Address $address * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return Mage_Tax_Model_Sales_Total_Quote_Subtotal */ @@ -821,7 +818,6 @@ protected function _addSubtotalAmount(Mage_Sales_Model_Quote_Address $address, $ * * @deprecated after 1.4.1 * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return Mage_Tax_Model_Sales_Total_Quote_Subtotal */ protected function _resetItemPriceInclTax(Mage_Sales_Model_Quote_Item_Abstract $item) @@ -848,7 +844,6 @@ protected function _processShippingAmount($address) * @deprecated after 1.4.1 * * @param Mage_Sales_Model_Quote_Address $address - * @param Mage_Sales_Model_Quote_Item_Abstract $item * * @return Mage_Tax_Model_Sales_Total_Quote_Subtotal */ diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php index 2a5e5782b7d..f09c2c9ce6c 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -98,7 +98,6 @@ public function __construct() /** * Round the total amounts in address * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ protected function _roundTotals(Mage_Sales_Model_Quote_Address $address) @@ -142,7 +141,6 @@ protected function _roundTotals(Mage_Sales_Model_Quote_Address $address) /** * Collect tax totals for quote address * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -273,7 +271,6 @@ protected function _usePriceIncludeTax($store) /** * - * @param Mage_Sales_Model_Quote_Address $address * @param float $rate * @param array $appliedRates * @param string $taxId @@ -368,7 +365,6 @@ protected function _calculateShippingTaxByRate( /** * Tax calculation for shipping price * - * @param Mage_Sales_Model_Quote_Address $address * @param Varien_Object $taxRateRequest * @return $this */ @@ -398,7 +394,6 @@ protected function _calculateShippingTax(Mage_Sales_Model_Quote_Address $address /** * Calculate address tax amount based on one unit price and tax amount * - * @param Mage_Sales_Model_Quote_Address $address * @param Varien_Object $taxRateRequest * @return $this */ @@ -518,7 +513,7 @@ protected function _unitBaseProcessItemTax( } /** - * Calculate unit tax anount based on unit price + * Calculate unit tax amount based on unit price * * @param Mage_Sales_Model_Quote_Item_Abstract $item * @param float $rate @@ -636,7 +631,7 @@ protected function _calcUnitTaxAmount( ]; } // calculate discount compensation - // We need the discount compensation when dont calculate the hidden taxes + // We need the discount compensation when don't calculate the hidden taxes // (when product does not include taxes) if (!$item->getNoDiscount() && $item->getWeeeTaxApplied()) { $item->setDiscountTaxCompensation($item->getDiscountTaxCompensation() + @@ -676,7 +671,6 @@ protected function _calcUnitTaxAmount( /** * Calculate address total tax based on row total * - * @param Mage_Sales_Model_Quote_Address $address * @param Varien_Object $taxRateRequest * @return $this */ @@ -950,7 +944,6 @@ protected function _calcRowTaxAmount( /** * Calculate address total tax based on address subtotal * - * @param Mage_Sales_Model_Quote_Address $address * @param Varien_Object $taxRateRequest * @return $this */ @@ -1495,7 +1488,6 @@ protected function _deltaRound($price, $rate, $direction, $type = 'regular') /** * Recalculate parent item amounts base on children data * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return $this */ protected function _recalculateParent(Mage_Sales_Model_Quote_Item_Abstract $item) @@ -1514,7 +1506,6 @@ protected function _recalculateParent(Mage_Sales_Model_Quote_Item_Abstract $item /** * Collect applied tax rates information on address level * - * @param Mage_Sales_Model_Quote_Address $address * @param array $applied * @param float $amount * @param float $baseAmount @@ -1569,7 +1560,6 @@ protected function _saveAppliedTaxes( /** * Add tax totals information to address object * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetch(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php index 2c32d013709..d56a34663f5 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php index 279d5d8696d..a74bfd554cb 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php index 313641716bc..ae8ea9406d7 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Uploader/Helper/File.php b/app/code/core/Mage/Uploader/Helper/File.php index 9ecd49ab05f..caca9356a7e 100644 --- a/app/code/core/Mage/Uploader/Helper/File.php +++ b/app/code/core/Mage/Uploader/Helper/File.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Uploader * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Uploader/Model/Config/Abstract.php b/app/code/core/Mage/Uploader/Model/Config/Abstract.php index 906801629f0..43b2f20c4d9 100644 --- a/app/code/core/Mage/Uploader/Model/Config/Abstract.php +++ b/app/code/core/Mage/Uploader/Model/Config/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Uploader * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Uploader/Model/Config/Uploader.php b/app/code/core/Mage/Uploader/Model/Config/Uploader.php index 9948b0035ef..7827a1dc562 100644 --- a/app/code/core/Mage/Uploader/Model/Config/Uploader.php +++ b/app/code/core/Mage/Uploader/Model/Config/Uploader.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Uploader * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +59,7 @@ * @method $this setProgressCallbacksInterval(int $progressCallbacksInterval) * @method $this setSpeedSmoothingFactor(int $speedSmoothingFactor) * Used for calculating average upload speed. Number from 1 to 0. - * Set to 1 and average upload speed wil be equal to current upload speed. + * Set to 1 and average upload speed will be equal to current upload speed. * For longer file uploads it is better set this number to 0.02, * because time remaining estimation will be more accurate. * @method $this setSuccessStatuses(array $successStatuses) diff --git a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php index 5393ae67a96..832acf83870 100644 --- a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +59,6 @@ public function _construct() /** * Retrieve Element HTML fragment * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php index 0b51278ab26..c9614e06ef6 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -124,7 +124,6 @@ public function isShippingLabelsAvailable() * bundle itself, otherwise we may not get a rate at all (e.g. when total weight of a bundle exceeds max weight * despite each item by itself is not) * - * @param Mage_Shipping_Model_Rate_Request $request * @return array */ public function getAllItems(Mage_Shipping_Model_Rate_Request $request) @@ -156,7 +155,6 @@ public function getAllItems(Mage_Shipping_Model_Rate_Request $request) /** * Processing additional validation to check if carrier applicable. * - * @param Mage_Shipping_Model_Rate_Request $request * @return Mage_Shipping_Model_Carrier_Abstract|Mage_Shipping_Model_Rate_Result_Error|bool */ public function proccessAdditionalValidation(Mage_Shipping_Model_Rate_Request $request) @@ -278,7 +276,6 @@ protected function _prepareServiceName($name) * Prepare shipment request. * Validate and correct request information * - * @param Varien_Object $request * */ protected function _prepareShipmentRequest(Varien_Object $request) @@ -295,7 +292,6 @@ protected function _prepareShipmentRequest(Varien_Object $request) /** * Do request to shipment * - * @param Mage_Shipping_Model_Shipment_Request $request * @return Varien_Object */ public function requestToShipment(Mage_Shipping_Model_Shipment_Request $request) @@ -405,7 +401,6 @@ public function rollBack($data) /** * Do shipment request to carrier web service, obtain Print Shipping Labels and process errors in response * - * @param Varien_Object $request * @return Varien_Object */ abstract protected function _doShipmentRequest(Varien_Object $request); diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php index 689ab84e0f6..e3426f320f0 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php index 33b38946200..a03f4d9ba3b 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -101,7 +101,6 @@ class Mage_Usa_Model_Shipping_Carrier_Dhl extends Mage_Usa_Model_Shipping_Carrie /** * Collect and get rates * - * @param Mage_Shipping_Model_Rate_Request $request * @return bool|Mage_Shipping_Model_Rate_Result|null */ public function collectRates(Mage_Shipping_Model_Rate_Request $request) @@ -163,7 +162,6 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request) /** * Prepare and set request in property of current instance * - * @param Varien_Object $request * @return $this */ public function setRequest(Varien_Object $request) @@ -449,7 +447,7 @@ protected function _doRequest() $shipKey = $r->getShippingIntlKey(); $r->setShipDate($this->_getShipDate(false)); /* - * For internation shippingment customsvalue must be posted + * For international shipment customs value must be posted */ $shippingDuty = $shipment->addChild('Dutiable'); $shippingDuty->addChild('DutiableFlag', ($r->getDutiable() ? 'Y' : 'N')); @@ -488,7 +486,7 @@ protected function _doRequest() $r->setShipDate($this->_getShipDate(false)); /* - * For internation shippingment customsvalue must be posted + * For international shipment customs value must be posted */ $shippingDuty = $shipment->addChild('Dutiable'); $shippingDuty->addChild('DutiableFlag', ($r->getDutiable() ? 'Y' : 'N')); @@ -999,7 +997,7 @@ protected function _getXMLTracking($trackings) $debugData = ['request' => $request]; /* * tracking api cannot process from 3pm to 5pm PST time on Sunday - * DHL Airborne conduts a maintainance during that period. + * DHL Airborne conducts a maintenance during that period. */ try { $url = $this->getConfigData('gateway_url'); @@ -1267,7 +1265,6 @@ public function getAdditionalProtectionRoundingTypes() /** * Map request to shipment * - * @param Varien_Object $request * @return null */ protected function _mapRequestToShipment(Varien_Object $request) @@ -1306,7 +1303,6 @@ protected function _mapRequestToShipment(Varien_Object $request) /** * Do shipment request to carrier web service, obtain Print Shipping Labels and process errors in response * - * @param Varien_Object $request * @return Varien_Object */ protected function _doShipmentRequest(Varien_Object $request) @@ -1322,7 +1318,6 @@ protected function _doShipmentRequest(Varien_Object $request) /** * Return container types of carrier * - * @param Varien_Object|null $params * @return array|bool */ public function getContainerTypes(?Varien_Object $params = null) diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php index 84e3141da5d..8f67cd2030a 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -173,7 +173,6 @@ protected function _getDefaultValue($origValue, $pathToValue) /** * Collect and get rates * - * @param Mage_Shipping_Model_Rate_Request $request * @return bool|Mage_Shipping_Model_Rate_Result|null */ public function collectRates(Mage_Shipping_Model_Rate_Request $request) @@ -262,7 +261,6 @@ protected function _addParams($requestObject) /** * Prepare and set request in property of current instance * - * @param Varien_Object $request * @return $this */ public function setRequest(Varien_Object $request) @@ -645,8 +643,6 @@ protected function _getAllItems() /** * Make pieces - * - * @param SimpleXMLElement $nodeBkgDetails */ protected function _makePieces(SimpleXMLElement $nodeBkgDetails) { @@ -836,7 +832,7 @@ protected function _getQuotesFromServer($request) } /** - * Build qoutes request XML object + * Build quotes request XML object * * @return SimpleXMLElement */ @@ -894,7 +890,6 @@ protected function _buildQuotesRequestXml() /** * Set pick-up date in request XML object * - * @param SimpleXMLElement $requestXml * @param string $date * @return SimpleXMLElement */ @@ -994,7 +989,6 @@ protected function _parseResponse($response) /** * Add rate to DHL rates array * - * @param SimpleXMLElement $shipmentDetails * @return $this */ protected function _addRate(SimpleXMLElement $shipmentDetails) @@ -1109,7 +1103,6 @@ protected function getCountryParams($countryCode) /** * Do shipment request to carrier web service, obtain Print Shipping Labels and process errors in response * - * @param Varien_Object $request * @return Varien_Object */ protected function _doShipmentRequest(Varien_Object $request) @@ -1124,7 +1117,6 @@ protected function _doShipmentRequest(Varien_Object $request) /** * Processing additional validation to check is carrier applicable. * - * @param Mage_Shipping_Model_Rate_Request $request * @return Mage_Shipping_Model_Carrier_Abstract|Mage_Shipping_Model_Rate_Result_Error|bool */ public function proccessAdditionalValidation(Mage_Shipping_Model_Rate_Request $request) @@ -1173,7 +1165,6 @@ protected function _showError() /** * Return container types of carrier * - * @param Varien_Object|null $params * @return array */ public function getContainerTypes(?Varien_Object $params = null) @@ -1187,7 +1178,6 @@ public function getContainerTypes(?Varien_Object $params = null) /** * Map request to shipment * - * @param Varien_Object $request * @return null */ protected function _mapRequestToShipment(Varien_Object $request) @@ -1728,7 +1718,6 @@ protected function _getPerpackagePrice($cost, $handlingType, $handlingFee) /** * Do request to shipment * - * @param Mage_Shipping_Model_Shipment_Request $request * @return Varien_Object */ public function requestToShipment(Mage_Shipping_Model_Shipment_Request $request) diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php index 20e976c3df4..a9a9d45e0ff 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,8 +38,6 @@ class Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf /** * Dhl International Label Creation Class constructor - * - * @param array $arguments */ public function __construct(array $arguments) { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php index 8dccfff231b..2327d6d2f33 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -61,7 +61,6 @@ public function getContents() * Calculate the width of given text in points taking into account current font and font-size * * @param string $text - * @param Zend_Pdf_Resource_Font $font * @param float $font_size * @return float */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php index 4c1de7f7ca2..d430d4bff38 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -64,7 +64,6 @@ public function getPage() /** * Set Page * - * @param Zend_Pdf_Page $page * @return $this */ public function setPage(Zend_Pdf_Page $page) @@ -74,7 +73,7 @@ public function setPage(Zend_Pdf_Page $page) } /** - * Calculate x coordinate with identation + * Calculate x coordinate with indentation * * @param int $pt * @return int @@ -85,7 +84,7 @@ protected function _x($pt) } /** - * Calculate y coordinate with identation + * Calculate y coordinate with indentation * * @param int $pt * @return int @@ -240,7 +239,6 @@ public function addReferenceData($data) /** * Add Sender Info * - * @param SimpleXMLElement $sender * @return $this * @throws InvalidArgumentException */ @@ -282,7 +280,6 @@ public function addSenderInfo(SimpleXMLElement $sender) /** * Draw Sender Address * - * @param SimpleXMLElement $addressLines * @param string $phoneNumber * @return float */ @@ -336,7 +333,6 @@ public function addOriginInfo($serviceAreaCode) /** * Add Receive Info * - * @param SimpleXMLElement $consignee * @return $this */ public function addReceiveInfo(SimpleXMLElement $consignee) diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php index a0812f9d6b8..a5727f6ce4d 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -159,7 +159,6 @@ protected function _createTrackSoapClient() /** * Collect and get rates * - * @param Mage_Shipping_Model_Rate_Request $request * @return Mage_Shipping_Model_Rate_Result|bool|null */ public function collectRates(Mage_Shipping_Model_Rate_Request $request) @@ -179,7 +178,6 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request) /** * Prepare and set request to this instance * - * @param Mage_Shipping_Model_Rate_Request $request * @return $this */ public function setRequest(Mage_Shipping_Model_Rate_Request $request) @@ -1007,8 +1005,8 @@ protected function _getXMLTracking($tracking) 'Value' => $tracking, ], /* - * 0 = summary data, one signle scan structure with the most recent scan - * 1 = multiple sacn activity for each package + * 0 = summary data, one single scan structure with the most recent scan + * 1 = multiple scan activity for each package */ 'IncludeDetailedScans' => 1, ]; @@ -1297,7 +1295,6 @@ protected function _getAuthDetails() /** * Form array with appropriate structure for shipment request * - * @param Varien_Object $request * @return array */ protected function _formShipmentRequest(Varien_Object $request) @@ -1481,7 +1478,6 @@ protected function _formShipmentRequest(Varien_Object $request) /** * Do shipment request to carrier web service, obtain Print Shipping Labels and process errors in response * - * @param Varien_Object $request * @return Varien_Object */ protected function _doShipmentRequest(Varien_Object $request) @@ -1547,7 +1543,6 @@ public function rollBack($data) /** * Return container types of carrier * - * @param Varien_Object|null $params * @return array|bool */ public function getContainerTypes(?Varien_Object $params = null) @@ -1604,7 +1599,6 @@ public function getContainerTypesFilter() /** * Return delivery confirmation types of carrier * - * @param Varien_Object|null $params * @return array */ public function getDeliveryConfirmationTypes(?Varien_Object $params = null) diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php index acf390d2397..b4981b4cda0 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php @@ -127,7 +127,6 @@ class Mage_Usa_Model_Shipping_Carrier_Ups extends Mage_Usa_Model_Shipping_Carrie /** * Collect and get rates * - * @param Mage_Shipping_Model_Rate_Request $request * @return Mage_Shipping_Model_Rate_Result|bool|null */ public function collectRates(Mage_Shipping_Model_Rate_Request $request) @@ -147,7 +146,6 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request) /** * Prepare and set request to this instance * - * @param Mage_Shipping_Model_Rate_Request $request * @return $this */ public function setRequest(Mage_Shipping_Model_Rate_Request $request) @@ -1345,7 +1343,6 @@ public function getAllowedMethods() /** * Form XML for shipment request * - * @param Varien_Object $request * @return string */ protected function _formShipmentRequest(Varien_Object $request) @@ -1541,7 +1538,6 @@ protected function _formShipmentRequest(Varien_Object $request) /** * Send and process shipment accept request * - * @param SimpleXMLElement $shipmentConfirmResponse * @return Varien_Object */ protected function _sendShipmentAcceptRequest(SimpleXMLElement $shipmentConfirmResponse) @@ -2012,7 +2008,6 @@ protected function _doShipmentRequestXML(Varien_Object $request): Varien_Object /** * Return container types of carrier * - * @param Varien_Object|null $params * @return array|bool */ public function getContainerTypes(?Varien_Object $params = null) @@ -2096,7 +2091,6 @@ public function getContainerTypesFilter() /** * Return delivery confirmation types of carrier * - * @param Varien_Object|null $params * @return array */ public function getDeliveryConfirmationTypes(?Varien_Object $params = null) @@ -2398,13 +2392,6 @@ private function setRatePriceData(array $priceArr, array $costArr, string $error /** * Processing rate for ship element - * - * @param array $shipElement - * @param array $allowedMethods - * @param array $allowedCurrencies - * @param array $costArr - * @param array $priceArr - * @param bool $negotiatedActive */ private function processShippingRestRateForItem( array $shipElement, diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php index 64805ad8261..5fe90ceb710 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php index 24d12e93a0b..18ca58e6951 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php index d8d974ea6ad..56a736e64a1 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php index f449d8e1c78..ef777f2d8cc 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -117,7 +117,6 @@ class Mage_Usa_Model_Shipping_Carrier_Usps extends Mage_Usa_Model_Shipping_Carri /** * Collect and get rates * - * @param Mage_Shipping_Model_Rate_Request $request * @return Mage_Shipping_Model_Rate_Result|bool|null */ public function collectRates(Mage_Shipping_Model_Rate_Request $request) @@ -138,7 +137,6 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request) /** * Prepare and set request to this instance * - * @param Mage_Shipping_Model_Rate_Request $request * @return $this */ public function setRequest(Mage_Shipping_Model_Rate_Request $request) @@ -1325,7 +1323,6 @@ protected function _filterServiceName($name) * As integration guide it is important to follow appropriate sequence for tags e.g.: must be * after * - * @param Varien_Object $request * @return string * @deprecated This method should not be used anymore. * @see Mage_Usa_Model_Shipping_Carrier_Usps::_doShipmentRequest method doc block. @@ -1391,11 +1388,9 @@ protected function _formUsExpressShipmentRequest(Varien_Object $request) * As integration guide it is important to follow appropriate sequence for tags e.g.: must be * after * - * @param Varien_Object $request * @param string $serviceType * * @throws Exception - * * @return string */ protected function _formUsSignatureConfirmationShipmentRequest(Varien_Object $request, $serviceType) @@ -1493,7 +1488,6 @@ protected function _convertPoundOunces($weightInPounds) * As integration guide it is important to follow appropriate sequence for tags e.g.: must be * after * - * @param Varien_Object $request * @return string * @deprecated Should not be used anymore. * @see Mage_Usa_Model_Shipping_Carrier_Usps::_doShipmentRequest doc block. @@ -1732,7 +1726,6 @@ protected function _formIntlShipmentRequest(Varien_Object $request) /** * Do shipment request to carrier web service, obtain Print Shipping Labels and process errors in response * - * @param Varien_Object $request * @return Varien_Object * @deprecated This method must not be used anymore. Starting from 23.02.2018 USPS eliminates API usage for * free shipping labels generating. @@ -1810,7 +1803,6 @@ protected function _doShipmentRequest(Varien_Object $request) /** * Return container types of carrier * - * @param Varien_Object|null $params * @return array|bool */ public function getContainerTypes(?Varien_Object $params = null) @@ -1844,7 +1836,6 @@ public function getContainerTypesFilter() /** * Return delivery confirmation types of carrier * - * @param Varien_Object|null $params * @return array */ public function getDeliveryConfirmationTypes(?Varien_Object $params = null) @@ -1874,7 +1865,6 @@ public function isGirthAllowed($countyDest = null) /** * Return content types of package * - * @param Varien_Object $params * @return array */ public function getContentTypes(Varien_Object $params) diff --git a/app/code/core/Mage/Usa/etc/config.xml b/app/code/core/Mage/Usa/etc/config.xml index eec95e2b558..6925a94e3ab 100644 --- a/app/code/core/Mage/Usa/etc/config.xml +++ b/app/code/core/Mage/Usa/etc/config.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/etc/system.xml b/app/code/core/Mage/Usa/etc/system.xml index 8e39f3a70e9..33e8ba786f9 100644 --- a/app/code/core/Mage/Usa/etc/system.xml +++ b/app/code/core/Mage/Usa/etc/system.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php index 782dd078cc4..1d676d6ad48 100644 --- a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,7 +63,6 @@ public function getProduct() /** * Renders html of block * - * @param Varien_Data_Form_Element_Abstract $element * * @return string */ @@ -77,7 +76,6 @@ public function render(Varien_Data_Form_Element_Abstract $element) /** * Sets internal reference to element * - * @param Varien_Data_Form_Element_Abstract $element * * @return $this */ diff --git a/app/code/core/Mage/Weee/Helper/Data.php b/app/code/core/Mage/Weee/Helper/Data.php index 06fafd90382..07d01939eb3 100644 --- a/app/code/core/Mage/Weee/Helper/Data.php +++ b/app/code/core/Mage/Weee/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -168,7 +168,7 @@ public function getAmount($product, $shipping = null, $billing = null, $website } /** - * Returns diaplay type for price accordingly to current zone + * Returns display type for price accordingly to current zone * * @param Mage_Catalog_Model_Product $product * @param array|null $compareTo diff --git a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php index f6ed065e028..cdcd115abc2 100644 --- a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Weee_Model_Attribute_Backend_Weee_Tax extends Mage_Catalog_Model_Product_Attribute_Backend_Price diff --git a/app/code/core/Mage/Weee/Model/Observer.php b/app/code/core/Mage/Weee/Model/Observer.php index 9a568f59d96..632672016ca 100644 --- a/app/code/core/Mage/Weee/Model/Observer.php +++ b/app/code/core/Mage/Weee/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Weee_Model_Observer extends Mage_Core_Model_Abstract /** * Assign custom renderer for product create/edit form weee attribute element * - * @param Varien_Event_Observer $observer * @return Mage_Weee_Model_Observer */ public function setWeeeRendererInForm(Varien_Event_Observer $observer) @@ -49,7 +48,6 @@ public function setWeeeRendererInForm(Varien_Event_Observer $observer) /** * Exclude WEEE attributes from standard form generation * - * @param Varien_Event_Observer $observer * @return Mage_Weee_Model_Observer */ public function updateExcludedFieldList(Varien_Event_Observer $observer) @@ -70,7 +68,6 @@ public function updateExcludedFieldList(Varien_Event_Observer $observer) /** * Add additional price calculation to select object which is using for select indexed data * - * @param Varien_Event_Observer $observer * @return Mage_Weee_Model_Observer */ public function prepareCatalogIndexSelect(Varien_Event_Observer $observer) @@ -174,7 +171,6 @@ protected function _getSelect() /** * Add new attribute type to manage attributes interface * - * @param Varien_Event_Observer $observer * @return Mage_Weee_Model_Observer */ public function addWeeeTaxAttributeType(Varien_Event_Observer $observer) @@ -207,9 +203,8 @@ public function addWeeeTaxAttributeType(Varien_Event_Observer $observer) } /** - * Automaticaly assign backend model to weee attributes + * Automatically assign backend model to weee attributes * - * @param Varien_Event_Observer $observer * @return Mage_Weee_Model_Observer */ public function assignBackendModelToAttribute(Varien_Event_Observer $observer) @@ -237,7 +232,6 @@ public function assignBackendModelToAttribute(Varien_Event_Observer $observer) /** * Add custom element type for attributes form * - * @param Varien_Event_Observer $observer * @return Mage_Weee_Model_Observer */ public function updateElementTypes(Varien_Event_Observer $observer) @@ -252,7 +246,6 @@ public function updateElementTypes(Varien_Event_Observer $observer) /** * Update WEEE amounts discount percents * - * @param Varien_Event_Observer $observer * @return Mage_Weee_Model_Observer */ public function updateDiscountPercents(Varien_Event_Observer $observer) @@ -275,7 +268,6 @@ public function updateDiscountPercents(Varien_Event_Observer $observer) /** * Update configurable options of the product view page * - * @param Varien_Event_Observer $observer * @return Mage_Weee_Model_Observer */ public function updateCofigurableProductOptions(Varien_Event_Observer $observer) @@ -327,7 +319,6 @@ public function updateCofigurableProductOptions(Varien_Event_Observer $observer) /** * Process bundle options selection for prepare view json * - * @param Varien_Event_Observer $observer * @return Mage_Weee_Model_Observer */ public function updateBundleProductOptions(Varien_Event_Observer $observer) @@ -377,7 +368,6 @@ public function updateBundleProductOptions(Varien_Event_Observer $observer) * Notify weee helper about the admin session quote store when creating order * in the backend * - * @param Varien_Event_Observer $observer * @return $this */ public function setSessionQuoteStore(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Weee/Model/Tax.php b/app/code/core/Mage/Weee/Model/Tax.php index 1dca2b0131f..3b9c3000629 100644 --- a/app/code/core/Mage/Weee/Model/Tax.php +++ b/app/code/core/Mage/Weee/Model/Tax.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -72,8 +72,6 @@ protected function _construct() /** * Initialize tax helper - * - * @param array $args */ public function __construct(array $args = []) { diff --git a/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php b/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php index d4fb52d7548..b0b028f95c1 100644 --- a/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -20,7 +20,6 @@ class Mage_Weee_Model_Total_Creditmemo_Weee extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { /** - * @param Mage_Sales_Model_Order_Creditmemo $creditmemo * @return $this|Mage_Sales_Model_Order_Creditmemo_Total_Abstract */ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) diff --git a/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php b/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php index a12fb61ea85..3ed26add7ab 100644 --- a/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ class Mage_Weee_Model_Total_Invoice_Weee extends Mage_Sales_Model_Order_Invoice_ /** * Weee tax collector * - * @param Mage_Sales_Model_Order_Invoice $invoice * @return $this */ public function collect(Mage_Sales_Model_Order_Invoice $invoice) diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php index f5625fa2681..29b6e511edf 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,6 @@ class Mage_Weee_Model_Total_Quote_Nominal_Weee extends Mage_Weee_Model_Total_Quo /** * Get nominal items only * - * @param Mage_Sales_Model_Quote_Address $address * @return array */ protected function _getAddressItems(Mage_Sales_Model_Quote_Address $address) diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php index c61727e3067..8ff7cec3a49 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,7 +62,6 @@ public function __construct() /** * Collect Weee taxes amount and prepare items prices for taxation and discount * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function collect(Mage_Sales_Model_Quote_Address $address) @@ -107,7 +106,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address) /** * Calculate item fixed tax and prepare information for discount and recular taxation * - * @param Mage_Sales_Model_Quote_Address $address * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return $this */ @@ -311,7 +309,7 @@ protected function _processTaxSettings($item, $value, $baseValue, $rowValue, $ba } /** - * Proces row amount based on FPT total amount configuration setting + * Process row amount based on FPT total amount configuration setting * * @param Mage_Sales_Model_Quote_Address $address * @param float $rowValue @@ -334,7 +332,6 @@ protected function _processTotalAmount($address, $rowValue, $baseRowValue) /** * Recalculate parent item amounts based on children results * - * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return $this */ protected function _recalculateParent(Mage_Sales_Model_Quote_Item_Abstract $item) @@ -367,7 +364,6 @@ protected function _resetItemData($item) /** * Fetch FPT data to address object for display in totals block * - * @param Mage_Sales_Model_Quote_Address $address * @return $this */ public function fetch(Mage_Sales_Model_Quote_Address $address) @@ -392,7 +388,6 @@ public function processConfigArray($config, $store) * Process item fixed taxes * * @deprecated since 1.3.2.3 - * @param Mage_Sales_Model_Quote_Address $address * @param Mage_Sales_Model_Quote_Item_Abstract $item * @param bool $updateParent * @return $this diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php index 422683d7779..8836e620db9 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php index 1f183bf6d9f..9b909bc1396 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php index 477043a9272..b4d841d8982 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -188,7 +188,7 @@ public function getPackegeThemeOptionsArray() } /** - * Initialize form fileds values + * Initialize form fields values * * @inheritDoc */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php index 9f576fdc17b..8ddc4a85356 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +41,6 @@ protected function _construct() /** * Render given element (return html of element) * - * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function render(Varien_Data_Form_Element_Abstract $element) @@ -53,7 +52,6 @@ public function render(Varien_Data_Form_Element_Abstract $element) /** * Setter * - * @param Varien_Data_Form_Element_Abstract $element * @return $this */ public function setElement(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Widget/Block/Interface.php b/app/code/core/Mage/Widget/Block/Interface.php index da5a8dac827..955161fcd6a 100644 --- a/app/code/core/Mage/Widget/Block/Interface.php +++ b/app/code/core/Mage/Widget/Block/Interface.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,7 +32,6 @@ public function toHtml(); * Add data to the widget. * Retains previous data in the widget. * - * @param array $arr * @return Mage_Widget_Block_Interface */ public function addData(array $arr); diff --git a/app/code/core/Mage/Widget/Model/Observer.php b/app/code/core/Mage/Widget/Model/Observer.php index 0ca6e63ab4b..5e198357f72 100644 --- a/app/code/core/Mage/Widget/Model/Observer.php +++ b/app/code/core/Mage/Widget/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Widget_Model_Observer /** * Add additional settings to wysiwyg config for Widgets Insertion Plugin * - * @param Varien_Event_Observer $observer * @return $this */ public function prepareWidgetsPluginConfig(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php index 027a9640ad2..4e07d98e016 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -175,7 +175,6 @@ protected function _prepareStoreIds($storeIds) * Perform actions before object delete. * Collect page ids and layout update ids and set to object for further delete * - * @param Mage_Core_Model_Abstract $object * @return $this */ protected function _beforeDelete(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php index 2933cdc9d23..5b68e819062 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,7 @@ class Mage_Widget_Model_Resource_Widget_Instance_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { /** - * Fields map for corellation names & real selected fields + * Fields map for correlation names & real selected fields * * @var array */ diff --git a/app/code/core/Mage/Widget/Model/Widget.php b/app/code/core/Mage/Widget/Model/Widget.php index e87a5509478..a0e8f31e729 100644 --- a/app/code/core/Mage/Widget/Model/Widget.php +++ b/app/code/core/Mage/Widget/Model/Widget.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Widget/Instance.php index 4d257433892..6d84d15e256 100644 --- a/app/code/core/Mage/Widget/Model/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Model/Widget/Instance.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -321,7 +321,7 @@ protected function _parsePackageTheme() /** * Getter - * Explode to array if string setted + * Explode to array if string is set * * @return array */ @@ -335,7 +335,7 @@ public function getStoreIds() /** * Getter - * Unserialize if serialized string setted + * Unserialize if serialized string is set * * @return array */ @@ -399,7 +399,7 @@ public function getWidgetConfig() } /** - * Retrieve widget availabel templates + * Retrieve widget available templates * * @return array */ diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php index 58a93a3a6f0..09e5defd4d1 100644 --- a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php +++ b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php @@ -45,7 +45,7 @@ protected function _getSession() protected function _initAction() { $this->loadLayout() - ->_setActiveMenu('cms/widgets') + ->_setActiveMenu('cms/widget_instance') ->_addBreadcrumb( Mage::helper('widget')->__('CMS'), Mage::helper('widget')->__('CMS') diff --git a/app/code/core/Mage/Wishlist/Block/Abstract.php b/app/code/core/Mage/Wishlist/Block/Abstract.php index 2eb34d78fb9..c8030fbdaa9 100644 --- a/app/code/core/Mage/Wishlist/Block/Abstract.php +++ b/app/code/core/Mage/Wishlist/Block/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php index 6ee4a011351..397a6a612e2 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -124,7 +124,6 @@ public function getOptionsRenderCfg($productType) * Returns html for showing item options * * @deprecated after 1.6.2.0 - * @param Mage_Wishlist_Model_Item $item * @return string */ public function getDetailsHtml(Mage_Wishlist_Model_Item $item) @@ -163,7 +162,6 @@ public function getDetailsHtml(Mage_Wishlist_Model_Item $item) * Returns qty to show visually to user * * @deprecated after 1.6.2.0 - * @param Mage_Wishlist_Model_Item $item * @return float */ public function getAddToCartQty(Mage_Wishlist_Model_Item $item) diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php index bd4459a943f..361eb134913 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,7 +24,6 @@ class Mage_Wishlist_Block_Customer_Wishlist_Item_Column_Cart extends Mage_Wishli /** * Returns qty to show visually to user * - * @param Mage_Wishlist_Model_Item $item * @return float */ public function getAddToCartQty(Mage_Wishlist_Model_Item $item) diff --git a/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php b/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php index f74f46533ac..d6653e3fea3 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,7 +57,7 @@ public function getAddToCartUrl($product, $additional = []) } /** - * Check whether whishlist item has description + * Check whether wishlist item has description * * @param Mage_Wishlist_Model_Item $item * @return bool diff --git a/app/code/core/Mage/Wishlist/Controller/Abstract.php b/app/code/core/Mage/Wishlist/Controller/Abstract.php index b82a55c5637..7d3cf8e683b 100644 --- a/app/code/core/Mage/Wishlist/Controller/Abstract.php +++ b/app/code/core/Mage/Wishlist/Controller/Abstract.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Helper/Data.php b/app/code/core/Mage/Wishlist/Helper/Data.php index 1e6fb11a99f..5d8aaaba3ec 100644 --- a/app/code/core/Mage/Wishlist/Helper/Data.php +++ b/app/code/core/Mage/Wishlist/Helper/Data.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,8 +91,6 @@ protected function _getCurrentCustomer() /** * Set current customer - * - * @param Mage_Customer_Model_Customer $customer */ public function setCustomer(Mage_Customer_Model_Customer $customer) { @@ -329,7 +327,6 @@ public function getUpdateUrl($item) * Retrieve url for adding product to wishlist with params * * @param Mage_Catalog_Model_Product|Mage_Wishlist_Model_Item $item - * @param array $params * * @return string|bool */ @@ -554,7 +551,6 @@ public function isDisplayQty() * Retrieve url for adding product to wishlist with params with or without Form Key * * @param Mage_Catalog_Model_Product|Mage_Wishlist_Model_Item $item - * @param array $params * @param bool $addFormKey * @return string|bool */ diff --git a/app/code/core/Mage/Wishlist/Model/Item.php b/app/code/core/Mage/Wishlist/Model/Item.php index d56354c811b..30827fcb017 100644 --- a/app/code/core/Mage/Wishlist/Model/Item.php +++ b/app/code/core/Mage/Wishlist/Model/Item.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -341,7 +341,6 @@ public function getProduct() * Return false for disabled or unvisible products * * @throws Mage_Core_Exception - * @param Mage_Checkout_Model_Cart $cart * @param bool $delete delete the item after successful add to cart * @return bool */ diff --git a/app/code/core/Mage/Wishlist/Model/Observer.php b/app/code/core/Mage/Wishlist/Model/Observer.php index 49ab3550821..c1c41c0eb40 100644 --- a/app/code/core/Mage/Wishlist/Model/Observer.php +++ b/app/code/core/Mage/Wishlist/Model/Observer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -136,7 +136,6 @@ public function processAddToCart($observer) /** * Customer login processing * - * @param Varien_Event_Observer $observer * @return $this */ public function customerLogin(Varien_Event_Observer $observer) @@ -149,7 +148,6 @@ public function customerLogin(Varien_Event_Observer $observer) /** * Customer logout processing * - * @param Varien_Event_Observer $observer * @return $this */ public function customerLogout(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php index 4f001f7154e..9111d68eaeb 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,7 +60,7 @@ class Mage_Wishlist_Model_Resource_Item_Collection extends Mage_Core_Model_Resou protected $_storeIds = []; /** - * Add days in whishlist filter of product collection + * Add days in wishlist filter of product collection * * @var bool */ @@ -220,7 +220,6 @@ protected function _assignProducts() /** * Add filter by wishlist object * - * @param Mage_Wishlist_Model_Wishlist $wishlist * @return $this */ public function addWishlistFilter(Mage_Wishlist_Model_Wishlist $wishlist) @@ -346,7 +345,7 @@ public function setInStockFilter($flag = true) } /** - * Set add days in whishlist + * Set add days in wishlist * * This method appears in 1.5.0.0 in deprecated state, because: * - we need it to make wishlist item collection interface as much as possible compatible with old diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php index fcf4822cec6..c32674c7db2 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,7 +25,7 @@ class Mage_Wishlist_Model_Resource_Product_Collection extends Mage_Catalog_Model_Resource_Product_Collection { /** - * Add days in whishlist filter of product collection + * Add days in wishlist filter of product collection * * @var bool */ @@ -38,7 +38,7 @@ class Mage_Wishlist_Model_Resource_Product_Collection extends Mage_Catalog_Model protected $_wishlistItemTableAlias = 't_wi'; /** - * Get add days in whishlist filter of product collection flag + * Get add days in wishlist filter of product collection flag * * @return bool */ @@ -48,7 +48,7 @@ public function getDaysInWishlist() } /** - * Set add days in whishlist filter of product collection flag + * Set add days in wishlist filter of product collection flag * * @param bool $flag * @return $this @@ -62,7 +62,6 @@ public function setDaysInWishlist($flag) /** * Add wishlist filter to collection * - * @param Mage_Wishlist_Model_Wishlist $wishlist * @return $this */ public function addWishlistFilter(Mage_Wishlist_Model_Wishlist $wishlist) diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php index a3f28e73454..dbefd9cabc7 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -89,7 +89,6 @@ public function setCustomerIdFieldName($fieldName) * @deprecated after 1.6.0.0-rc2 * @see Mage_Wishlist_Model_Wishlist::getItemsCount() * - * @param Mage_Wishlist_Model_Wishlist $wishlist * * @return int */ diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php index 563a981bcc0..f4be3482fa6 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,7 +35,6 @@ protected function _construct() /** * Filter collection by customer * - * @param Mage_Customer_Model_Customer $customer * @return $this */ public function filterByCustomer(Mage_Customer_Model_Customer $customer) @@ -58,7 +57,6 @@ public function filterByCustomerId($customerId) /** * Filter collection by customer ids * - * @param array $customerIds * @return $this */ public function filterByCustomerIds(array $customerIds) diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php index 5bd84139424..24157fcbe01 100644 --- a/app/code/core/Mage/Wishlist/Model/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Wishlist.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -181,10 +181,8 @@ protected function _afterSave() /** * Add catalog product object data to wishlist * - * @param Mage_Catalog_Model_Product $product * @param int $qty * @param bool $forciblySetQty - * * @return Mage_Wishlist_Model_Item */ protected function _addCatalogProduct(Mage_Catalog_Model_Product $product, $qty = 1, $forciblySetQty = false) @@ -285,7 +283,6 @@ public function getProductCollection() /** * Adding item to wishlist * - * @param Mage_Wishlist_Model_Item $item * @return $this */ public function addItem(Mage_Wishlist_Model_Item $item) diff --git a/app/code/core/Mage/Wishlist/controllers/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php index 29cfc35b472..95c8ccd49fd 100644 --- a/app/code/core/Mage/Wishlist/controllers/IndexController.php +++ b/app/code/core/Mage/Wishlist/controllers/IndexController.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml b/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml index 21cad63b11b..02756362633 100644 --- a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml +++ b/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml index 1646ff20f36..25a2c782c94 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml index 89e6b6368ce..ea335e4c5bb 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml index d90c0d10871..9acf22c2f90 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml index 324f10fd075..dbe1130c282 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml index 8153b8ecfba..6e56fc12228 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml index f8578d53e06..bd7101d19a7 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml index 851bb106f29..644b0aae6b5 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml index 9dc5b693054..fc2ae8501b7 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml index 03afbe97010..80448aedca2 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml index ad92dd854a1..971a2a4a78a 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml index 61af61d503c..c21cb1457fa 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/created.phtml b/app/design/adminhtml/default/default/template/catalog/product/created.phtml index 297721d9054..c645231d714 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/created.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/created.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml b/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml index 3b382e519cc..34c0799061e 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml b/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml index a5630a131f4..ccea61ca94d 100644 --- a/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml +++ b/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml b/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml index 9d78c2845e5..ccc92dd2c92 100644 --- a/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml +++ b/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/eav/attribute/options.phtml b/app/design/adminhtml/default/default/template/eav/attribute/options.phtml index 275cd9811ac..52afeb96b49 100644 --- a/app/design/adminhtml/default/default/template/eav/attribute/options.phtml +++ b/app/design/adminhtml/default/default/template/eav/attribute/options.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/empty.phtml b/app/design/adminhtml/default/default/template/empty.phtml index d42ec3349a0..57a94a6ed4a 100644 --- a/app/design/adminhtml/default/default/template/empty.phtml +++ b/app/design/adminhtml/default/default/template/empty.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/forgotpassword.phtml b/app/design/adminhtml/default/default/template/forgotpassword.phtml index 078399b08cc..efddcb43f4c 100644 --- a/app/design/adminhtml/default/default/template/forgotpassword.phtml +++ b/app/design/adminhtml/default/default/template/forgotpassword.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/login.phtml b/app/design/adminhtml/default/default/template/login.phtml index 5939ccfe48e..a884d722c98 100644 --- a/app/design/adminhtml/default/default/template/login.phtml +++ b/app/design/adminhtml/default/default/template/login.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml b/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml index 7e01dd87eb7..28dfc666a1e 100644 --- a/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml b/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml index 9a7d9ca170d..f084d5a03b2 100644 --- a/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Adminhtml_Block_Newsletter_Queue_Edit */ diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml b/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml index 88f68ab5cca..4995180c797 100644 --- a/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml b/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml index 8a9fc22685d..adbe407eafd 100644 --- a/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Adminhtml_Block_Newsletter_Template_Edit */ diff --git a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml b/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml index 88f68ab5cca..4995180c797 100644 --- a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml index 2cbcd14ae9c..b7e8fee104f 100644 --- a/app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml +++ b/app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/page.phtml b/app/design/adminhtml/default/default/template/page.phtml index f4f9fe4fbf0..97f3a01e83e 100644 --- a/app/design/adminhtml/default/default/template/page.phtml +++ b/app/design/adminhtml/default/default/template/page.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/page/footer.phtml b/app/design/adminhtml/default/default/template/page/footer.phtml index dda6ccc79bb..e0aced74b9d 100644 --- a/app/design/adminhtml/default/default/template/page/footer.phtml +++ b/app/design/adminhtml/default/default/template/page/footer.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/page/head.phtml b/app/design/adminhtml/default/default/template/page/head.phtml index fc2473344b8..2aa8c311771 100644 --- a/app/design/adminhtml/default/default/template/page/head.phtml +++ b/app/design/adminhtml/default/default/template/page/head.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/popup.phtml b/app/design/adminhtml/default/default/template/popup.phtml index 03889b31c11..ba791079da8 100644 --- a/app/design/adminhtml/default/default/template/popup.phtml +++ b/app/design/adminhtml/default/default/template/popup.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml b/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml index d1b64136a98..f18ce04d4ee 100644 --- a/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml +++ b/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml index d3358480f52..8d00af38323 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml index f829d9d5f35..198b59b9e5e 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml b/app/design/adminhtml/default/default/template/system/email/template/edit.phtml index eb264cf1484..08336502137 100644 --- a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml +++ b/app/design/adminhtml/default/default/template/system/email/template/edit.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/shipping/ups.phtml b/app/design/adminhtml/default/default/template/system/shipping/ups.phtml index 528dbb93987..2bbc0a2ca97 100644 --- a/app/design/adminhtml/default/default/template/system/shipping/ups.phtml +++ b/app/design/adminhtml/default/default/template/system/shipping/ups.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/template/widget/form/element.phtml b/app/design/adminhtml/default/default/template/widget/form/element.phtml index 171fbe034ed..97aa407f9de 100644 --- a/app/design/adminhtml/default/default/template/widget/form/element.phtml +++ b/app/design/adminhtml/default/default/template/widget/form/element.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/grid.phtml b/app/design/adminhtml/default/default/template/widget/grid.phtml index d24045dedc3..c11d37edde6 100644 --- a/app/design/adminhtml/default/default/template/widget/grid.phtml +++ b/app/design/adminhtml/default/default/template/widget/grid.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml b/app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml index b047d33ba40..550b4972099 100644 --- a/app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml +++ b/app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/openmage/template/forgotpassword.phtml b/app/design/adminhtml/default/openmage/template/forgotpassword.phtml index 046e51c4a31..2c02642cc93 100644 --- a/app/design/adminhtml/default/openmage/template/forgotpassword.phtml +++ b/app/design/adminhtml/default/openmage/template/forgotpassword.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2018 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/openmage/template/login.phtml b/app/design/adminhtml/default/openmage/template/login.phtml index 5d5a02c77dd..6499b5e4bfa 100644 --- a/app/design/adminhtml/default/openmage/template/login.phtml +++ b/app/design/adminhtml/default/openmage/template/login.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2018 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/openmage/template/resetforgottenpassword.phtml b/app/design/adminhtml/default/openmage/template/resetforgottenpassword.phtml index 5fd1da51209..1b113489f69 100644 --- a/app/design/adminhtml/default/openmage/template/resetforgottenpassword.phtml +++ b/app/design/adminhtml/default/openmage/template/resetforgottenpassword.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2018 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/layout/catalogsearch.xml b/app/design/frontend/base/default/layout/catalogsearch.xml index 19a8b99787c..6e1bac8dbf3 100644 --- a/app/design/frontend/base/default/layout/catalogsearch.xml +++ b/app/design/frontend/base/default/layout/catalogsearch.xml @@ -10,7 +10,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml b/app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml index 2892c673029..282569e841b 100644 --- a/app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml +++ b/app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml b/app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml index 574f7dfab13..ea8019dc767 100644 --- a/app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml +++ b/app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml b/app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml index f21663c4955..e42ee5a11ae 100644 --- a/app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml +++ b/app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml b/app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml index 35350344045..f9e47d45c0f 100644 --- a/app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml +++ b/app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml b/app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml index 20d018e74ae..0c0ee7d0c99 100644 --- a/app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml +++ b/app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml b/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml index 3a7b2ed1915..92233034ae1 100644 --- a/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml +++ b/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Core_Block_Template */ diff --git a/app/design/frontend/base/default/template/checkout/cart.phtml b/app/design/frontend/base/default/template/checkout/cart.phtml index aa6ee75d252..8ebf60beaf1 100644 --- a/app/design/frontend/base/default/template/checkout/cart.phtml +++ b/app/design/frontend/base/default/template/checkout/cart.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/checkout/onepage.phtml b/app/design/frontend/base/default/template/checkout/onepage.phtml index 67aa8f38eae..4eeb9e21842 100644 --- a/app/design/frontend/base/default/template/checkout/onepage.phtml +++ b/app/design/frontend/base/default/template/checkout/onepage.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/checkout/success.phtml b/app/design/frontend/base/default/template/checkout/success.phtml index b24daf5fe4f..2355bc5ad90 100644 --- a/app/design/frontend/base/default/template/checkout/success.phtml +++ b/app/design/frontend/base/default/template/checkout/success.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml b/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml index d8e3bacbadc..b795b9a203d 100644 --- a/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml +++ b/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/oauth/authorize/button.phtml b/app/design/frontend/base/default/template/oauth/authorize/button.phtml index cb95dee4474..13a29304a86 100644 --- a/app/design/frontend/base/default/template/oauth/authorize/button.phtml +++ b/app/design/frontend/base/default/template/oauth/authorize/button.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml b/app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml index dfe18d794ff..f12f3f0adde 100644 --- a/app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml +++ b/app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/oauth/authorize/confirm.phtml b/app/design/frontend/base/default/template/oauth/authorize/confirm.phtml index 3034d9a2c8f..c337b03cf0a 100644 --- a/app/design/frontend/base/default/template/oauth/authorize/confirm.phtml +++ b/app/design/frontend/base/default/template/oauth/authorize/confirm.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml b/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml index 4d640d03ee9..fa1285a2ce0 100644 --- a/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml +++ b/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml b/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml index f91da35932d..1a934d0c1e0 100644 --- a/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml +++ b/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/oauth/authorize/head-simple.phtml b/app/design/frontend/base/default/template/oauth/authorize/head-simple.phtml index a8b3b04b354..5416a81037c 100644 --- a/app/design/frontend/base/default/template/oauth/authorize/head-simple.phtml +++ b/app/design/frontend/base/default/template/oauth/authorize/head-simple.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml b/app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml index 38fcaf578f4..5c2f2d6944d 100644 --- a/app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml +++ b/app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/oauth/authorize/reject.phtml b/app/design/frontend/base/default/template/oauth/authorize/reject.phtml index 8aaf304449d..39c692ed990 100644 --- a/app/design/frontend/base/default/template/oauth/authorize/reject.phtml +++ b/app/design/frontend/base/default/template/oauth/authorize/reject.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/oauth/customer/token/list.phtml b/app/design/frontend/base/default/template/oauth/customer/token/list.phtml index de3e98d711c..f14801a3b75 100644 --- a/app/design/frontend/base/default/template/oauth/customer/token/list.phtml +++ b/app/design/frontend/base/default/template/oauth/customer/token/list.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/base/default/template/page/1column.phtml b/app/design/frontend/base/default/template/page/1column.phtml index 88b0d6a2093..5b495031ad4 100644 --- a/app/design/frontend/base/default/template/page/1column.phtml +++ b/app/design/frontend/base/default/template/page/1column.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/2columns-left.phtml b/app/design/frontend/base/default/template/page/2columns-left.phtml index 3049db991ee..ae922b5202d 100644 --- a/app/design/frontend/base/default/template/page/2columns-left.phtml +++ b/app/design/frontend/base/default/template/page/2columns-left.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/2columns-right.phtml b/app/design/frontend/base/default/template/page/2columns-right.phtml index 8c6664bb1e4..e1e26146997 100644 --- a/app/design/frontend/base/default/template/page/2columns-right.phtml +++ b/app/design/frontend/base/default/template/page/2columns-right.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/3columns.phtml b/app/design/frontend/base/default/template/page/3columns.phtml index 232bb8c672f..e56bf584bf8 100644 --- a/app/design/frontend/base/default/template/page/3columns.phtml +++ b/app/design/frontend/base/default/template/page/3columns.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/empty.phtml b/app/design/frontend/base/default/template/page/empty.phtml index b2f61d45c3d..ba282235d52 100644 --- a/app/design/frontend/base/default/template/page/empty.phtml +++ b/app/design/frontend/base/default/template/page/empty.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/html/breadcrumbs.phtml b/app/design/frontend/base/default/template/page/html/breadcrumbs.phtml index 4fcf67b2b64..fc6181d18dc 100644 --- a/app/design/frontend/base/default/template/page/html/breadcrumbs.phtml +++ b/app/design/frontend/base/default/template/page/html/breadcrumbs.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/html/cookienotice.phtml b/app/design/frontend/base/default/template/page/html/cookienotice.phtml index fd15115cebd..fd4e324d173 100644 --- a/app/design/frontend/base/default/template/page/html/cookienotice.phtml +++ b/app/design/frontend/base/default/template/page/html/cookienotice.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/html/footer.phtml b/app/design/frontend/base/default/template/page/html/footer.phtml index 52df2b2fba4..e471061ebc6 100644 --- a/app/design/frontend/base/default/template/page/html/footer.phtml +++ b/app/design/frontend/base/default/template/page/html/footer.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/html/head.phtml b/app/design/frontend/base/default/template/page/html/head.phtml index 8680c6964ff..2507b84de55 100644 --- a/app/design/frontend/base/default/template/page/html/head.phtml +++ b/app/design/frontend/base/default/template/page/html/head.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/html/notices.phtml b/app/design/frontend/base/default/template/page/html/notices.phtml index 20414d5a1bc..908f9aa634f 100644 --- a/app/design/frontend/base/default/template/page/html/notices.phtml +++ b/app/design/frontend/base/default/template/page/html/notices.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/html/topmenu.phtml b/app/design/frontend/base/default/template/page/html/topmenu.phtml index 7113cccd540..b2de2e4127b 100644 --- a/app/design/frontend/base/default/template/page/html/topmenu.phtml +++ b/app/design/frontend/base/default/template/page/html/topmenu.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/js/calendar.phtml b/app/design/frontend/base/default/template/page/js/calendar.phtml index b9a611466c5..8f4eed9eab3 100644 --- a/app/design/frontend/base/default/template/page/js/calendar.phtml +++ b/app/design/frontend/base/default/template/page/js/calendar.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/js/cookie.phtml b/app/design/frontend/base/default/template/page/js/cookie.phtml index 1466188f59c..96e4f04f8ef 100644 --- a/app/design/frontend/base/default/template/page/js/cookie.phtml +++ b/app/design/frontend/base/default/template/page/js/cookie.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/popup.phtml b/app/design/frontend/base/default/template/page/popup.phtml index c7347b4a6f7..23b9d2ec111 100644 --- a/app/design/frontend/base/default/template/page/popup.phtml +++ b/app/design/frontend/base/default/template/page/popup.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/print.phtml b/app/design/frontend/base/default/template/page/print.phtml index bdae73fdb84..e1315c23670 100644 --- a/app/design/frontend/base/default/template/page/print.phtml +++ b/app/design/frontend/base/default/template/page/print.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/switch/flags.phtml b/app/design/frontend/base/default/template/page/switch/flags.phtml index a7ebeddfecd..2deda002174 100644 --- a/app/design/frontend/base/default/template/page/switch/flags.phtml +++ b/app/design/frontend/base/default/template/page/switch/flags.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/switch/languages.phtml b/app/design/frontend/base/default/template/page/switch/languages.phtml index c08018958b0..9026b505402 100644 --- a/app/design/frontend/base/default/template/page/switch/languages.phtml +++ b/app/design/frontend/base/default/template/page/switch/languages.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/switch/stores.phtml b/app/design/frontend/base/default/template/page/switch/stores.phtml index ee8a77533fc..57a62266066 100644 --- a/app/design/frontend/base/default/template/page/switch/stores.phtml +++ b/app/design/frontend/base/default/template/page/switch/stores.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/template/container.phtml b/app/design/frontend/base/default/template/page/template/container.phtml index af6d76fd150..83b035ec8f7 100644 --- a/app/design/frontend/base/default/template/page/template/container.phtml +++ b/app/design/frontend/base/default/template/page/template/container.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/template/links.phtml b/app/design/frontend/base/default/template/page/template/links.phtml index 65385ae5efd..27984a618e5 100644 --- a/app/design/frontend/base/default/template/page/template/links.phtml +++ b/app/design/frontend/base/default/template/page/template/links.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/base/default/template/page/template/linksblock.phtml b/app/design/frontend/base/default/template/page/template/linksblock.phtml index 7b97753e94a..3aee0b234a2 100644 --- a/app/design/frontend/base/default/template/page/template/linksblock.phtml +++ b/app/design/frontend/base/default/template/page/template/linksblock.phtml @@ -9,7 +9,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/layout/catalogsearch.xml b/app/design/frontend/rwd/default/layout/catalogsearch.xml index 89be340d450..73503c50345 100644 --- a/app/design/frontend/rwd/default/layout/catalogsearch.xml +++ b/app/design/frontend/rwd/default/layout/catalogsearch.xml @@ -10,7 +10,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml index d049d9bb73c..f1e58d9ee6b 100644 --- a/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml +++ b/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml b/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml index 11a67ec9477..a8386e18bbe 100644 --- a/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml +++ b/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Core_Block_Template */ diff --git a/app/design/frontend/rwd/default/template/checkout/cart.phtml b/app/design/frontend/rwd/default/template/checkout/cart.phtml index 80bf3dc705e..a95d5fe7109 100644 --- a/app/design/frontend/rwd/default/template/checkout/cart.phtml +++ b/app/design/frontend/rwd/default/template/checkout/cart.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/checkout/cart/minicart.phtml b/app/design/frontend/rwd/default/template/checkout/cart/minicart.phtml index f25de8109ed..207af6777e3 100644 --- a/app/design/frontend/rwd/default/template/checkout/cart/minicart.phtml +++ b/app/design/frontend/rwd/default/template/checkout/cart/minicart.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/rwd/default/template/checkout/onepage.phtml b/app/design/frontend/rwd/default/template/checkout/onepage.phtml index 3be5c7f8cd1..21945bddf0d 100644 --- a/app/design/frontend/rwd/default/template/checkout/onepage.phtml +++ b/app/design/frontend/rwd/default/template/checkout/onepage.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/configurableswatches/catalog/media/js.phtml b/app/design/frontend/rwd/default/template/configurableswatches/catalog/media/js.phtml index afb906fdcdb..f4d9034c1d3 100644 --- a/app/design/frontend/rwd/default/template/configurableswatches/catalog/media/js.phtml +++ b/app/design/frontend/rwd/default/template/configurableswatches/catalog/media/js.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/configurable/swatch-js.phtml b/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/configurable/swatch-js.phtml index b3b4b551a52..fb004741408 100644 --- a/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/configurable/swatch-js.phtml +++ b/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/configurable/swatch-js.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml b/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml index b68664bdf46..948bd57bd0f 100644 --- a/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml +++ b/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/rwd/default/template/page/1column.phtml b/app/design/frontend/rwd/default/template/page/1column.phtml index 3ab4ccb25b1..7a4663f1cf9 100644 --- a/app/design/frontend/rwd/default/template/page/1column.phtml +++ b/app/design/frontend/rwd/default/template/page/1column.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/page/2columns-left.phtml b/app/design/frontend/rwd/default/template/page/2columns-left.phtml index 620fb9ee283..bb42c545fd5 100644 --- a/app/design/frontend/rwd/default/template/page/2columns-left.phtml +++ b/app/design/frontend/rwd/default/template/page/2columns-left.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/page/2columns-right.phtml b/app/design/frontend/rwd/default/template/page/2columns-right.phtml index bbf24a560fe..3078966c4bf 100644 --- a/app/design/frontend/rwd/default/template/page/2columns-right.phtml +++ b/app/design/frontend/rwd/default/template/page/2columns-right.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/page/3columns.phtml b/app/design/frontend/rwd/default/template/page/3columns.phtml index fdce2479ec6..b576a53c299 100644 --- a/app/design/frontend/rwd/default/template/page/3columns.phtml +++ b/app/design/frontend/rwd/default/template/page/3columns.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/page/empty.phtml b/app/design/frontend/rwd/default/template/page/empty.phtml index c58bdea4008..9b9b7a81a35 100644 --- a/app/design/frontend/rwd/default/template/page/empty.phtml +++ b/app/design/frontend/rwd/default/template/page/empty.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/page/html/footer.phtml b/app/design/frontend/rwd/default/template/page/html/footer.phtml index 4bfeb87a55b..50f7768b7c8 100644 --- a/app/design/frontend/rwd/default/template/page/html/footer.phtml +++ b/app/design/frontend/rwd/default/template/page/html/footer.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/page/html/header.phtml b/app/design/frontend/rwd/default/template/page/html/header.phtml index 1655a652a4b..8bd094fa22e 100644 --- a/app/design/frontend/rwd/default/template/page/html/header.phtml +++ b/app/design/frontend/rwd/default/template/page/html/header.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/rwd/default/template/page/html/topmenu.phtml b/app/design/frontend/rwd/default/template/page/html/topmenu.phtml index 5c0eccdb956..57e7222e492 100644 --- a/app/design/frontend/rwd/default/template/page/html/topmenu.phtml +++ b/app/design/frontend/rwd/default/template/page/html/topmenu.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/page/popup.phtml b/app/design/frontend/rwd/default/template/page/popup.phtml index b5cd7613b8c..3c44e854131 100644 --- a/app/design/frontend/rwd/default/template/page/popup.phtml +++ b/app/design/frontend/rwd/default/template/page/popup.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/page/print.phtml b/app/design/frontend/rwd/default/template/page/print.phtml index 9a7688be16d..51c544e4e73 100644 --- a/app/design/frontend/rwd/default/template/page/print.phtml +++ b/app/design/frontend/rwd/default/template/page/print.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/rwd/default/template/page/template/links.phtml b/app/design/frontend/rwd/default/template/page/template/links.phtml index b645c66ee94..e1ae98f2cd4 100644 --- a/app/design/frontend/rwd/default/template/page/template/links.phtml +++ b/app/design/frontend/rwd/default/template/page/template/links.phtml @@ -9,7 +9,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/install/default/default/template/install/begin.phtml b/app/design/install/default/default/template/install/begin.phtml index 35d8b9846b1..ca191040e56 100644 --- a/app/design/install/default/default/template/install/begin.phtml +++ b/app/design/install/default/default/template/install/begin.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/install/default/default/template/page.phtml b/app/design/install/default/default/template/page.phtml index 0ca9a5ee164..4e1f573be9a 100644 --- a/app/design/install/default/default/template/page.phtml +++ b/app/design/install/default/default/template/page.phtml @@ -9,7 +9,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/locale/en_US/Mage_Customer.csv b/app/locale/en_US/Mage_Customer.csv index e9c526331d3..5278d291001 100644 --- a/app/locale/en_US/Mage_Customer.csv +++ b/app/locale/en_US/Mage_Customer.csv @@ -148,6 +148,9 @@ "Email","Email" "Email Address","Email Address" "Email Sender","Email Sender" +"Email Link to Set Password","Email Link to Set Password" +"Email Link to Set Password on New Account","Email Link to Set Password on New Account" +"Email Template","Email Template" "Email:","Email:" "Enable Automatic Assignment to Customer Group","Enable Automatic Assignment to Customer Group" "Entity collection is expected.","Entity collection is expected." @@ -233,6 +236,7 @@ "Name","Name" "Name and Address Options","Name and Address Options" "Never","Never" +"New Account Email Template","New Account Email Template" "New Address","New Address" "New Address Entry","New Address Entry" "New Customer","New Customer" @@ -421,6 +425,8 @@ "There was an error validating the VAT ID.","There was an error validating the VAT ID." "There was an error validating the VAT ID. The customer would belong to Customer Group %s.","There was an error validating the VAT ID. The customer would belong to Customer Group %s." "This account is not confirmed.","This account is not confirmed." +"This email is sent on checkbox Email Link to Set Password is checked on the customer page in backend.","This email is sent on checkbox Email Link to Set Password is checked on the customer page in backend." +"This email with a link to set password is sent on new account creation in backend.","This email with a link to set password is sent on new account creation in backend." "This customer email already exists","This customer email already exists" "This customer has no saved addresses.","This customer has no saved addresses." "This email does not require confirmation.","This email does not require confirmation." @@ -451,6 +457,7 @@ "View Order","View Order" "Visitor","Visitor" "Visitors Only","Visitors Only" +"Warning: email containing password in plaintext will be sent.","Warning: email containing password in plaintext will be sent." "Website","Website" "Welcome Email","Welcome Email" "Wishlist","Wishlist" diff --git a/app/locale/en_US/template/email/account_new_password_link.html b/app/locale/en_US/template/email/account_new_password_link.html new file mode 100644 index 00000000000..2c92add9b19 --- /dev/null +++ b/app/locale/en_US/template/email/account_new_password_link.html @@ -0,0 +1,53 @@ + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + +
+

Welcome to {{var store.getFrontendName()}}.

+

We have created an account for you. Please set your password here:

+ + + + +
+ Set Password +
+

To log in when visiting our site just click Login or My Account at the top of every page, and then enter your email address and password.

+

+ Use the following values when prompted to log in:
+ Email: {{var customer.email}}
+ Password: (the password you set) +

+

When you log in to your account, you will be able to do the following:

+
    +
  • Proceed through checkout faster when making a purchase
    • +
  • Check the status of orders
    • +
  • View past orders
    • +
  • Make changes to your account information
    • +
  • Change your password
    • +
  • Store alternative addresses (for shipping to multiple family members and friends!)
    • +
+

+ If you have any questions, please feel free to contact us at + {{var store_email}} + {{depend store_phone}} or by phone at {{var store_phone}}{{/depend}}. +

+
+ +{{template config_path="design/email/footer"}} diff --git a/composer.json b/composer.json index 078f224d5cf..0adc13bc4b0 100644 --- a/composer.json +++ b/composer.json @@ -37,6 +37,8 @@ "symfony/polyfill-php82": "^1.29" }, "require-dev": { + "ext-xmlreader": "*", + "composer/composer": "^2.7", "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0", "friendsofphp/php-cs-fixer": "^3.4", "macopedia/phpstan-magento1": "^1.0.5", @@ -46,6 +48,7 @@ "phpmd/phpmd": "^2.13", "phpstan/phpstan": "^1.12.1", "phpunit/phpunit": "^9.5", + "rector/rector": "^1.2", "squizlabs/php_codesniffer": "^3.7", "symplify/vendor-patches": "^11.1" }, @@ -88,7 +91,7 @@ ], "autoload-dev": { "psr-4": { - "OpenMage\\Tests\\Unit\\": "dev/tests/unit" + "OpenMage\\Tests\\Unit\\": "tests/unit" } }, "extra": { @@ -126,5 +129,25 @@ "php": "7.4" }, "sort-packages": true + }, + "scripts": { + "php-cs-fixer:test": "vendor/bin/php-cs-fixer fix --dry-run --diff", + "php-cs-fixer:fix": "vendor/bin/php-cs-fixer fix", + "phpstan": "vendor/bin/phpstan analyze", + "phpunit:test": "XDEBUG_MODE=off php vendor/bin/phpunit --no-coverage --testdox", + "phpunit:coverage": "XDEBUG_MODE=coverage php vendor/bin/phpunit --testdox", + "phpunit:coverage-local": "XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-html build/coverage --testdox", + "rector:test": "vendor/bin/rector process --dry-run", + "rector:fix": "vendor/bin/rector process" + }, + "scripts-descriptions": { + "php-cs-fixer:test": "Run php-cs-fixer", + "php-cs-fixer:fix": "Run php-cs-fixer and fix issues", + "phpstan": "Run phpstan", + "phpunit:test": "Run PHPUnit", + "phpunit:coverage": "Run PHPUnit with code coverage", + "phpunit:coverage-local": "Run PHPUnit with local HTML code coverage", + "rector:test": "Run rector", + "rector:fix": "Run rector and fix issues" } } diff --git a/composer.lock b/composer.lock index 8d87065a11d..d19eb6225ee 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e1e458ca3048c0e7e7ac5e2b6041c47f", + "content-hash": "4145fa474cc19fcb7e54182748e81bdf", "packages": [ { "name": "colinmollenhour/cache-backend-redis", @@ -834,16 +834,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.41", + "version": "3.0.42", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb" + "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/621c73f7dcb310b61de34d1da4c4204e8ace6ceb", - "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db92f1b1987b12b13f248fe76c3a52cadb67bb98", + "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98", "shasum": "" }, "require": { @@ -924,7 +924,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.41" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.42" }, "funding": [ { @@ -940,7 +940,7 @@ "type": "tidelift" } ], - "time": "2024-08-12T00:13:54+00:00" + "time": "2024-09-16T03:06:04+00:00" }, { "name": "psr/container", @@ -1738,20 +1738,20 @@ }, { "name": "symfony/polyfill-php74", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php74.git", - "reference": "37f1d1a2fb3ebc494f9f9b0f7e92064b43332321" + "reference": "9589537d05325fb5d88a20d8926823e5b827a43e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php74/zipball/37f1d1a2fb3ebc494f9f9b0f7e92064b43332321", - "reference": "37f1d1a2fb3ebc494f9f9b0f7e92064b43332321", + "url": "https://api.github.com/repos/symfony/polyfill-php74/zipball/9589537d05325fb5d88a20d8926823e5b827a43e", + "reference": "9589537d05325fb5d88a20d8926823e5b827a43e", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -1795,7 +1795,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php74/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php74/tree/v1.31.0" }, "funding": [ { @@ -1811,24 +1811,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -1875,7 +1875,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -1891,24 +1891,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af" + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af", - "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -1951,7 +1951,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" }, "funding": [ { @@ -1967,24 +1967,24 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php82", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php82.git", - "reference": "77ff49780f56906788a88974867ed68bc49fae5b" + "reference": "5d2ed36f7734637dacc025f179698031951b1692" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/77ff49780f56906788a88974867ed68bc49fae5b", - "reference": "77ff49780f56906788a88974867ed68bc49fae5b", + "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/5d2ed36f7734637dacc025f179698031951b1692", + "reference": "5d2ed36f7734637dacc025f179698031951b1692", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -2027,7 +2027,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php82/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php82/tree/v1.31.0" }, "funding": [ { @@ -2043,7 +2043,7 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/service-contracts", @@ -2280,6 +2280,338 @@ ], "time": "2022-12-23T10:58:28+00:00" }, + { + "name": "composer/ca-bundle", + "version": "1.5.1", + "source": { + "type": "git", + "url": "https://github.com/composer/ca-bundle.git", + "reference": "063d9aa8696582f5a41dffbbaf3c81024f0a604a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/063d9aa8696582f5a41dffbbaf3c81024f0a604a", + "reference": "063d9aa8696582f5a41dffbbaf3c81024f0a604a", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "ext-pcre": "*", + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.10", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "symfony/phpunit-bridge": "^4.2 || ^5", + "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\CaBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", + "keywords": [ + "cabundle", + "cacert", + "certificate", + "ssl", + "tls" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/ca-bundle/issues", + "source": "https://github.com/composer/ca-bundle/tree/1.5.1" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-07-08T15:28:20+00:00" + }, + { + "name": "composer/class-map-generator", + "version": "1.3.4", + "source": { + "type": "git", + "url": "https://github.com/composer/class-map-generator.git", + "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", + "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", + "shasum": "" + }, + "require": { + "composer/pcre": "^2.1 || ^3.1", + "php": "^7.2 || ^8.0", + "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7" + }, + "require-dev": { + "phpstan/phpstan": "^1.6", + "phpstan/phpstan-deprecation-rules": "^1", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/filesystem": "^5.4 || ^6", + "symfony/phpunit-bridge": "^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\ClassMapGenerator\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Utilities to scan PHP code and generate class maps.", + "keywords": [ + "classmap" + ], + "support": { + "issues": "https://github.com/composer/class-map-generator/issues", + "source": "https://github.com/composer/class-map-generator/tree/1.3.4" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-06-12T14:13:04+00:00" + }, + { + "name": "composer/composer", + "version": "2.7.7", + "source": { + "type": "git", + "url": "https://github.com/composer/composer.git", + "reference": "291942978f39435cf904d33739f98d7d4eca7b23" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/composer/zipball/291942978f39435cf904d33739f98d7d4eca7b23", + "reference": "291942978f39435cf904d33739f98d7d4eca7b23", + "shasum": "" + }, + "require": { + "composer/ca-bundle": "^1.0", + "composer/class-map-generator": "^1.3.3", + "composer/metadata-minifier": "^1.0", + "composer/pcre": "^2.1 || ^3.1", + "composer/semver": "^3.3", + "composer/spdx-licenses": "^1.5.7", + "composer/xdebug-handler": "^2.0.2 || ^3.0.3", + "justinrainbow/json-schema": "^5.2.11", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "react/promise": "^2.8 || ^3", + "seld/jsonlint": "^1.4", + "seld/phar-utils": "^1.2", + "seld/signal-handler": "^2.0", + "symfony/console": "^5.4.11 || ^6.0.11 || ^7", + "symfony/filesystem": "^5.4 || ^6.0 || ^7", + "symfony/finder": "^5.4 || ^6.0 || ^7", + "symfony/polyfill-php73": "^1.24", + "symfony/polyfill-php80": "^1.24", + "symfony/polyfill-php81": "^1.24", + "symfony/process": "^5.4 || ^6.0 || ^7" + }, + "require-dev": { + "phpstan/phpstan": "^1.11.0", + "phpstan/phpstan-deprecation-rules": "^1.2.0", + "phpstan/phpstan-phpunit": "^1.4.0", + "phpstan/phpstan-strict-rules": "^1.6.0", + "phpstan/phpstan-symfony": "^1.4.0", + "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" + }, + "suggest": { + "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", + "ext-zip": "Enabling the zip extension allows you to unzip archives", + "ext-zlib": "Allow gzip compression of HTTP requests" + }, + "bin": [ + "bin/composer" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.7-dev" + }, + "phpstan": { + "includes": [ + "phpstan/rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Composer\\": "src/Composer/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "https://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.", + "homepage": "https://getcomposer.org/", + "keywords": [ + "autoload", + "dependency", + "package" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/composer/issues", + "security": "https://github.com/composer/composer/security/policy", + "source": "https://github.com/composer/composer/tree/2.7.7" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-06-10T20:11:12+00:00" + }, + { + "name": "composer/metadata-minifier", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/metadata-minifier.git", + "reference": "c549d23829536f0d0e984aaabbf02af91f443207" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/metadata-minifier/zipball/c549d23829536f0d0e984aaabbf02af91f443207", + "reference": "c549d23829536f0d0e984aaabbf02af91f443207", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "composer/composer": "^2", + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\MetadataMinifier\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Small utility library that handles metadata minification and expansion.", + "keywords": [ + "composer", + "compression" + ], + "support": { + "issues": "https://github.com/composer/metadata-minifier/issues", + "source": "https://github.com/composer/metadata-minifier/tree/1.0.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-04-07T13:37:33+00:00" + }, { "name": "composer/pcre", "version": "3.1.4", @@ -2432,6 +2764,86 @@ ], "time": "2024-07-12T11:35:52+00:00" }, + { + "name": "composer/spdx-licenses", + "version": "1.5.8", + "source": { + "type": "git", + "url": "https://github.com/composer/spdx-licenses.git", + "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a", + "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Spdx\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "SPDX licenses list and validation library.", + "keywords": [ + "license", + "spdx", + "validator" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/spdx-licenses/issues", + "source": "https://github.com/composer/spdx-licenses/tree/1.5.8" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2023-11-20T07:44:33+00:00" + }, { "name": "composer/xdebug-handler", "version": "3.0.5", @@ -3486,16 +3898,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.2", + "version": "1.12.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1" + "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0ca1c7bb55fca8fe6448f16fff0f311ccec960a1", - "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0fcbf194ab63d8159bb70d9aa3e1350051632009", + "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009", "shasum": "" }, "require": { @@ -3540,7 +3952,7 @@ "type": "github" } ], - "time": "2024-09-05T16:09:28+00:00" + "time": "2024-09-09T08:10:35+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4594,6 +5006,65 @@ ], "time": "2024-06-11T12:45:25+00:00" }, + { + "name": "rector/rector", + "version": "1.2.5", + "source": { + "type": "git", + "url": "https://github.com/rectorphp/rector.git", + "reference": "e98aa793ca3fcd17e893cfaf9103ac049775d339" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/e98aa793ca3fcd17e893cfaf9103ac049775d339", + "reference": "e98aa793ca3fcd17e893cfaf9103ac049775d339", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0", + "phpstan/phpstan": "^1.12.2" + }, + "conflict": { + "rector/rector-doctrine": "*", + "rector/rector-downgrade-php": "*", + "rector/rector-phpunit": "*", + "rector/rector-symfony": "*" + }, + "suggest": { + "ext-dom": "To manipulate phpunit.xml via the custom-rule command" + }, + "bin": [ + "bin/rector" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Instant Upgrade and Automated Refactoring of any PHP code", + "keywords": [ + "automation", + "dev", + "migration", + "refactoring" + ], + "support": { + "issues": "https://github.com/rectorphp/rector/issues", + "source": "https://github.com/rectorphp/rector/tree/1.2.5" + }, + "funding": [ + { + "url": "https://github.com/tomasvotruba", + "type": "github" + } + ], + "time": "2024-09-08T17:43:24+00:00" + }, { "name": "sebastian/cli-parser", "version": "1.0.2", @@ -5557,18 +6028,191 @@ ], "time": "2020-09-28T06:39:44+00:00" }, + { + "name": "seld/jsonlint", + "version": "1.11.0", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/jsonlint.git", + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/1748aaf847fc731cfad7725aec413ee46f0cc3a2", + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2", + "shasum": "" + }, + "require": { + "php": "^5.3 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13" + }, + "bin": [ + "bin/jsonlint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Seld\\JsonLint\\": "src/Seld/JsonLint/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "JSON Linter", + "keywords": [ + "json", + "linter", + "parser", + "validator" + ], + "support": { + "issues": "https://github.com/Seldaek/jsonlint/issues", + "source": "https://github.com/Seldaek/jsonlint/tree/1.11.0" + }, + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", + "type": "tidelift" + } + ], + "time": "2024-07-11T14:55:45+00:00" + }, + { + "name": "seld/phar-utils", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/phar-utils.git", + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Seld\\PharUtils\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "PHAR file format utilities, for when PHP phars you up", + "keywords": [ + "phar" + ], + "support": { + "issues": "https://github.com/Seldaek/phar-utils/issues", + "source": "https://github.com/Seldaek/phar-utils/tree/1.2.1" + }, + "time": "2022-08-31T10:31:18+00:00" + }, + { + "name": "seld/signal-handler", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/signal-handler.git", + "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/signal-handler/zipball/04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", + "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "require-dev": { + "phpstan/phpstan": "^1", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^7.5.20 || ^8.5.23", + "psr/log": "^1 || ^2 || ^3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Seld\\Signal\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Simple unix signal handler that silently fails where signals are not supported for easy cross-platform development", + "keywords": [ + "posix", + "sigint", + "signal", + "sigterm", + "unix" + ], + "support": { + "issues": "https://github.com/Seldaek/signal-handler/issues", + "source": "https://github.com/Seldaek/signal-handler/tree/2.0.2" + }, + "time": "2023-09-03T09:24:00+00:00" + }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.2", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", "shasum": "" }, "require": { @@ -5635,7 +6279,7 @@ "type": "open_collective" } ], - "time": "2024-07-21T23:26:44+00:00" + "time": "2024-09-18T10:38:58+00:00" }, { "name": "symfony/config", @@ -6408,7 +7052,9 @@ "ext-soap": "*", "ext-zlib": "*" }, - "platform-dev": [], + "platform-dev": { + "ext-xmlreader": "*" + }, "platform-overrides": { "php": "7.4" }, diff --git a/dev/gitpod/docker-compose.yml b/dev/gitpod/docker-compose.yml index 37b531a4485..d8f7bfbc456 100644 --- a/dev/gitpod/docker-compose.yml +++ b/dev/gitpod/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: apache: - image: openmage/php-dev:7.3-apache + image: openmage/php-dev:8.3-apache hostname: ${HOST_NAME:-openmage-7f000001.nip.io} user: "33333:33333" ports: @@ -17,7 +17,7 @@ services: - mysql cron: - image: openmage/php-dev:7.3-cli + image: openmage/php-dev:8.3-cli working_dir: /var/www/html command: /run-cron.sh user: www-data @@ -29,7 +29,7 @@ services: - mysql cli: - image: openmage/php-dev:7.3-apache + image: openmage/php-dev:8.3-apache working_dir: /var/www/html command: /bin/true user: "33333:33333" diff --git a/dev/phpunit.xml.dist b/dev/phpunit.xml.dist deleted file mode 100644 index b10c60d7938..00000000000 --- a/dev/phpunit.xml.dist +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - ./testfield/tests/Unit - - - ./testfield/tests/MagentoHackathon/Composer/FullStack - - - ./tests/unit - - - - - - ../app/code - ../lib - - - ../app/bootstrap.php - ../app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php - ../app/code/core/Mage/Admin/Model/Acl/Assert/Time.php - - - - - - - - - - diff --git a/dev/tests/bootstrap.php b/dev/tests/bootstrap.php deleted file mode 100644 index 83a24baba35..00000000000 --- a/dev/tests/bootstrap.php +++ /dev/null @@ -1,6 +0,0 @@ -assertTrue(class_exists('Mage')); - $this->assertTrue(class_exists('Mage_Eav_Model_Entity_Increment_Numeric')); - } - - public function testClassDoesNotExists() - { - $this->assertFalse(class_exists('Mage_Non_Existent')); - } -} diff --git a/dev/tests/unit/Base/XmlFileLoadingTest.php b/dev/tests/unit/Base/XmlFileLoadingTest.php deleted file mode 100644 index 0f8b6b50fd4..00000000000 --- a/dev/tests/unit/Base/XmlFileLoadingTest.php +++ /dev/null @@ -1,52 +0,0 @@ -assertNotEmpty($simplexml->asXML()); - } - - /** - * - * @dataProvider provideXmlFiles - * @param $filepath - * @return void - */ - public function testXmlReaderIsValid($filepath): void - { - $xml = \XMLReader::open($filepath); - $xml->setParserProperty(\XMLReader::VALIDATE, true); - $this->assertTrue($xml->isValid()); - } -} diff --git a/dev/tests/unit/Mage/Core/Helper/Security.php b/dev/tests/unit/Mage/Core/Helper/Security.php deleted file mode 100644 index f0b11f593e6..00000000000 --- a/dev/tests/unit/Mage/Core/Helper/Security.php +++ /dev/null @@ -1,97 +0,0 @@ -validateAgainstBlockMethodBlacklist($block, $method, $args); - } - - - public function forbiddenBlockMethodsDataProvider() - { - $topmenu = new \Mage_Page_Block_Html_Topmenu_Renderer(); - $template = new \Mage_Core_Block_Template(); - - return [ - [ - $template, - 'fetchView', - [] - ], - [ - $topmenu, - 'fetchView', - [] - ], - [ - $topmenu, - 'render', - [] - ], - [ - $template, - 'Mage_Core_Block_Template::fetchView', - [] - ], - [ - $topmenu, - 'Mage_Page_Block_Html_Topmenu_Renderer::fetchView', - [] - ], - 'parent class name is passed as second arg' => [ - $topmenu, - 'Mage_Core_Block_Template::fetchView', - [] - ], - 'parent class name is passed as second arg2' => [ - $topmenu, - 'Mage_Core_Block_Template::render', - [] - ], - ]; - } - - /** - * @dataProvider forbiddenBlockMethodsDataProvider - * @return void - */ - public function testValidateAgainstBlockMethodBlacklistThrowsException($block, $method, $args) - { - $this->expectExceptionMessage(\sprintf('Action with combination block %s and method %s is forbidden.', get_class($block), $method)); - - $securityHelper = new \Mage_Core_Helper_Security(); - $securityHelper->validateAgainstBlockMethodBlacklist($block, $method, $args); - } -} \ No newline at end of file diff --git a/dev/tests/unit/Mage/Core/Helper/StringTest.php b/dev/tests/unit/Mage/Core/Helper/StringTest.php deleted file mode 100644 index 72148df7079..00000000000 --- a/dev/tests/unit/Mage/Core/Helper/StringTest.php +++ /dev/null @@ -1,50 +0,0 @@ -substr( - self::TEST_STRING_1, - 5, - 5 - ); - $this->assertEquals( - '12345', - $resultString - ); - } - - public function testTruncate() - { - $subject = new Mage_Core_Helper_String(); - $resultString = $subject->truncate( - self::TEST_STRING_1, - 13, - '###' - ); - $this->assertEquals( - 'Test 12345###', - $resultString - ); - - } - - public function testStrlen() - { - $subject = new Mage_Core_Helper_String(); - $this->assertEquals( - 26, - $subject->strlen(self::TEST_STRING_1) - ); - } -} diff --git a/errors/default/page.phtml b/errors/default/page.phtml index 2c70dd98cc0..19d2ebecc98 100644 --- a/errors/default/page.phtml +++ b/errors/default/page.phtml @@ -9,7 +9,7 @@ * @category Mage * @package Errors * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/errors/processor.php b/errors/processor.php index 33f0267fec5..1c561d45375 100644 --- a/errors/processor.php +++ b/errors/processor.php @@ -9,7 +9,7 @@ * @category Mage * @package Errors * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -310,7 +310,6 @@ protected function _renderPage($template) /** * Find file path * - * @param string $file * @param array|null $directories * @return string|null */ @@ -336,7 +335,6 @@ protected function _getFilePath(string $file, $directories = null) /** * Find template path * - * @param string $template * @return string|null */ protected function _getTemplatePath(string $template) diff --git a/errors/report.php b/errors/report.php index 5c6ca28695d..40c6e4a4ce3 100644 --- a/errors/report.php +++ b/errors/report.php @@ -9,7 +9,7 @@ * @category Mage * @package Errors * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/get.php b/get.php index 9284ce28e7f..0c2de90771f 100644 --- a/get.php +++ b/get.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/js/mage/adminhtml/events.js b/js/mage/adminhtml/events.js index e7539e4e42c..6edd2744e0e 100644 --- a/js/mage/adminhtml/events.js +++ b/js/mage/adminhtml/events.js @@ -8,7 +8,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ varienEvents = Class.create(); diff --git a/js/mage/adminhtml/form.js b/js/mage/adminhtml/form.js index 73e98499af0..2225556db9d 100644 --- a/js/mage/adminhtml/form.js +++ b/js/mage/adminhtml/form.js @@ -8,7 +8,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var varienForm = new Class.create(); diff --git a/js/mage/adminhtml/grid.js b/js/mage/adminhtml/grid.js index 55eb3b2ef05..1ca6ce3961f 100644 --- a/js/mage/adminhtml/grid.js +++ b/js/mage/adminhtml/grid.js @@ -8,7 +8,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var varienGrid = new Class.create(); diff --git a/js/mage/adminhtml/product.js b/js/mage/adminhtml/product.js index 86f0de7ad52..9247843e63d 100644 --- a/js/mage/adminhtml/product.js +++ b/js/mage/adminhtml/product.js @@ -8,7 +8,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/sales.js b/js/mage/adminhtml/sales.js index 1769c599c55..7e9facb8308 100644 --- a/js/mage/adminhtml/sales.js +++ b/js/mage/adminhtml/sales.js @@ -8,7 +8,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ var AdminOrder = new Class.create(); diff --git a/js/mage/adminhtml/tools.js b/js/mage/adminhtml/tools.js index 00d9583d228..c91e6f89d93 100644 --- a/js/mage/adminhtml/tools.js +++ b/js/mage/adminhtml/tools.js @@ -8,7 +8,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ function setLocation(url){ diff --git a/js/mage/adminhtml/variables.js b/js/mage/adminhtml/variables.js index 6eca7cddfe9..04a0eeaec51 100644 --- a/js/mage/adminhtml/variables.js +++ b/js/mage/adminhtml/variables.js @@ -8,7 +8,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/wysiwyg/tinymce/plugins/openmagevariable.js b/js/mage/adminhtml/wysiwyg/tinymce/plugins/openmagevariable.js index abc19bc4efd..c3a945f148c 100644 --- a/js/mage/adminhtml/wysiwyg/tinymce/plugins/openmagevariable.js +++ b/js/mage/adminhtml/wysiwyg/tinymce/plugins/openmagevariable.js @@ -8,7 +8,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/wysiwyg/tinymce/plugins/openmagewidget.js b/js/mage/adminhtml/wysiwyg/tinymce/plugins/openmagewidget.js index 5b654d81c77..940b8c06430 100644 --- a/js/mage/adminhtml/wysiwyg/tinymce/plugins/openmagewidget.js +++ b/js/mage/adminhtml/wysiwyg/tinymce/plugins/openmagewidget.js @@ -8,7 +8,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/wysiwyg/tinymce/setup.js b/js/mage/adminhtml/wysiwyg/tinymce/setup.js index 91089a91185..2b91dd2638e 100644 --- a/js/mage/adminhtml/wysiwyg/tinymce/setup.js +++ b/js/mage/adminhtml/wysiwyg/tinymce/setup.js @@ -8,7 +8,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2023-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/mage/adminhtml/wysiwyg/widget.js b/js/mage/adminhtml/wysiwyg/widget.js index 4dd48692be8..c1866a2d470 100644 --- a/js/mage/adminhtml/wysiwyg/widget.js +++ b/js/mage/adminhtml/wysiwyg/widget.js @@ -8,7 +8,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/js/varien/js.js b/js/varien/js.js index a59c62b0a94..e2999f2e4ae 100644 --- a/js/varien/js.js +++ b/js/varien/js.js @@ -8,7 +8,7 @@ * @category Varien * @package js * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ function popWin(url,win,para) { diff --git a/lib/3Dsecure/CentinelClient.php b/lib/3Dsecure/CentinelClient.php index d3f2a7a3569..ec9a74be295 100644 --- a/lib/3Dsecure/CentinelClient.php +++ b/lib/3Dsecure/CentinelClient.php @@ -114,7 +114,7 @@ function sendHttp($url, $connectTimeout, $timeout) } - // Assert that we received an expected Centinel Message in reponse. + // Assert that we received an expected Centinel Message in response. if (strpos($result, "") === false) { $result = $this->setErrorResponse(CENTINEL_ERROR_CODE_8010, CENTINEL_ERROR_CODE_8010_DESC); diff --git a/lib/Mage/Archive/Helper/File.php b/lib/Mage/Archive/Helper/File.php index 88a772d532f..da0744248a7 100644 --- a/lib/Mage/Archive/Helper/File.php +++ b/lib/Mage/Archive/Helper/File.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Archive * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Mage/Archive/Tar.php b/lib/Mage/Archive/Tar.php index 443d0746d87..8f6b7510af8 100644 --- a/lib/Mage/Archive/Tar.php +++ b/lib/Mage/Archive/Tar.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Archive * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -399,7 +399,7 @@ protected function _composeHeader($long = false) /** * Read TAR string from file, and unpacked it. - * Create files and directories information about discribed + * Create files and directories information about described * in the string. * * @param string $destination path to file is unpacked diff --git a/lib/Mage/Cache/Backend/File.php b/lib/Mage/Cache/Backend/File.php index b021e9b8630..c9bb6881f8c 100644 --- a/lib/Mage/Cache/Backend/File.php +++ b/lib/Mage/Cache/Backend/File.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Cache * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -73,9 +73,6 @@ class Mage_Cache_Backend_File extends Zend_Cache_Backend_File */ protected $_isTagDirChecked; - /** - * @param array $options - */ public function __construct(array $options = []) { // Backwards compatibility ZF 1.11 and ZF 1.12 diff --git a/lib/Mage/DB/Mysqli.php b/lib/Mage/DB/Mysqli.php index f987ddaf3f1..a947c3f7122 100644 --- a/lib/Mage/DB/Mysqli.php +++ b/lib/Mage/DB/Mysqli.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_DB * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -265,7 +265,6 @@ public function listByKeyGrouped($table, $key = 'id', $forcedArrayMode = false) /** * Escape field names - * @param array $arrNames * @return array */ public function escapeFieldNames(array $arrNames) @@ -279,7 +278,6 @@ public function escapeFieldNames(array $arrNames) /** * Escape field values - * @param array $arrNames * @return array */ public function escapeFieldValues(array $arrNames) @@ -333,7 +331,6 @@ public function unsafeQuery($sql) /** * Insert assoc array to table * @param string $table - * @param array $data * @param bool $replace * @return mixed */ @@ -352,7 +349,6 @@ public function insertAssocOne($table, array $data, $replace = false) /** * Insert several records to table * @param string $table - * @param array $data * @param bool $replace use REPLACE INTO instead of INSERT INTO * @return array */ @@ -424,7 +420,6 @@ public function updateAssoc($table, array $data, $condition = '1=1') /** * Update entry by pk * @param string $table - * @param array $data * @param string $value * @param string $key * @return mixed diff --git a/lib/Mage/HTTP/Client.php b/lib/Mage/HTTP/Client.php index b9a3f397be0..fd2a2352c42 100644 --- a/lib/Mage/HTTP/Client.php +++ b/lib/Mage/HTTP/Client.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_HTTP * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Mage/HTTP/Client/Curl.php b/lib/Mage/HTTP/Client/Curl.php index 57edac17b35..f8387a44c6a 100644 --- a/lib/Mage/HTTP/Client/Curl.php +++ b/lib/Mage/HTTP/Client/Curl.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_HTTP * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -89,7 +89,7 @@ class Mage_HTTP_Client_Curl implements Mage_HTTP_IClient /** * Curl - * @var object + * @var false|resource */ protected $_ch; @@ -381,7 +381,7 @@ protected function makeRequest($method, $uri, $params = []) } /** - * Throw error excpetion + * Throw error exception * @param $string * @throws Exception * @return never @@ -392,12 +392,10 @@ public function doError($string) } /** - * Parse headers - CURL callback functin + * Parse headers - CURL callback function * * @param resource $ch curl handle, not needed * @param string $data - * - * @return int */ protected function parseHeaders($ch, $data): int { @@ -431,8 +429,6 @@ protected function parseHeaders($ch, $data): int } /** - * @param array $line - * * @throws Exception */ protected function validateHttpVersion(array $line) diff --git a/lib/Mage/HTTP/Client/Socket.php b/lib/Mage/HTTP/Client/Socket.php index e0cd7ef6977..46eeea4ca8a 100644 --- a/lib/Mage/HTTP/Client/Socket.php +++ b/lib/Mage/HTTP/Client/Socket.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_HTTP * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -468,7 +468,7 @@ protected function makeRequest($method, $uri, $params = []) } /** - * Throw error excpetion + * Throw error exception * @param $string * @throws Exception * @return never diff --git a/lib/Mage/System/Ftp.php b/lib/Mage/System/Ftp.php index 99a2c61bbfd..f017febd40f 100644 --- a/lib/Mage/System/Ftp.php +++ b/lib/Mage/System/Ftp.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_System * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -227,7 +227,7 @@ public function raw($cmd) /** * Upload local file to remote * - * Can be used for relative and absoulte remote paths + * Can be used for relative and absolute remote paths * Relative: use chdir before calling this * * @param string $remote diff --git a/lib/Magento/Db/Adapter/Pdo/Mysql.php b/lib/Magento/Db/Adapter/Pdo/Mysql.php index 0fb50b08383..f260bc7a093 100644 --- a/lib/Magento/Db/Adapter/Pdo/Mysql.php +++ b/lib/Magento/Db/Adapter/Pdo/Mysql.php @@ -9,7 +9,7 @@ * @category Magento * @package Magento_Db * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,9 +34,7 @@ public function isTransaction() /** * Batched insert of specified select * - * @param Varien_Db_Select $select * @param string $table - * @param array $fields * @param bool $mode * @param int $step * @return int @@ -66,9 +64,8 @@ public function insertBatchFromSelect( } /** - * Retrieve bunch of queries for specified select splitted by specified step + * Retrieve bunch of queries for specified select split by specified step * - * @param Varien_Db_Select $select * @param string $entityIdField * @param int $step * @return array diff --git a/lib/Magento/Db/Object.php b/lib/Magento/Db/Object.php index 6e6ae4f21a0..3d2aa2fd132 100644 --- a/lib/Magento/Db/Object.php +++ b/lib/Magento/Db/Object.php @@ -9,7 +9,7 @@ * @category Magento * @package Magento_Db * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,7 +44,6 @@ abstract class Magento_Db_Object /** * Constructor * @param $objectName - * @param Varien_Db_Adapter_Interface $adapter * @param $schemaName */ public function __construct(Varien_Db_Adapter_Interface $adapter, $objectName, $schemaName = null) diff --git a/lib/Magento/Db/Sql/Trigger.php b/lib/Magento/Db/Sql/Trigger.php index 5ca9af0fbdf..d53f8de5d43 100644 --- a/lib/Magento/Db/Sql/Trigger.php +++ b/lib/Magento/Db/Sql/Trigger.php @@ -9,7 +9,7 @@ * @category Magento * @package Magento_Db * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Magento/Profiler.php b/lib/Magento/Profiler.php index b3e6bcef1e8..a875de0ba77 100644 --- a/lib/Magento/Profiler.php +++ b/lib/Magento/Profiler.php @@ -9,7 +9,7 @@ * @category Magento * @package Magento_Profiler * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -253,8 +253,6 @@ public static function getTimers() /** * Register profiler output instance to display profiling result at the end of execution - * - * @param Magento_Profiler_OutputAbstract $output */ public static function registerOutput(Magento_Profiler_OutputAbstract $output) { diff --git a/lib/Magento/Profiler/Output/Firebug.php b/lib/Magento/Profiler/Output/Firebug.php index a7a7912c9a0..a75066ca9a9 100644 --- a/lib/Magento/Profiler/Output/Firebug.php +++ b/lib/Magento/Profiler/Output/Firebug.php @@ -9,7 +9,7 @@ * @category Magento * @package Magento_Profiler * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,8 +41,6 @@ public function __construct($filter = null) /** * Request setter - * - * @param Zend_Controller_Request_Abstract $request */ public function setRequest(Zend_Controller_Request_Abstract $request) { @@ -51,8 +49,6 @@ public function setRequest(Zend_Controller_Request_Abstract $request) /** * Response setter - * - * @param Zend_Controller_Response_Abstract $response */ public function setResponse(Zend_Controller_Response_Abstract $response) { diff --git a/lib/Unserialize/Reader/Str.php b/lib/Unserialize/Reader/Str.php index 58b6328313f..171868c2c8e 100644 --- a/lib/Unserialize/Reader/Str.php +++ b/lib/Unserialize/Reader/Str.php @@ -9,7 +9,7 @@ * @category Unserialize * @package Unserialize_Reader * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Cache/Backend/Database.php b/lib/Varien/Cache/Backend/Database.php index d5e5eb482d4..16047498abf 100644 --- a/lib/Varien/Cache/Backend/Database.php +++ b/lib/Varien/Cache/Backend/Database.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Cache * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -123,7 +123,7 @@ protected function _getTagsTable() * * @param string $id Cache id * @param boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested - * @return string|false cached datas + * @return string|false cached data */ public function load($id, $doNotTestCacheValidity = false) { diff --git a/lib/Varien/Cache/Backend/Memcached.php b/lib/Varien/Cache/Backend/Memcached.php index b67c7c4c0f8..db1f02db4ed 100644 --- a/lib/Varien/Cache/Backend/Memcached.php +++ b/lib/Varien/Cache/Backend/Memcached.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Cache * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -108,7 +108,7 @@ public function save($data, $id, $tags = [], $specificLifetime = false) } /** - * Load data from memcached, glue from several chunks if it was splitted upon save. + * Load data from memcached, glue from several chunks if it was split upon save. * * @param string $id @see Zend_Cache_Backend_Memcached::load() * @param bool $doNotTestCacheValidity @see Zend_Cache_Backend_Memcached::load() @@ -144,7 +144,7 @@ public function load($id, $doNotTestCacheValidity = false) } } - // Data has not been splitted to chunks on save + // Data has not been split to chunks on save return $data; } } diff --git a/lib/Varien/Cache/Core.php b/lib/Varien/Cache/Core.php index f61973ad7c8..b716952f3b4 100644 --- a/lib/Varien/Cache/Core.php +++ b/lib/Varien/Cache/Core.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Cache * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -134,12 +134,12 @@ public function save($data, $id = null, $tags = [], $specificLifetime = false, $ } /** - * Load data from cached, glue from several chunks if it was splitted upon save. + * Load data from cached, glue from several chunks if it was split upon save. * * @param string $id Cache id * @param boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested * @param boolean $doNotUnserialize Do not serialize (even if automatic_serialization is true) => for internal use - * @return mixed|false Cached datas + * @return mixed|false Cached data */ public function load($id, $doNotTestCacheValidity = false, $doNotUnserialize = false) { @@ -171,7 +171,7 @@ public function load($id, $doNotTestCacheValidity = false, $doNotUnserialize = f } } - // Data has not been splitted to chunks on save + // Data has not been split to chunks on save return $data; } diff --git a/lib/Varien/Convert/Action/Abstract.php b/lib/Varien/Convert/Action/Abstract.php index 06a85503b9a..826141db99b 100644 --- a/lib/Varien/Convert/Action/Abstract.php +++ b/lib/Varien/Convert/Action/Abstract.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Convert * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -113,7 +113,6 @@ public function getProfile() /** * Set profile instance the action belongs to * - * @param Varien_Convert_Profile_Abstract $profile * @return Varien_Convert_Action_Abstract */ public function setProfile(Varien_Convert_Profile_Abstract $profile) diff --git a/lib/Varien/Convert/Container/Abstract.php b/lib/Varien/Convert/Container/Abstract.php index 38dbea0e989..ce476054751 100644 --- a/lib/Varien/Convert/Container/Abstract.php +++ b/lib/Varien/Convert/Container/Abstract.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Convert * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Convert/Parser/Csv.php b/lib/Varien/Convert/Parser/Csv.php index 4550d155691..1e65a4aa732 100644 --- a/lib/Varien/Convert/Parser/Csv.php +++ b/lib/Varien/Convert/Parser/Csv.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Convert * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Convert/Parser/Xml/Excel.php b/lib/Varien/Convert/Parser/Xml/Excel.php index 0f1399c2ccd..5fa94863736 100644 --- a/lib/Varien/Convert/Parser/Xml/Excel.php +++ b/lib/Varien/Convert/Parser/Xml/Excel.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Convert * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -180,7 +180,6 @@ public function getFooterXml() /** * Convert an array to Excel 2003 XML Document a Row XML fragment * - * @param array $row * @return string */ public function getRowXml(array $row) diff --git a/lib/Varien/Convert/Profile/Abstract.php b/lib/Varien/Convert/Profile/Abstract.php index c7554d6e80e..0371d09d250 100644 --- a/lib/Varien/Convert/Profile/Abstract.php +++ b/lib/Varien/Convert/Profile/Abstract.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Convert * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Convert/Profile/Collection.php b/lib/Varien/Convert/Profile/Collection.php index 54134b076b1..119358e0df5 100644 --- a/lib/Varien/Convert/Profile/Collection.php +++ b/lib/Varien/Convert/Profile/Collection.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Convert * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Crypt/Mcrypt.php b/lib/Varien/Crypt/Mcrypt.php index dac7fdf6acd..d4d5e3d657d 100644 --- a/lib/Varien/Crypt/Mcrypt.php +++ b/lib/Varien/Crypt/Mcrypt.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Crypt * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,9 +22,7 @@ class Varien_Crypt_Mcrypt extends Varien_Crypt_Abstract { /** - * Constuctor - * - * @param array $data + * Constructor */ public function __construct(array $data = []) { diff --git a/lib/Varien/Data/Collection.php b/lib/Varien/Data/Collection.php index 5795841aef8..696f51fc31e 100644 --- a/lib/Varien/Data/Collection.php +++ b/lib/Varien/Data/Collection.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -346,7 +346,6 @@ public function getItemByColumnValue($column, $value) /** * Adding item to item array * - * @param Varien_Object $item * @return $this */ public function addItem(Varien_Object $item) @@ -379,7 +378,6 @@ protected function _addItem($item) /** * Retrieve item id * - * @param Varien_Object $item * @return mixed */ protected function _getItemId(Varien_Object $item) @@ -434,7 +432,6 @@ public function clear() * Returns array with results of callback for each item * * @param string|callable $callback - * @param array $args * @return array */ public function walk($callback, array $args = []) diff --git a/lib/Varien/Data/Collection/Db.php b/lib/Varien/Data/Collection/Db.php index a78999460fc..288a0ce87cd 100644 --- a/lib/Varien/Data/Collection/Db.php +++ b/lib/Varien/Data/Collection/Db.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,7 +67,7 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection protected $_data = null; /** - * Fields map for corellation names & real selected fields + * Fields map for correlation names & real selected fields * * @var array|null */ @@ -151,7 +151,6 @@ public function getIdFieldName() /** * Get collection item identifier * - * @param Varien_Object $item * @return mixed */ protected function _getItemId(Varien_Object $item) @@ -399,6 +398,8 @@ protected function _renderFilters() /** * Hook for operations before rendering filters + * + * @return void */ protected function _renderFiltersBefore() { @@ -694,7 +695,7 @@ public function getData() } /** - * Proces loaded collection data + * Process loaded collection data * * @return $this */ diff --git a/lib/Varien/Data/Collection/Filesystem.php b/lib/Varien/Data/Collection/Filesystem.php index c79eda8a822..6ce620072f8 100644 --- a/lib/Varien/Data/Collection/Filesystem.php +++ b/lib/Varien/Data/Collection/Filesystem.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -252,7 +252,7 @@ protected function _collectRecursive($dir) } /** - * Lauch data collecting + * Launch data collecting * * @param bool $printQuery * @param bool $logQuery diff --git a/lib/Varien/Data/Form.php b/lib/Varien/Data/Form.php index 00c2c341cff..0892331c4c1 100644 --- a/lib/Varien/Data/Form.php +++ b/lib/Varien/Data/Form.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,25 +55,16 @@ public function __construct($attributes = []) $this->_allElements = new Varien_Data_Form_Element_Collection($this); } - /** - * @param Varien_Data_Form_Element_Renderer_Interface $renderer - */ public static function setElementRenderer(Varien_Data_Form_Element_Renderer_Interface $renderer) { self::$_defaultElementRenderer = $renderer; } - /** - * @param Varien_Data_Form_Element_Renderer_Interface $renderer - */ public static function setFieldsetRenderer(Varien_Data_Form_Element_Renderer_Interface $renderer) { self::$_defaultFieldsetRenderer = $renderer; } - /** - * @param Varien_Data_Form_Element_Renderer_Interface $renderer - */ public static function setFieldsetElementRenderer(Varien_Data_Form_Element_Renderer_Interface $renderer) { self::$_defaultFieldsetElementRenderer = $renderer; @@ -115,7 +106,6 @@ public function getHtmlAttributes() /** * Add form element * - * @param Varien_Data_Form_Element_Abstract $element * @param string|false $after * @return Varien_Data_Form * @throws Exception diff --git a/lib/Varien/Data/Form/Abstract.php b/lib/Varien/Data/Form/Abstract.php index 8817b08e9d4..047583345a5 100644 --- a/lib/Varien/Data/Form/Abstract.php +++ b/lib/Varien/Data/Form/Abstract.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -100,9 +100,7 @@ public function setReadonly($readonly, $useDisabled = false) /** * Add form element * - * @param Varien_Data_Form_Element_Abstract $element * @param bool|string|null $after - * * @return $this */ public function addElement(Varien_Data_Form_Element_Abstract $element, $after = null) @@ -184,7 +182,6 @@ public function addColumn($elementId, $config) } /** - * @param array $arrAttributes * @return array */ public function __toArray(array $arrAttributes = []) diff --git a/lib/Varien/Data/Form/Element/Abstract.php b/lib/Varien/Data/Form/Element/Abstract.php index 051d763b7b2..5e3f68ebfe7 100644 --- a/lib/Varien/Data/Form/Element/Abstract.php +++ b/lib/Varien/Data/Form/Element/Abstract.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -61,7 +61,6 @@ public function __construct($attributes = []) /** * Add form element * - * @param Varien_Data_Form_Element_Abstract $element * @param string|false $after * @return $this */ @@ -220,7 +219,6 @@ public function getEscapedValue($index = null) } /** - * @param Varien_Data_Form_Element_Renderer_Interface $renderer * @return $this */ public function setRenderer(Varien_Data_Form_Element_Renderer_Interface $renderer) diff --git a/lib/Varien/Data/Form/Element/Collection.php b/lib/Varien/Data/Form/Element/Collection.php index a0c1a3c4afa..44c33ddc11d 100644 --- a/lib/Varien/Data/Form/Element/Collection.php +++ b/lib/Varien/Data/Form/Element/Collection.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -93,7 +93,6 @@ public function offsetUnset($key): void * Implementation of ArrayAccess:offsetExists() * * @param mixed $key - * @return bool */ public function offsetExists($key): bool { @@ -104,9 +103,7 @@ public function offsetExists($key): bool * Add element to collection * * @todo get it straight with $after - * @param Varien_Data_Form_Element_Abstract $element * @param bool|string $after - * * @return Varien_Data_Form_Element_Abstract */ public function add(Varien_Data_Form_Element_Abstract $element, $after = false) @@ -170,8 +167,6 @@ public function remove($elementId) /** * Count elements in collection - * - * @return int */ public function count(): int { diff --git a/lib/Varien/Data/Form/Element/Editor.php b/lib/Varien/Data/Form/Element/Editor.php index 3656de319fc..126b7f3ca1b 100644 --- a/lib/Varien/Data/Form/Element/Editor.php +++ b/lib/Varien/Data/Form/Element/Editor.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Data/Form/Element/Renderer/Interface.php b/lib/Varien/Data/Form/Element/Renderer/Interface.php index f517c74452e..a77bdc72551 100644 --- a/lib/Varien/Data/Form/Element/Renderer/Interface.php +++ b/lib/Varien/Data/Form/Element/Renderer/Interface.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +22,6 @@ interface Varien_Data_Form_Element_Renderer_Interface { /** - * @param Varien_Data_Form_Element_Abstract $element * @return mixed */ public function render(Varien_Data_Form_Element_Abstract $element); diff --git a/lib/Varien/Data/Form/Element/Textarea.php b/lib/Varien/Data/Form/Element/Textarea.php index 98f4ec32e48..e8a37284a92 100644 --- a/lib/Varien/Data/Form/Element/Textarea.php +++ b/lib/Varien/Data/Form/Element/Textarea.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Data/Form/Filter/Date.php b/lib/Varien/Data/Form/Filter/Date.php index 68a76135b30..a20ce096458 100644 --- a/lib/Varien/Data/Form/Filter/Date.php +++ b/lib/Varien/Data/Form/Filter/Date.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Data/Form/Filter/Datetime.php b/lib/Varien/Data/Form/Filter/Datetime.php index a27c0c1fe26..b7400e46b35 100644 --- a/lib/Varien/Data/Form/Filter/Datetime.php +++ b/lib/Varien/Data/Form/Filter/Datetime.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Data/Tree/Db.php b/lib/Varien/Data/Tree/Db.php index fa4763a9547..28e7a5b02ff 100644 --- a/lib/Varien/Data/Tree/Db.php +++ b/lib/Varien/Data/Tree/Db.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -79,7 +79,7 @@ public function __construct($connection, $table, $fields) parent::__construct(); if (!$connection) { - throw new Exception('Wrong "$connection" parametr'); + throw new Exception('Wrong "$connection" parameter'); } $this->_conn = $connection; diff --git a/lib/Varien/Data/Tree/Dbp.php b/lib/Varien/Data/Tree/Dbp.php index b86f7c5fc3e..1fa289fb9d9 100644 --- a/lib/Varien/Data/Tree/Dbp.php +++ b/lib/Varien/Data/Tree/Dbp.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +81,7 @@ public function __construct($connection, $table, $fields) parent::__construct(); if (!$connection) { - throw new Exception('Wrong "$connection" parametr'); + throw new Exception('Wrong "$connection" parameter'); } $this->_conn = $connection; @@ -92,7 +92,7 @@ public function __construct($connection, $table, $fields) || !isset($fields[self::LEVEL_FIELD]) || !isset($fields[self::ORDER_FIELD]) ) { - throw new Exception('"$fields" tree configuratin array'); + throw new Exception('"$fields" tree configuration array'); } $this->_idField = $fields[self::ID_FIELD]; diff --git a/lib/Varien/Data/Tree/Node.php b/lib/Varien/Data/Tree/Node.php index 9fa2245b0c8..ea2dac7a23b 100644 --- a/lib/Varien/Data/Tree/Node.php +++ b/lib/Varien/Data/Tree/Node.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -110,7 +110,6 @@ public function getIdField() /** * Set node tree object * - * @param Varien_Data_Tree $tree * @return $this */ public function setTree(Varien_Data_Tree $tree) diff --git a/lib/Varien/Data/Tree/Node/Collection.php b/lib/Varien/Data/Tree/Node/Collection.php index e11ea16df0b..2688ed713fc 100644 --- a/lib/Varien/Data/Tree/Node/Collection.php +++ b/lib/Varien/Data/Tree/Node/Collection.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Data * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -90,7 +90,6 @@ public function offsetUnset($key): void /** * Implementation of ArrayAccess:offsetExists() * @param string $key - * @return bool */ public function offsetExists($key): bool { @@ -99,7 +98,6 @@ public function offsetExists($key): bool /** * Adds a node to this node - * @param Varien_Data_Tree_Node $node * @return Varien_Data_Tree_Node */ public function add(Varien_Data_Tree_Node $node) @@ -131,8 +129,6 @@ public function delete($node) /** * Implementation of Countable:count() - * - * @return int */ public function count(): int { diff --git a/lib/Varien/Db/Adapter/Interface.php b/lib/Varien/Db/Adapter/Interface.php index 2e62614f4d5..5bf27b79714 100644 --- a/lib/Varien/Db/Adapter/Interface.php +++ b/lib/Varien/Db/Adapter/Interface.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Db * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -83,7 +83,6 @@ public function newTable($tableName = null, $schemaName = null); /** * Create table from DDL object * - * @param Varien_Db_Ddl_Table $table * @throws Zend_Db_Exception * @return Zend_Db_Statement_Interface */ @@ -92,7 +91,6 @@ public function createTable(Varien_Db_Ddl_Table $table); /** * Create temporary table from DDL object * - * @param Varien_Db_Ddl_Table $table * @throws Zend_Db_Exception * @return Zend_Db_Statement_Interface */ @@ -423,7 +421,6 @@ public function insertMultiple($table, array $data); * * @param string $table * @param array $columns the data array column map - * @param array $data * @return int */ public function insertArray($table, array $columns, array $data); @@ -442,7 +439,6 @@ public function insert($table, array $bind); * Special for Zero values to identity column * * @param string $table - * @param array $bind * @return int The number of affected rows. */ public function insertForce($table, array $bind); @@ -598,7 +594,7 @@ public function quoteInto($text, $value, $type = null, $count = null); /** * Quotes an identifier. * - * Accepts a string representing a qualified indentifier. For Example: + * Accepts a string representing a qualified identifier. For Example: * * $adapter->quoteIdentifier('myschema.mytable') * @@ -791,7 +787,6 @@ public function getIfNullSql($expression, $value = '0'); * Generate fragment of SQL, that combine together (concatenate) the results from data array * All arguments in data must be quoted * - * @param array $data * @param string $separator concatenate with separator * @return Zend_Db_Expr */ @@ -817,7 +812,6 @@ public function getLengthSql($string); * (minimum-valued) argument * All arguments in data must be quoted * - * @param array $data * @return Zend_Db_Expr */ public function getLeastSql(array $data); @@ -827,7 +821,6 @@ public function getLeastSql(array $data); * (maximum-valued) argument * All arguments in data must be quoted * - * @param array $data * @return Zend_Db_Expr */ public function getGreatestSql(array $data); @@ -964,9 +957,7 @@ public function enableTableKeys($tableName, $schemaName = null); /** * Get insert from Select object query * - * @param Varien_Db_Select $select * @param string $table insert into table - * @param array $fields * @param bool|int $mode * @return string */ @@ -976,7 +967,6 @@ public function insertFromSelect(Varien_Db_Select $select, $table, array $fields * Get insert queries in array for insert by range with step parameter * * @param string $rangeField - * @param Varien_Db_Select $select * @param int $stepCount * @return array */ @@ -985,7 +975,6 @@ public function selectsByRange($rangeField, Varien_Db_Select $select, $stepCount /** * Get update table query using select object for join and update * - * @param Varien_Db_Select $select * @param string|array $table * @return string */ @@ -994,7 +983,6 @@ public function updateFromSelect(Varien_Db_Select $select, $table); /** * Get delete from select object query * - * @param Varien_Db_Select $select * @param string $table the table name or alias used in select * @return string|int */ @@ -1020,7 +1008,6 @@ public function supportStraightJoin(); * Adds order by random to select object * Possible using integer field for optimization * - * @param Varien_Db_Select $select * @param string $field * @return Varien_Db_Adapter_Interface */ @@ -1035,7 +1022,7 @@ public function orderRand(Varien_Db_Select $select, $field = null); public function forUpdate($sql); /** - * Try to find installed primary key name, if not - formate new one. + * Try to find installed primary key name, if not - format new one. * * @param string $tableName Table name * @param string $schemaName OPTIONAL @@ -1109,7 +1096,6 @@ public function changeTableAutoIncrement($tableName, $increment, $schemaName = n * Create new table from provided select statement * * @param string $tableName - * @param Zend_Db_Select $select * @param bool $temporary * @return mixed */ diff --git a/lib/Varien/Db/Adapter/Pdo/Mysql.php b/lib/Varien/Db/Adapter/Pdo/Mysql.php index 1e8d20bafca..0f331786a5c 100644 --- a/lib/Varien/Db/Adapter/Pdo/Mysql.php +++ b/lib/Varien/Db/Adapter/Pdo/Mysql.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Db * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -859,8 +859,8 @@ public function purgeOrphanRecords( * @param string $fkName foreign key name * @param string $tableName main table name * @param string $columnName main table field name - * @param string $refTableName refered table name - * @param string $refColumnName refered table field name + * @param string $refTableName referred table name + * @param string $refColumnName referred table field name * @param string $onUpdate on update statement * @param string $onDelete on delete statement * @param bool $purge @@ -1483,9 +1483,8 @@ protected function _debugStat($type, $sql, $bind = [], $result = null) } /** - * Write exception and thow + * Write exception and throw * - * @param Exception $e * @throws Exception */ protected function _debugException(Exception $e) @@ -1533,7 +1532,7 @@ protected function _debugWriteToFile($str) * @param Zend_Db_Select|Zend_Db_Expr|array|null|int|string|float $value OPTIONAL A single value to quote into the condition. * @param null|string|int $type OPTIONAL The type of the given value e.g. Zend_Db::INT_TYPE, "INT" * @param integer $count OPTIONAL count of placeholders to replace - * @return string An SQL-safe quoted value placed into the orignal text. + * @return string An SQL-safe quoted value placed into the original text. */ public function quoteInto($text, $value, $type = null, $count = null) { @@ -2007,7 +2006,6 @@ public function changeTableAutoIncrement($tableName, $increment, $schemaName = n * Special for Zero values to identity column * * @param string $table - * @param array $bind * @return int The number of affected rows. */ public function insertForce($table, array $bind) @@ -2128,8 +2126,6 @@ public function insertMultiple($table, array $data) * Insert array to table based on columns definition * * @param string $table - * @param array $columns - * @param array $data * @return int * @throws Zend_Db_Exception */ @@ -2243,7 +2239,6 @@ public function newTable($tableName = null, $schemaName = null) /** * Create table * - * @param Varien_Db_Ddl_Table $table * @throws Zend_Db_Exception * @return Zend_Db_Statement_Pdo */ @@ -2275,7 +2270,6 @@ public function createTable(Varien_Db_Ddl_Table $table) /** * Create temporary table * - * @param Varien_Db_Ddl_Table $table * @throws Zend_Db_Exception * @return Zend_Db_Statement_Pdo */ @@ -2300,7 +2294,6 @@ public function createTemporaryTable(Varien_Db_Ddl_Table $table) /** * Retrieve columns and primary keys definition array for create table * - * @param Varien_Db_Ddl_Table $table * @return array * @throws Zend_Db_Exception */ @@ -2339,7 +2332,6 @@ protected function _getColumnsDefinition(Varien_Db_Ddl_Table $table) /** * Retrieve table indexes definition array for create table * - * @param Varien_Db_Ddl_Table $table * @return array */ protected function _getIndexesDefinition(Varien_Db_Ddl_Table $table) @@ -2386,7 +2378,6 @@ protected function _getIndexesDefinition(Varien_Db_Ddl_Table $table) /** * Retrieve table foreign keys definition array for create table * - * @param Varien_Db_Ddl_Table $table * @return array */ protected function _getForeignKeysDefinition(Varien_Db_Ddl_Table $table) @@ -2417,7 +2408,6 @@ protected function _getForeignKeysDefinition(Varien_Db_Ddl_Table $table) /** * Retrieve table options definition array for create table * - * @param Varien_Db_Ddl_Table $table * @return array * @throws Zend_Db_Exception */ @@ -3243,7 +3233,6 @@ public function getCaseSql($valueName, $casesResults, $defaultValue = null) * Generate fragment of SQL, that combine together (concatenate) the results from data array * All arguments in data must be quoted * - * @param array $data * @param string $separator concatenate with separator * @return Zend_Db_Expr */ @@ -3270,7 +3259,6 @@ public function getLengthSql($string) * (minimum-valued) argument * All arguments in data must be quoted * - * @param array $data * @return Zend_Db_Expr */ public function getLeastSql(array $data) @@ -3283,7 +3271,6 @@ public function getLeastSql(array $data) * (maximum-valued) argument * All arguments in data must be quoted * - * @param array $data * @return Zend_Db_Expr */ public function getGreatestSql(array $data) @@ -3581,9 +3568,7 @@ public function enableTableKeys($tableName, $schemaName = null) /** * Get insert from Select object query * - * @param Varien_Db_Select $select * @param string $table insert into table - * @param array $fields * @param bool|int $mode * @return string */ @@ -3644,7 +3629,6 @@ public function insertFromSelect(Varien_Db_Select $select, $table, array $fields * Get insert queries in array for insert by range with step parameter * * @param string $rangeField - * @param Varien_Db_Select $select * @param int $stepCount * @return array * @throws Varien_Db_Exception @@ -3725,7 +3709,6 @@ public function fromUnixtime($timestamp) /** * Get update table query using select object for join and update * - * @param Varien_Db_Select $select * @param string|array $table * @throws Varien_Db_Exception * @return string @@ -3801,7 +3784,6 @@ public function updateFromSelect(Varien_Db_Select $select, $table) /** * Get delete from select object query * - * @param Varien_Db_Select $select * @param string $table the table name or alias used in select * @return string|int */ @@ -3851,7 +3833,6 @@ public function supportStraightJoin() * Adds order by random to select object * Possible using integer field for optimization * - * @param Varien_Db_Select $select * @param string $field * @return $this */ @@ -3914,8 +3895,6 @@ protected function _prepareInsertData($row, &$bind) * Return insert sql query * * @param string $tableName - * @param array $columns - * @param array $values * @return string */ protected function _getInsertSqlQuery($tableName, array $columns, array $values) @@ -3991,7 +3970,7 @@ protected function _prepareSqlDateCondition($condition, $key) } /** - * Try to find installed primary key name, if not - formate new one. + * Try to find installed primary key name, if not - format new one. * * @param string $tableName Table name * @param string $schemaName OPTIONAL @@ -4105,7 +4084,6 @@ public function dropTrigger($triggerName) * Create new table from provided select statement * * @param string $tableName - * @param Zend_Db_Select $select * @param bool $temporary * @return mixed */ diff --git a/lib/Varien/Db/Ddl/Table.php b/lib/Varien/Db/Ddl/Table.php index 27c0dea3d9c..2d2aa21a074 100644 --- a/lib/Varien/Db/Ddl/Table.php +++ b/lib/Varien/Db/Ddl/Table.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Db * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -648,7 +648,7 @@ protected function _sortColumnPosition($a, $b) } /** - * Normalize positon of index columns array + * Normalize position of index columns array * * @param array $columns * @return array @@ -665,7 +665,7 @@ protected function _normalizeIndexColumnPosition($columns) } /** - * Normalize positon of table columns array + * Normalize position of table columns array * * @param array $columns * @return array diff --git a/lib/Varien/Db/Select.php b/lib/Varien/Db/Select.php index 8c12c388291..4e0b9ca64a5 100644 --- a/lib/Varien/Db/Select.php +++ b/lib/Varien/Db/Select.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Db * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,8 +49,6 @@ class Varien_Db_Select extends Zend_Db_Select /** * Class constructor * Add straight join support - * - * @param Zend_Db_Adapter_Abstract $adapter */ public function __construct(Zend_Db_Adapter_Abstract $adapter) { @@ -345,7 +343,7 @@ public function deleteFromSelect($table) } /** - * Modify (hack) part of the structured information for the currect query + * Modify (hack) part of the structured information for the current query * * @param string $part * @param mixed $value diff --git a/lib/Varien/Db/Statement/Parameter.php b/lib/Varien/Db/Statement/Parameter.php index af5eaecf657..71157705d01 100644 --- a/lib/Varien/Db/Statement/Parameter.php +++ b/lib/Varien/Db/Statement/Parameter.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Db * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -19,7 +19,7 @@ * Used to transmit specific information about parameter value binding to be bound the right * way to the query. * Most used properties and methods are defined in interface. Specific things for concrete DB adapter can be - * transmitted using 'addtional' property (Varien_Object) as a container. + * transmitted using 'additional' property (Varien_Object) as a container. * * @category Varien * @package Varien_Db diff --git a/lib/Varien/Db/Statement/Pdo/Mysql.php b/lib/Varien/Db/Statement/Pdo/Mysql.php index d5f83882237..c15f5efb0e8 100644 --- a/lib/Varien/Db/Statement/Pdo/Mysql.php +++ b/lib/Varien/Db/Statement/Pdo/Mysql.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Db * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Db/Tree.php b/lib/Varien/Db/Tree.php index 5cc845d5e08..95ee65bf6f2 100644 --- a/lib/Varien/Db/Tree.php +++ b/lib/Varien/Db/Tree.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Db * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -204,7 +204,7 @@ public function getKeys() } /** - * Cleare table and add root element + * Clear table and add root element * */ public function clear($data = []) diff --git a/lib/Varien/Db/Tree/NodeSet.php b/lib/Varien/Db/Tree/NodeSet.php index 9164ba990c6..746f147dde5 100644 --- a/lib/Varien/Db/Tree/NodeSet.php +++ b/lib/Varien/Db/Tree/NodeSet.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Db * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,7 +32,6 @@ public function __construct() } /** - * @param Varien_Db_Tree_Node $node * @return int */ public function addNode(Varien_Db_Tree_Node $node) @@ -50,9 +49,6 @@ public function count() return $this->count; } - /** - * @return bool - */ public function valid(): bool { return isset($this->_nodes[$this->_current]); diff --git a/lib/Varien/Debug.php b/lib/Varien/Debug.php index 367b29e63fc..a8b42126196 100644 --- a/lib/Varien/Debug.php +++ b/lib/Varien/Debug.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Debug * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -82,7 +82,7 @@ public static function trace(array $trace, $return = false, $html = true, $withA continue; } - // prepare method argments + // prepare method arguments $args = []; if (isset($data['args']) && $withArgs) { foreach ($data['args'] as $arg) { diff --git a/lib/Varien/Directory/Collection.php b/lib/Varien/Directory/Collection.php index f24d0c115b6..5cb07d2aa1b 100644 --- a/lib/Varien/Directory/Collection.php +++ b/lib/Varien/Directory/Collection.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Directory/Factory.php b/lib/Varien/Directory/Factory.php index 8231eb6c622..a4d3dca03a5 100644 --- a/lib/Varien/Directory/Factory.php +++ b/lib/Varien/Directory/Factory.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,7 +28,7 @@ class Varien_Directory_Factory /** * return or Varien_Directory_Collection or Varien_File_Object object * - * @param array $path - path to direcctory + * @param array $path - path to directory * @param bool $is_recursion - use or not recursion * @param int $recurse_level - recurse level * @return IFactor - Varien_Directory_Collection or Varien_File_Object object diff --git a/lib/Varien/Event.php b/lib/Varien/Event.php index 61cc0be1cba..a74dfd1cfdf 100644 --- a/lib/Varien/Event.php +++ b/lib/Varien/Event.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Event * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,8 +32,6 @@ class Varien_Event extends Varien_Object * Constructor * * Initializes observers collection - * - * @param array $data */ public function __construct(array $data = []) { @@ -54,7 +52,6 @@ public function getObservers() /** * Register an observer for the event * - * @param Varien_Event_Observer $observer * @return Varien_Event */ public function addObserver(Varien_Event_Observer $observer) diff --git a/lib/Varien/Event/Collection.php b/lib/Varien/Event/Collection.php index 7d562342ce2..d8eb8a491f0 100644 --- a/lib/Varien/Event/Collection.php +++ b/lib/Varien/Event/Collection.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Event * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,7 +91,6 @@ public function getEventByName($eventName) /** * Register an event for this collection * - * @param Varien_Event $event * @return Varien_Event_Collection */ public function addEvent(Varien_Event $event) @@ -103,10 +102,9 @@ public function addEvent(Varien_Event $event) /** * Register an observer * - * If observer has event_name property it will be regitered for this specific event. + * If observer has event_name property it will be registered for this specific event. * If not it will be registered as global observer * - * @param Varien_Event_Observer $observer * @return Varien_Event_Collection */ public function addObserver(Varien_Event_Observer $observer) @@ -126,7 +124,6 @@ public function addObserver(Varien_Event_Observer $observer) * Will dispatch specific event and will try all global observers * * @param string $eventName - * @param array $data * @return Varien_Event_Collection */ public function dispatch($eventName, array $data = []) diff --git a/lib/Varien/Event/Observer.php b/lib/Varien/Event/Observer.php index 86798c5b68d..1b4ed1c2bed 100644 --- a/lib/Varien/Event/Observer.php +++ b/lib/Varien/Event/Observer.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Event * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,9 +22,8 @@ class Varien_Event_Observer extends Varien_Object { /** - * Checkes the observer's event_regex against event's name + * Checks the observer's event_regex against event's name * - * @param Varien_Event $event * @return boolean */ public function isValidFor(Varien_Event $event) @@ -35,7 +34,6 @@ public function isValidFor(Varien_Event $event) /** * Dispatches an event to observer's callback * - * @param Varien_Event $event * @return $this */ public function dispatch(Varien_Event $event) diff --git a/lib/Varien/Event/Observer/Collection.php b/lib/Varien/Event/Observer/Collection.php index 722c25eeba4..4821a473dde 100644 --- a/lib/Varien/Event/Observer/Collection.php +++ b/lib/Varien/Event/Observer/Collection.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Event * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -61,7 +61,6 @@ public function getObserverByName($observerName) /** * Adds an observer to the collection * - * @param Varien_Event_Observer $observer * @return $this */ public function addObserver(Varien_Event_Observer $observer) @@ -85,7 +84,6 @@ public function removeObserverByName($observerName) /** * Dispatches an event to all observers in the collection * - * @param Varien_Event $event * @return $this */ public function dispatch(Varien_Event $event) diff --git a/lib/Varien/Event/Observer/Cron.php b/lib/Varien/Event/Observer/Cron.php index 74e56c151f5..60a63ee094b 100644 --- a/lib/Varien/Event/Observer/Cron.php +++ b/lib/Varien/Event/Observer/Cron.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Event * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,11 +26,10 @@ class Varien_Event_Observer_Cron extends Varien_Event_Observer { /** - * Checkes the observer's cron string against event's name + * Checks the observer's cron string against event's name * * Supports $this->setCronExpr('* 0-5,10-59/5 2-10,15-25 january-june/2 mon-fri') * - * @param Varien_Event $event * @return boolean */ public function isValidFor(Varien_Event $event) diff --git a/lib/Varien/Event/Observer/Regex.php b/lib/Varien/Event/Observer/Regex.php index 750952d7a76..f391c651a06 100644 --- a/lib/Varien/Event/Observer/Regex.php +++ b/lib/Varien/Event/Observer/Regex.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Event * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,9 +24,8 @@ class Varien_Event_Observer_Regex extends Varien_Event_Observer { /** - * Checkes the observer's event_regex against event's name + * Checks the observer's event_regex against event's name * - * @param Varien_Event $event * @return boolean */ public function isValidFor(Varien_Event $event) diff --git a/lib/Varien/File/Object.php b/lib/Varien/File/Object.php index 55dab25cbae..b1d5c370873 100644 --- a/lib/Varien/File/Object.php +++ b/lib/Varien/File/Object.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_File * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/File/Transfer/Adapter/Http.php b/lib/Varien/File/Transfer/Adapter/Http.php index bac95988909..9159860d838 100644 --- a/lib/Varien/File/Transfer/Adapter/Http.php +++ b/lib/Varien/File/Transfer/Adapter/Http.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_File * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/File/Uploader.php b/lib/Varien/File/Uploader.php index 0acc053944b..9b79218132d 100644 --- a/lib/Varien/File/Uploader.php +++ b/lib/Varien/File/Uploader.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_File * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -77,8 +77,8 @@ class Varien_File_Uploader protected $_uploadedFileDir; /** - * If this variable is set to TRUE, our library will be able to automaticaly create - * non-existant directories. + * If this variable is set to TRUE, our library will be able to automatically create + * non-existent directories. * * @var bool * @access protected diff --git a/lib/Varien/File/Uploader/Image.php b/lib/Varien/File/Uploader/Image.php index 6402884e482..bb4423d10ec 100644 --- a/lib/Varien/File/Uploader/Image.php +++ b/lib/Varien/File/Uploader/Image.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_File * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Filter/Array.php b/lib/Varien/Filter/Array.php index 160f7182236..dc81b2c07f5 100644 --- a/lib/Varien/Filter/Array.php +++ b/lib/Varien/Filter/Array.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Filter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -21,7 +21,6 @@ class Varien_Filter_Array extends Zend_Filter protected $_columnFilters = []; /** - * @param Zend_Filter_Interface $filter * @param string $column * @return $this */ diff --git a/lib/Varien/Filter/FormElementName.php b/lib/Varien/Filter/FormElementName.php index fe5d611d2a0..c03bebdf5b8 100644 --- a/lib/Varien/Filter/FormElementName.php +++ b/lib/Varien/Filter/FormElementName.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Filter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Filter/Object.php b/lib/Varien/Filter/Object.php index f2a739be811..fc7e96e1d6d 100644 --- a/lib/Varien/Filter/Object.php +++ b/lib/Varien/Filter/Object.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Filter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -21,7 +21,6 @@ class Varien_Filter_Object extends Zend_Filter protected $_columnFilters = []; /** - * @param Zend_Filter_Interface $filter * @param string $column * @return $this */ diff --git a/lib/Varien/Filter/Template.php b/lib/Varien/Filter/Template.php index a58c90c0ad4..0718c63fa13 100644 --- a/lib/Varien/Filter/Template.php +++ b/lib/Varien/Filter/Template.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Filter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,9 +55,7 @@ class Varien_Filter_Template implements Zend_Filter_Interface protected $_includeProcessor = null; /** - * Sets template variables that's can be called througth {var ...} statement - * - * @param array $variables + * Sets template variables that's can be called through {var ...} statement */ public function setVariables(array $variables) { diff --git a/lib/Varien/Filter/Template/Tokenizer/Abstract.php b/lib/Varien/Filter/Template/Tokenizer/Abstract.php index 216cc6147bb..a879a3fbe3a 100644 --- a/lib/Varien/Filter/Template/Tokenizer/Abstract.php +++ b/lib/Varien/Filter/Template/Tokenizer/Abstract.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Filter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,7 +51,7 @@ public function next() } /** - * Move current index to previus char. + * Move current index to previous char. * * If index out of bounds returns false * diff --git a/lib/Varien/Filter/Template/Tokenizer/Parameter.php b/lib/Varien/Filter/Template/Tokenizer/Parameter.php index 13de7315b53..9b9decb3ca3 100644 --- a/lib/Varien/Filter/Template/Tokenizer/Parameter.php +++ b/lib/Varien/Filter/Template/Tokenizer/Parameter.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Filter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,7 +45,7 @@ public function tokenize() } /** - * Get string value in parameters througth tokenize + * Get string value in parameters through tokenize * * @return string */ diff --git a/lib/Varien/Filter/Template/Tokenizer/Variable.php b/lib/Varien/Filter/Template/Tokenizer/Variable.php index db13732d576..6b370c6a067 100644 --- a/lib/Varien/Filter/Template/Tokenizer/Variable.php +++ b/lib/Varien/Filter/Template/Tokenizer/Variable.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Filter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -121,7 +121,7 @@ public function isNumeric() } /** - * Return true if current char is qoute or apostroph + * Return true if current char is quote or apostrophe * * @return boolean */ diff --git a/lib/Varien/Http/Adapter/Curl.php b/lib/Varien/Http/Adapter/Curl.php index 1e9fd81f16b..533205b1252 100644 --- a/lib/Varien/Http/Adapter/Curl.php +++ b/lib/Varien/Http/Adapter/Curl.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Http * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -86,7 +86,6 @@ protected function _applyConfig() /** * Set array of additional cURL options * - * @param array $options * @return Varien_Http_Adapter_Curl */ public function setOptions(array $options = []) @@ -111,7 +110,6 @@ public function addOption($option, $value) /** * Add additional options list to curl * - * @param array $options * * @return Varien_Http_Adapter_Curl */ diff --git a/lib/Varien/Image.php b/lib/Varien/Image.php index 25c1b071fe4..23d6c0434d9 100644 --- a/lib/Varien/Image.php +++ b/lib/Varien/Image.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Image * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -277,7 +277,7 @@ public function setWatermarkWidth($width) } /** - * Set watermark heigth + * Set watermark height * * @param int $heigth * @return Varien_Image diff --git a/lib/Varien/Image/Adapter/Gd2.php b/lib/Varien/Image/Adapter/Gd2.php index 42e07c605ba..5797199b44c 100644 --- a/lib/Varien/Image/Adapter/Gd2.php +++ b/lib/Varien/Image/Adapter/Gd2.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Image * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Io/Abstract.php b/lib/Varien/Io/Abstract.php index f7ee9410433..b3bc30aa50b 100644 --- a/lib/Varien/Io/Abstract.php +++ b/lib/Varien/Io/Abstract.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Io * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,15 +22,15 @@ abstract class Varien_Io_Abstract implements Varien_Io_Interface { /** - * If this variable is set to true, our library will be able to automaticaly - * create non-existant directories + * If this variable is set to true, our library will be able to automatically + * create non-existent directories * * @var bool */ protected $_allowCreateFolders = false; /** - * Allow automaticaly create non-existant directories + * Allow automatically create non-existent directories * * @param bool $flag * @return Varien_Io_Abstract @@ -44,7 +44,6 @@ public function setAllowCreateFolders($flag) /** * Open a connection * - * @param array $args * @return bool */ public function open(array $args = []) diff --git a/lib/Varien/Io/File.php b/lib/Varien/Io/File.php index ca8658391fb..000453326a4 100644 --- a/lib/Varien/Io/File.php +++ b/lib/Varien/Io/File.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Io * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2016-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2016-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,8 +50,8 @@ class Varien_Io_File extends Varien_Io_Abstract public const GREP_DIRS = 'dirs_only'; /** - * If this variable is set to TRUE, our library will be able to automaticaly create - * non-existant directories. + * If this variable is set to TRUE, our library will be able to automatically create + * non-existent directories. * * @var bool * @access protected @@ -231,11 +231,9 @@ public function streamWrite($str) /** * Format line as CSV and write to file pointer * - * @param array $row * @param string $delimiter * @param string $enclosure * @return bool|int - * * @SuppressWarnings(PHPMD.ErrorControlOperator) */ public function streamWriteCsv(array $row, $delimiter = ',', $enclosure = '"') @@ -309,7 +307,6 @@ public function getStreamException() * Possible arguments: * - path default current path * - * @param array $args * @return boolean */ public function open(array $args = []) diff --git a/lib/Varien/Io/Ftp.php b/lib/Varien/Io/Ftp.php index f0a20d51e77..613874c81d6 100644 --- a/lib/Varien/Io/Ftp.php +++ b/lib/Varien/Io/Ftp.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Io * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -66,9 +66,7 @@ class Varien_Io_Ftp extends Varien_Io_Abstract * - path default empty * - file_mode default FTP_BINARY * - * @param array $args * @return boolean - * * @SuppressWarnings(PHPMD.ErrorControlOperator) */ public function open(array $args = []) diff --git a/lib/Varien/Io/Sftp.php b/lib/Varien/Io/Sftp.php index 024140880b1..e5623544805 100644 --- a/lib/Varien/Io/Sftp.php +++ b/lib/Varien/Io/Sftp.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Io * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Object.php b/lib/Varien/Object.php index 292708805c0..d747316b0c1 100644 --- a/lib/Varien/Object.php +++ b/lib/Varien/Object.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Object * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -75,7 +75,7 @@ class Varien_Object implements ArrayAccess /** * Constructor * - * By default is looking for first argument as array and assignes it as object attributes + * By default, is looking for first argument as array and assigns it as object attributes * This behaviour may change in child classes */ public function __construct() @@ -219,7 +219,6 @@ public function setId($value) * * Retains previous data in the object. * - * @param array $arr * @return $this */ public function addData(array $arr) @@ -302,13 +301,15 @@ public function unsetOldData($key = null) } /** - * Retrieves data from the object + * Object data getter * - * If $key is empty will return all the data as an array - * Otherwise it will return value of the attribute specified by $key + * If $key is not defined will return all the data as an array. + * Otherwise, it will return value of the element specified by $key. + * It is possible to use keys like a/b/c for access nested array data * * If $index is specified it will assume that attribute data is an array - * and retrieve corresponding member. + * and retrieve corresponding member. If data is the string - it will be explode + * by new line character and converted to array. * * @param string $key * @param string|int $index @@ -320,56 +321,61 @@ public function getData($key = '', $index = null) return $this->_data; } - $default = null; - - // accept a/b/c as ['a']['b']['c'] - if (strpos($key, '/')) { - $keyArr = explode('/', $key); - $data = $this->_data; - foreach ($keyArr as $i => $k) { - if ($k === '') { - return $default; - } - if (is_array($data)) { - if (!isset($data[$k])) { - return $default; - } - $data = $data[$k]; - } elseif ($data instanceof Varien_Object) { - $data = $data->getData($k); - } else { - return $default; - } - } - return $data; + $data = $this->_data[$key] ?? null; + if ($data === null && $key !== null && strpos($key, '/') !== false) { + /* process a/b/c key as ['a']['b']['c'] */ + $data = $this->getDataByPath($key); } - // legacy functionality for $index - if (isset($this->_data[$key])) { - if (is_null($index)) { - return $this->_data[$key]; + if ($index !== null) { + if ($data === (array)$data) { + $data = $data[$index] ?? null; + } elseif (is_string($data)) { + $data = explode(PHP_EOL, $data); + $data = $data[$index] ?? null; + } elseif ($data instanceof Varien_Object) { + $data = $data->getData($index); + } else { + $data = null; } + } + return $data; + } + + /** + * Get object data by path + * + * Method consider the path as chain of keys: a/b/c => ['a']['b']['c'] + * + * @param string $path + * @return mixed + */ + public function getDataByPath($path) + { + $keys = explode('/', (string)$path); - $value = $this->_data[$key]; - if (is_array($value)) { - //if (isset($value[$index]) && (!empty($value[$index]) || strlen($value[$index]) > 0)) { - /** - * If we have any data, even if it empty - we should use it, anyway - */ - if (isset($value[$index])) { - return $value[$index]; - } + $data = $this->_data; + foreach ($keys as $key) { + if ((array)$data === $data && isset($data[$key])) { + $data = $data[$key]; + } elseif ($data instanceof Varien_Object) { + $data = $data->getDataByKey($key); + } else { return null; - } elseif (is_string($value)) { - $arr = explode("\n", $value); - return (isset($arr[$index]) && (!empty($arr[$index]) || strlen($arr[$index]) > 0)) - ? $arr[$index] : null; - } elseif ($value instanceof Varien_Object) { - return $value->getData($index); } - return $default; } - return $default; + return $data; + } + + /** + * Get object data by particular key + * + * @param string $key + * @return mixed + */ + public function getDataByKey($key) + { + return $this->_getData($key); } /** @@ -380,7 +386,7 @@ public function getData($key = '', $index = null) */ protected function _getData($key) { - return isset($this->_data[$key]) ? $this->_data[$key] : null; + return $this->_data[$key] ?? null; } /** @@ -466,7 +472,6 @@ public function __toArray(array $arrAttributes = []) /** * Public wrapper for __toArray * - * @param array $arrAttributes * @return array */ public function toArray(array $arrAttributes = []) @@ -478,7 +483,6 @@ public function toArray(array $arrAttributes = []) * Set required array elements * * @param array $arr - * @param array $elements * @return array */ protected function _prepareArray(&$arr, array $elements = []) @@ -528,7 +532,6 @@ protected function __toXml(array $arrAttributes = [], $rootName = 'item', $addOp /** * Public wrapper for __toXml * - * @param array $arrAttributes * @param string $rootName * @param bool $addOpenTag * @param bool $addCdata @@ -555,7 +558,6 @@ protected function __toJson(array $arrAttributes = []) /** * Public wrapper for __toJson * - * @param array $arrAttributes * @return string */ public function toJson(array $arrAttributes = []) @@ -611,14 +613,14 @@ public function __call($method, $args) case 'get': //Varien_Profiler::start('GETTER: '.get_class($this).'::'.$method); $key = $this->_underscore(substr($method, 3)); - $data = $this->getData($key, isset($args[0]) ? $args[0] : null); + $data = $this->getData($key, $args[0] ?? null); //Varien_Profiler::stop('GETTER: '.get_class($this).'::'.$method); return $data; case 'set': //Varien_Profiler::start('SETTER: '.get_class($this).'::'.$method); $key = $this->_underscore(substr($method, 3)); - $result = $this->setData($key, isset($args[0]) ? $args[0] : null); + $result = $this->setData($key, $args[0] ?? null); //Varien_Profiler::stop('SETTER: '.get_class($this).'::'.$method); return $result; @@ -635,7 +637,10 @@ public function __call($method, $args) //Varien_Profiler::stop('HAS: '.get_class($this).'::'.$method); return isset($this->_data[$key]); } - throw new Varien_Exception('Invalid method ' . get_class($this) . '::' . $method . '(' . print_r($args, 1) . ')'); + throw new Varien_Exception( + // phpcs:ignore Ecg.Security.ForbiddenFunction.Found + 'Invalid method ' . get_class($this) . '::' . $method . '(' . print_r($args, 1) . ')' + ); } /** @@ -676,10 +681,10 @@ public function isEmpty() } /** - * Converts field names for setters and geters + * Converts field names for setters and getters * * $this->setMyField($value) === $this->setData('my_field', $value) - * Uses cache to eliminate unneccessary preg_replace + * Uses cache to eliminate unnecessary preg_replace * * @param string $name * @return string @@ -716,7 +721,6 @@ protected function _camelize($name) */ public function serialize($attributes = [], $valueSeparator = '=', $fieldSeparator = ' ', $quote = '"') { - $res = ''; $data = []; if (empty($attributes)) { $attributes = array_keys($this->_data); @@ -727,8 +731,7 @@ public function serialize($attributes = [], $valueSeparator = '=', $fieldSeparat $data[] = $key . $valueSeparator . $quote . $value . $quote; } } - $res = implode($fieldSeparator, $data); - return $res; + return implode($fieldSeparator, $data); } /** @@ -790,7 +793,6 @@ public function offsetSet($offset, $value): void * * @link http://www.php.net/manual/en/arrayaccess.offsetexists.php * @param string $offset - * @return bool */ public function offsetExists($offset): bool { @@ -818,7 +820,7 @@ public function offsetUnset($offset): void #[\ReturnTypeWillChange] public function offsetGet($offset) { - return isset($this->_data[$offset]) ? $this->_data[$offset] : null; + return $this->_data[$offset] ?? null; } /** diff --git a/lib/Varien/Object/Cache.php b/lib/Varien/Object/Cache.php index 24047b87356..4fad72c2546 100644 --- a/lib/Varien/Object/Cache.php +++ b/lib/Varien/Object/Cache.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Object * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Object/Mapper.php b/lib/Varien/Object/Mapper.php index cf49b1d9109..67055f5629d 100644 --- a/lib/Varien/Object/Mapper.php +++ b/lib/Varien/Object/Mapper.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Object * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,8 +41,6 @@ class Varien_Object_Mapper * * @param array|Varien_Object|callback $from * @param array|Varien_Object|callback $to - * @param array $map - * @param array $defaults * @return array|Varien_Object */ public static function &accumulateByMap($from, $to, array $map, array $defaults = []) diff --git a/lib/Varien/Profiler.php b/lib/Varien/Profiler.php index e2308ff6201..d91c14828e2 100644 --- a/lib/Varien/Profiler.php +++ b/lib/Varien/Profiler.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Profiler * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/lib/Varien/Simplexml/Config.php b/lib/Varien/Simplexml/Config.php index ef4f5aeebc8..6ff8d31499e 100644 --- a/lib/Varien/Simplexml/Config.php +++ b/lib/Varien/Simplexml/Config.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Simplexml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -101,7 +101,6 @@ public function __construct($sourceData = null) /** * Sets xml for this configuration * - * @param Varien_Simplexml_Element $node * @return $this */ public function setXml(Varien_Simplexml_Element $node) @@ -525,7 +524,6 @@ public function processFileData($text) } /** - * @param Varien_Simplexml_Config $config * @param boolean $overwrite * @return $this */ diff --git a/lib/Varien/Simplexml/Config/Cache/Abstract.php b/lib/Varien/Simplexml/Config/Cache/Abstract.php index 88404abbcb0..5ebda9a0a95 100644 --- a/lib/Varien/Simplexml/Config/Cache/Abstract.php +++ b/lib/Varien/Simplexml/Config/Cache/Abstract.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Simplexml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -64,7 +64,7 @@ public function validateComponents($data) if (empty($data) || !is_array($data)) { return false; } - // check that no source files were changed or check file exsists + // check that no source files were changed or check file exists foreach ($data as $sourceFile => $stat) { if (empty($stat['mtime']) || !is_file($sourceFile) || filemtime($sourceFile) !== $stat['mtime']) { return false; diff --git a/lib/Varien/Simplexml/Element.php b/lib/Varien/Simplexml/Element.php index e07d39e6b77..fa6ed8e0d3d 100644 --- a/lib/Varien/Simplexml/Element.php +++ b/lib/Varien/Simplexml/Element.php @@ -9,7 +9,7 @@ * @category Varien * @package Varien_Simplexml * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2020-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 00000000000..306b6bcc934 --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,54 @@ + + + + + + tests/unit/Base + + + tests/unit/Mage + + + tests/unit/Varien + + + + + + app/code + lib + + + app/bootstrap.php + app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php + app/code/core/Mage/Admin/Model/Acl/Assert/Time.php + app/code/community + app/code/local/ + app/code/core/Mage/*/data + app/code/core/Mage/*/sql + vendor + + + + + + + + + + diff --git a/rector.php b/rector.php new file mode 100644 index 00000000000..4e6ea2466e7 --- /dev/null +++ b/rector.php @@ -0,0 +1,42 @@ +withPaths([ + __DIR__ . '/app', + __DIR__ . '/dev', + __DIR__ . '/errors', + __DIR__ . '/lib', + __DIR__ . '/pub', + __DIR__ . '/shell', + __DIR__ . '/tests', + ]) + ->withSkipPath(__DIR__ . '/vendor') + ->withSkip([ + __DIR__ . '/shell/translations.php', + __DIR__ . '/shell/update-copyright.php.php' + ]) + ->withRules([ +// CodeQuality\BooleanNot\SimplifyDeMorganBinaryRector::class, # wait for https://github.com/rectorphp/rector/issues/8781 + CodeQuality\BooleanNot\ReplaceMultipleBooleanNotRector::class, + CodeQuality\Foreach_\UnusedForeachValueToArrayKeysRector::class, + CodeQuality\FuncCall\ChangeArrayPushToArrayAssignRector::class, + CodeQuality\FuncCall\CompactToVariablesRector::class, + CodeQuality\Identical\SimplifyArraySearchRector::class, + CodeQuality\Identical\SimplifyConditionsRector::class, + CodeQuality\Identical\StrlenZeroToIdenticalEmptyStringRector::class, +// CodeQuality\If_\SimplifyIfReturnBoolRector::class, + CodeQuality\NotEqual\CommonNotEqualRector::class, + CodeQuality\LogicalAnd\LogicalToBooleanRector::class, + CodeQuality\Ternary\SimplifyTautologyTernaryRector::class, + DeadCode\ClassMethod\RemoveUselessParamTagRector::class, + DeadCode\ClassMethod\RemoveUselessReturnTagRector::class, + DeadCode\Property\RemoveUselessVarTagRector::class, + TypeDeclaration\ClassMethod\ReturnNeverTypeRector::class, + ]); \ No newline at end of file diff --git a/shell/indexer.php b/shell/indexer.php index 929820ec06c..34b7f3e8292 100644 --- a/shell/indexer.php +++ b/shell/indexer.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Shell * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/skin/adminhtml/default/default/boxes.css b/skin/adminhtml/default/default/boxes.css index a73854578cc..0e8d69c7d00 100644 --- a/skin/adminhtml/default/default/boxes.css +++ b/skin/adminhtml/default/default/boxes.css @@ -8,7 +8,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css b/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css index a917e855d04..c5892d6d550 100644 --- a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css +++ b/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css @@ -8,7 +8,7 @@ * @category design * @package default_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ .dialog { border:1px solid #555; } diff --git a/skin/adminhtml/default/openmage/menu.css b/skin/adminhtml/default/openmage/menu.css index 6504f895864..3adbae627f9 100644 --- a/skin/adminhtml/default/openmage/menu.css +++ b/skin/adminhtml/default/openmage/menu.css @@ -11,7 +11,7 @@ 240 = blue, 300 = purple */ -#nav ul li, #nav ul li.active { +#nav ul li.active, #nav ul li { float: none; height: auto; background: none; @@ -132,6 +132,9 @@ #nav li.parent li a { cursor: pointer; } +#nav li.level1 > a.active:not(:hover), #nav li.level2 > a.active:not(:hover), #nav li.level3 > a.active:not(:hover) { + background: #e6e6e6; +} #nav li#bubblelauncher-status a { background-position: center 8px; line-height: 38px; @@ -157,7 +160,7 @@ width: 189px; top: 38px; left: -10000px; - box-shadow: rgba(0, 0, 0, 0.18039) 1px 3px 4px; + box-shadow: rgba(0, 0, 0, 0.180392) 1px 3px 4px; } #nav ul li { padding: 0; @@ -237,7 +240,7 @@ top: 40px; right: -10000px; display: none; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.20784), 0 0 5px rgba(0, 0, 0, 0.20784); + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.207843), 0 0 5px rgba(0, 0, 0, 0.207843); background: #fff; } #usermenu ul li a:hover { @@ -251,7 +254,7 @@ display: block; } #usermenu li ul span { - border-bottom: 1px dotted #a6c4d9; + border-bottom: 1px dotted hsl(205, 40%, 75%); display: block; line-height: 31px; padding: 0 10px; @@ -263,7 +266,7 @@ #usermenu li.over ul a { color: #000537; text-decoration: none; - background: #ecf3f9; + background: hsl(205, 52%, 95%); display: block; } #usermenu > li > a { diff --git a/skin/adminhtml/default/openmage/menu.css.map b/skin/adminhtml/default/openmage/menu.css.map index 93e3112ef89..efc96494ea3 100644 --- a/skin/adminhtml/default/openmage/menu.css.map +++ b/skin/adminhtml/default/openmage/menu.css.map @@ -1,7 +1 @@ -{ -"version": 3, -"mappings": "AAAA;;;GAGG;AC4FH;;;;;;;;EAQE;ACgEF,6BAAW;EACT,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,CAAC;;;AAwIX,uBAAW;EACT,KAAK,ED5PW,OAAO;EC6PvB,eAAe,EAAE,IAAI;EACrB,UAAU,EAAE,oBAAoB;EAChC,OAAO,EAAE,KAAK;;;AFhThB,QAAS;EACP,UAAU,ECPS,OAAO;EDQ1B,OAAO,EAAE,cAAc;;AAEvB,cAAQ;EACN,OAAO,EAAE,GAAG;EACZ,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,CAAC;EACZ,WAAW,EAAE,CAAC;EACd,MAAM,EAAE,CAAC;EACT,QAAQ,EAAE,MAAM;;;AAIpB,IAAK;EACH,YAAY,EAAC,CAAC;;AACd,OAAG;EACD,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,IAAI;;AAEX,YAAO;EACL,OAAO,EAAE,GAAG;;AAEZ,cAAE;EACA,KAAK,ECGS,OAAO;;ADAvB,eAAG;EACD,IAAI,EAAE,CAAC;;AAEP,kBAAG;EACD,IAAI,EAAE,QAAQ;;AAGhB,iBAAE;EACA,KAAK,ECTO,OAA8B;EDU1C,SAAS,EAAE,IAAI;;AAGjB,0BAAW;EACT,IAAI,EAAE,KAAK;;AAEX,6BAAG;EACD,IAAI,EAAE,QAAQ;;AAGhB,qCAAW;EACT,IAAI,EAAE,KAAK;;AAMnB,cAAS;EACP,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,IAAI;EACjB,KAAK,ECeH,IAAI;EDdN,WAAW,EAAE,IAAI;;AAEjB,iBAAG;EACD,OAAO,EAAE,KAAK;EACd,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI;;AAGd,iBAAG;EACD,WAAW,EAAE,MAAM;;AAKrB,kBAAI;EACF,cAAc,EAAE,IAAI;EACpB,WAAW,EAAE,GAAG;EAChB,KAAK,ECNL,IAAI;EDOJ,MAAM,EAAE,IAAI;EACZ,WAAW,EAAE,IAAI;;AAEjB,wBAAQ;EACN,UAAU,EAAE,OAA8B;EAC1C,KAAK,ECZP,IAAI;;ADgBN,kCAAoB;EAClB,OAAO,EAAE,EAAE;EACX,QAAQ,EAAE,QAAQ;EAClB,KAAK,ECvCI,IAAI;EDwCb,MAAM,ECzCG,GAAG;ED0CZ,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,YAAY,EAAE,KAAK;EACnB,YAAY,EAAE,aAAa;EAC3B,YAAY,EAAE,2CAAwD;;AAGxE,uBAAW;EACT,UAAU,EAAE,OAA8B;EAC1C,KAAK,EC9BL,IAAI;;ADmCN,gBAAE;EACA,MAAM,EAAE,OAAO;;AAKb,0BAAE;EACA,MAAM,EAAE,OAAO;;AAKb,oCAAE;EACA,MAAM,EAAE,OAAO;;AAGjB,uCAAK;EACH,MAAM,EAAE,OAAO;;AAInB,6BAAE;EACA,MAAM,EAAE,OAAO;;AAKrB,mBAAE;EACA,MAAM,EAAE,OAAO;;AAMnB,+BAAE;EACA,mBAAmB,EAAE,UAAU;EAC/B,WAAW,EAAE,IAAI;EACjB,MAAM,EAAE,IAAI;;AAGd,kCAAO;EACL,mBAAmB,EAAE,YAAY;;AAKvC,MAAE;EACA,OAAO,EAAE,KAAK;EACd,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,MAAM;EACf,KAAK,ECtFD,IAAI;EDuFR,MAAM,EAAE,OAAO;;AAEf,YAAQ;EACN,OAAO,EAAE,KAAK;EACd,eAAe,EAAE,IAAI;;AAIzB,OAAG;EACD,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,QAAQ;EAEd,UAAU,EAAE,kCAA0B;;AAEtC,UAAG;EAED,OAAO,EAAE,CAAC;;AAKR,mBAAE;EACA,KAAK,EC5JO,OAA8B;ED6J1C,SAAS,EAAE,IAAI;;AAInB,YAAE;EACA,UAAU,ECrHV,IAAI;EDsHJ,OAAO,EAAE,QAA+B;EACxC,KAAK,ECpKS,OAA8B;EDqK5C,SAAS,EAAE,IAAI;;AAEf,kBAAQ;EACN,UAAU,ECxKE,OAA8B;EDyK1C,KAAK,EC5HP,IAAI;;ADiIJ,mBAAE;EACA,mBAAmB,EAAE,SAAS;EAC9B,iBAAiB,EAAE,SAAS;;AAK1B,6BAAE;EACA,mBAAmB,EAAE,SAAS;EAC9B,iBAAiB,EAAE,SAAS;;AAG9B,gCAAK;EACH,gBAAgB,EAAE,IAAI;;AAI1B,sBAAE;EACA,gBAAgB,EAAE,IAAI;;AAK5B,iBAAS;EACP,WAAW,EAAE,MAAM;;AAEnB,uBAAQ;EACN,WAAW,EAAE,MAAM;;AAKzB,SAAE;EACA,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,KAAK;EAClB,WAAW,EAAE,MAAM;;AAEnB,eAAQ;EACN,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,KAAK;;AAItB,UAAG;EACD,UAAU,EAAE,CAAC;EACb,WAAW,EAAE,GAAG;EAChB,IAAI,EAAE,KAAK;EACX,GAAG,EAAE,IAAI;;AAET,aAAG;EACD,IAAI,EAAE,QAAQ;;AAMlB,sBAAU;EACR,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,KAAK;EACd,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,GAAG;EACX,SAAS,EAAE,CAAC;;AAGd,uBAAa;EACX,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,OAA8B;;;AAKhD,SAAU;EACR,OAAO,EAAE,MAAM;EACf,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,IAAI;;AAChB,YAAG;EACD,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,GAAG,EAAE,IAAI;EACT,KAAK,EAAE,QAAQ;EACf,OAAO,EAAE,IAAI;EAEb,UAAU,EAAE,gEAAgD;EAC5D,UAAU,ECpNN,IAAI;;ADsNN,uBAAQ;EAEN,UAAU,ECrQI,OAA8B;;ADuQ9C,yBAAY;EACV,aAAa,EAAE,IAAI;;AAMrB,kBAAG;EACD,KAAK,EAAE,GAAG;EACV,OAAO,EAAE,KAAK;;AAEhB,oBAAK;EACH,aAAa,EAAE,kBAAwB;EACvC,OAAO,EAAE,KAAK;EACd,WAAW,EAAE,IAAI;EACjB,OAAO,EAAE,MAAM;;AAGnB,oBAAU;EACR,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,KAAK;;AACd,sBAAE;EACA,KAAK,EClTO,OAAO;EDmTnB,eAAe,EAAE,IAAI;EACrB,UAAU,ECzNF,OAAuB;ED0N/B,OAAO,EAAE,KAAK;;AAIpB,kBAAS;EACP,OAAO,EAAE,aAAa;EACtB,OAAO,EAAE,KAAK;;AACd,sBAAI;EACF,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI", -"sources": ["scss/menu.scss","scss/_variables.scss","scss/_base.scss"], -"names": [], -"file": "menu.css" -} +{"version":3,"sourceRoot":"","sources":["scss/menu.scss","scss/_variables.scss","scss/_base.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AC+FA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACwEA;EACE;EACA;EACA;EACA;;;AAwIF;EACE,OD5PgB;EC6PhB;EACA;EACA;;;AFhTF;EACE,YCPmB;EDQnB;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE,OCGc;;ADAhB;EACE;;AAEA;EACE;;AAGF;EACE,OCTY;EDUZ;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;AAMR;EACE;EACA,OCgBE;EDfF;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAKF;EACE;EACA;EACA,OCLA;EDMA;EACA;;AAEA;EACE;EACA,OCXF;;ADeF;EACE;EACA;EACA,OCtCS;EDuCT,QCxCS;EDyCT;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA,OC7BA;;ADkCF;EACE;;AAKE;EACE;;AAKE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAOF;EACE;;AAMJ;EACE;EACA;EACA;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA,OC7FI;ED8FJ;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EAEA;;AAEA;EAEE;;AAKE;EACE,OCnKY;EDoKZ;;AAIJ;EACE,YC5HA;ED6HA;EACA,OC3Kc;ED4Kd;;AAEA;EACE,YC/KY;EDgLZ,OCnIF;;ADwIA;EACE;EACA;;AAKE;EACE;EACA;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAEA;EACE;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAMJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA,YC3NI;;AD6NF;EAEE,YC5Qc;;AD8QhB;EACE;;AAMF;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAGJ;EACE;EACA;;AACA;EACE,OCzTY;ED0TZ;EACA,YChOQ;EDiOR;;AAIN;EACE;EACA;;AACA;EACE;EACA","file":"menu.css"} \ No newline at end of file diff --git a/skin/adminhtml/default/openmage/scss/menu.scss b/skin/adminhtml/default/openmage/scss/menu.scss index 3c8962c5389..5777a526b57 100644 --- a/skin/adminhtml/default/openmage/scss/menu.scss +++ b/skin/adminhtml/default/openmage/scss/menu.scss @@ -145,6 +145,14 @@ } } + &.level1, &.level2, &.level3 { + > a { + &.active:not(:hover) { + background: darken($white,10); + } + } + } + &#bubblelauncher-status { a { background-position: center 8px; diff --git a/skin/frontend/base/default/lib/prototype/windows/themes/magento.css b/skin/frontend/base/default/lib/prototype/windows/themes/magento.css index 739ddbf721d..64d30eb3eb3 100644 --- a/skin/frontend/base/default/lib/prototype/windows/themes/magento.css +++ b/skin/frontend/base/default/lib/prototype/windows/themes/magento.css @@ -8,7 +8,7 @@ * @category design * @package base_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ .dialog { border:1px solid #555; } diff --git a/skin/frontend/rwd/default/css/madisonisland.css b/skin/frontend/rwd/default/css/madisonisland.css index a92f0d7764b..a59655f2c32 100644 --- a/skin/frontend/rwd/default/css/madisonisland.css +++ b/skin/frontend/rwd/default/css/madisonisland.css @@ -8,7 +8,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* ============================================ * diff --git a/skin/frontend/rwd/default/css/styles.css b/skin/frontend/rwd/default/css/styles.css index 21e2e8b88d2..ee82cf2e317 100644 --- a/skin/frontend/rwd/default/css/styles.css +++ b/skin/frontend/rwd/default/css/styles.css @@ -8,7 +8,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /*! normalize.css v2.0.1 | MIT License | git.io/normalize */ diff --git a/skin/frontend/rwd/default/js/configurableswatches/product-media.js b/skin/frontend/rwd/default/js/configurableswatches/product-media.js index 7e8afe736a6..4280750410f 100644 --- a/skin/frontend/rwd/default/js/configurableswatches/product-media.js +++ b/skin/frontend/rwd/default/js/configurableswatches/product-media.js @@ -8,7 +8,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/skin/frontend/rwd/default/js/configurableswatches/swatches-list.js b/skin/frontend/rwd/default/js/configurableswatches/swatches-list.js index 7613bd075d5..fe17f79872f 100644 --- a/skin/frontend/rwd/default/js/configurableswatches/swatches-list.js +++ b/skin/frontend/rwd/default/js/configurableswatches/swatches-list.js @@ -8,7 +8,7 @@ * @category design * @package rwd_default * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/skin/frontend/rwd/default/scss/_var.scss b/skin/frontend/rwd/default/scss/_var.scss index 13007dc4c00..0a468021248 100644 --- a/skin/frontend/rwd/default/scss/_var.scss +++ b/skin/frontend/rwd/default/scss/_var.scss @@ -8,7 +8,7 @@ // @category design // @package rwd_default // @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) -// @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) +// @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) // @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) // diff --git a/skin/frontend/rwd/default/scss/content/_category.scss b/skin/frontend/rwd/default/scss/content/_category.scss index d70e505f2c4..610e3cfa9e1 100644 --- a/skin/frontend/rwd/default/scss/content/_category.scss +++ b/skin/frontend/rwd/default/scss/content/_category.scss @@ -8,7 +8,7 @@ // @category design // @package rwd_default // @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) -// @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) +// @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) // @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) // diff --git a/skin/frontend/rwd/default/scss/layout/_header-nav.scss b/skin/frontend/rwd/default/scss/layout/_header-nav.scss index 3ad96c3ff52..9dafee967c9 100644 --- a/skin/frontend/rwd/default/scss/layout/_header-nav.scss +++ b/skin/frontend/rwd/default/scss/layout/_header-nav.scss @@ -8,7 +8,7 @@ // @category design // @package rwd_default // @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) -// @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) +// @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) // @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) // diff --git a/skin/frontend/rwd/default/scss/module/_account-reviews.scss b/skin/frontend/rwd/default/scss/module/_account-reviews.scss index e42bf369b9e..10a367b712e 100644 --- a/skin/frontend/rwd/default/scss/module/_account-reviews.scss +++ b/skin/frontend/rwd/default/scss/module/_account-reviews.scss @@ -8,7 +8,7 @@ // @category design // @package rwd_default // @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) -// @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) +// @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org) // @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) // diff --git a/tests/.htaccess b/tests/.htaccess new file mode 100644 index 00000000000..93169e4eb44 --- /dev/null +++ b/tests/.htaccess @@ -0,0 +1,2 @@ +Order deny,allow +Deny from all diff --git a/tests/bootstrap.php b/tests/bootstrap.php new file mode 100644 index 00000000000..2d096b78be5 --- /dev/null +++ b/tests/bootstrap.php @@ -0,0 +1,6 @@ +assertEquals($expectedResult, class_exists($class)); + } + + /** + * @return array> + */ + public function provideClassExistsData(): array + { + return [ + 'class exists #1' => [ + true, + 'Mage' + ], + 'class exists #2' => [ + true, + 'Mage_Eav_Model_Entity_Increment_Numeric' + ], + 'class not exists' => [ + false, + 'Mage_Non_Existent' + ], + ]; + } +} diff --git a/tests/unit/Base/XmlFileLoadingTest.php b/tests/unit/Base/XmlFileLoadingTest.php new file mode 100644 index 00000000000..21f5786ee29 --- /dev/null +++ b/tests/unit/Base/XmlFileLoadingTest.php @@ -0,0 +1,67 @@ +assertNotEmpty($simplexml->asXML()); + } + + /** + * + * @dataProvider provideXmlFiles + */ + public function testXmlReaderIsValid(string $filepath): void + { + /** @var XMLReader $xml */ + $xml = XMLReader::open($filepath); + $xml->setParserProperty(XMLReader::VALIDATE, true); + $this->assertTrue($xml->isValid()); + } + + /** + * @return string[][] + */ + public function provideXmlFiles(): array + { + // phpcs:ignore Ecg.Security.ForbiddenFunction.Found + $root = realpath(__DIR__ . '/../../../') . '/'; + + return [ + 'file from vendor directory' => [ + $root . 'vendor/shardj/zf1-future/library/Zend/Locale/Data/es_419.xml' + ], + ]; + } +} diff --git a/tests/unit/Mage/Admin/Helper/BlockTest.php b/tests/unit/Mage/Admin/Helper/BlockTest.php new file mode 100644 index 00000000000..e1a00662bae --- /dev/null +++ b/tests/unit/Mage/Admin/Helper/BlockTest.php @@ -0,0 +1,51 @@ +subject = Mage::helper('admin/block'); + } + + /** + * @group Mage_Admin + * @group Mage_Admin_Helper + */ + public function testIsTypeAllowed(): void + { + $this->assertIsBool($this->subject->isTypeAllowed('some-type')); + } + + /** + * @group Mage_Admin + * @group Mage_Admin_Helper + */ + public function testGetDisallowedBlockNames(): void + { + $this->assertIsArray($this->subject->getDisallowedBlockNames()); + } +} diff --git a/tests/unit/Mage/Admin/Helper/DataTest.php b/tests/unit/Mage/Admin/Helper/DataTest.php new file mode 100644 index 00000000000..1e35f4a51d7 --- /dev/null +++ b/tests/unit/Mage/Admin/Helper/DataTest.php @@ -0,0 +1,51 @@ +subject = Mage::helper('admin/data'); + } + + /** + * @group Mage_Admin + * @group Mage_Admin_Helper + */ + public function testGenerateResetPasswordLinkToken(): void + { + $this->assertIsString($this->subject->generateResetPasswordLinkToken()); + } + + /** + * @group Mage_Admin + * @group Mage_Admin_Helper + */ + public function testGetResetPasswordLinkExpirationPeriod(): void + { + $this->assertIsInt($this->subject->getResetPasswordLinkExpirationPeriod()); + } +} diff --git a/tests/unit/Mage/Admin/Model/UserTest.php b/tests/unit/Mage/Admin/Model/UserTest.php new file mode 100644 index 00000000000..52bacec5d81 --- /dev/null +++ b/tests/unit/Mage/Admin/Model/UserTest.php @@ -0,0 +1,146 @@ +subject = Mage::getModel('admin/user'); + } + + /** + * @dataProvider provideValidateData + * @param array|true $expectedResult + * + * @group Mage_Admin + * @group Mage_Admin_Model + */ + public function testValidate($expectedResult, array $methods): void + { + $mock = $this->getMockBuilder(Mage_Admin_Model_User::class) + ->setMethods([ + 'hasNewPassword', + 'getNewPassword', + 'hasPassword', + 'getPassword', + ]) + ->getMock(); + + $mock->expects($this->any())->method('hasNewPassword')->willReturn($methods['hasNewPassword']); + $mock->expects($this->any())->method('getNewPassword')->willReturn($methods['getNewPassword']); + $mock->expects($this->any())->method('hasPassword')->willReturn($methods['hasPassword']); + $mock->expects($this->any())->method('getPassword')->willReturn($methods['getPassword']); + // phpcs:ignore Ecg.Security.ForbiddenFunction.Found + $this->assertEquals($expectedResult, $mock->validate()); + } + + /** + * @return array> + */ + public function provideValidateData(): array + { + return [ + 'test_fails_1' => [ + [ + 0 => 'User Name is required field.', + 1 => 'First Name is required field.', + 2 => 'Last Name is required field.', + 3 => 'Please enter a valid email.', + 4 => 'Password must be at least of 14 characters.', + 5 => 'Password must include both numeric and alphabetic characters.', + ], + [ + 'hasNewPassword' => true, + 'getNewPassword' => '123', + 'hasPassword' => false, + 'getPassword' => '456', + ] + ], + 'test_fails_2' => [ + [ + 0 => 'User Name is required field.', + 1 => 'First Name is required field.', + 2 => 'Last Name is required field.', + 3 => 'Please enter a valid email.', + 4 => 'Password must be at least of 14 characters.', + 5 => 'Password must include both numeric and alphabetic characters.', + ], + [ + 'hasNewPassword' => false, + 'getNewPassword' => '123', + 'hasPassword' => true, + 'getPassword' => '456', + ] + ], + ]; + } + + /** + * @group Mage_Admin + * @group Mage_Admin_Model + */ + public function testValidateCurrentPassword(): void + { + $this->assertIsArray($this->subject->validateCurrentPassword('')); + $this->assertIsArray($this->subject->validateCurrentPassword('123')); + } + + /** + * @group Mage_Admin + * @group Mage_Admin_Model + */ + public function testLoadByUsername(): void + { + $this->assertInstanceOf(Mage_Admin_Model_User::class, $this->subject->loadByUsername('invalid-user')); + } + + /** + * @group Mage_Admin + * @group Mage_Admin_Model + */ + public function testChangeResetPasswordLinkToken(): void + { + $this->assertInstanceOf(Mage_Admin_Model_User::class, $this->subject->changeResetPasswordLinkToken('123')); + } + + /** + * @group Mage_Admin + * @group Mage_Admin_Model + */ + public function testIsResetPasswordLinkTokenExpired(): void + { + $this->assertIsBool($this->subject->isResetPasswordLinkTokenExpired()); + } + + /** + * @group Mage_Admin + * @group Mage_Admin_Model + */ + public function testSendPasswordResetConfirmationEmail(): void + { + $this->assertInstanceOf(Mage_Admin_Model_User::class, $this->subject->sendPasswordResetConfirmationEmail()); + } +} diff --git a/tests/unit/Mage/Admin/Model/VariableTest.php b/tests/unit/Mage/Admin/Model/VariableTest.php new file mode 100644 index 00000000000..04e2558a40e --- /dev/null +++ b/tests/unit/Mage/Admin/Model/VariableTest.php @@ -0,0 +1,84 @@ +subject = Mage::getModel('admin/variable'); + } + + /** + * @dataProvider provideValidateData + * @param array|true $expectedResult + * + * @group Mage_Admin + */ + public function testValidate($expectedResult, string $variableName, string $isAllowed): void + { + $mock = $this->getMockBuilder(Mage_Admin_Model_Variable::class) + ->setMethods(['getVariableName', 'getIsAllowed']) + ->getMock(); + + $mock->expects($this->any())->method('getVariableName')->willReturn($variableName); + $mock->expects($this->any())->method('getIsAllowed')->willReturn($isAllowed); + $this->assertEquals($expectedResult, $mock->validate()); + } + + /** + * @return array> + */ + public function provideValidateData(): array + { + return [ + 'test_passes' => [ + true, + 'test', + '1' + ], + 'test_error_empty' => [ + [0 => 'Variable Name is required field.'], + '', + '1' + ], + 'test_error_regex' => [ + [0 => 'Variable Name is incorrect.'], + '#invalid-name#', + '1' + ], + 'test_error_allowed' => [ + [0 => 'Is Allowed is required field.'], + 'test', + 'invalid' + ], + ]; + } + + public function testIsPathAllowed(): void + { + $this->assertIsBool($this->subject->isPathAllowed('invalid-path')); + } +} diff --git a/tests/unit/Mage/AdminNotification/Model/FeedTest.php b/tests/unit/Mage/AdminNotification/Model/FeedTest.php new file mode 100644 index 00000000000..0bc2d458d4c --- /dev/null +++ b/tests/unit/Mage/AdminNotification/Model/FeedTest.php @@ -0,0 +1,51 @@ +subject = Mage::getModel('adminnotification/feed'); + } + + /** + * @group Mage_AdminNotification + * @group Mage_AdminNotification_Model + */ + public function testGetFeedUrl(): void + { + $this->assertIsString($this->subject->getFeedUrl()); + } + + /** + * @group Mage_AdminNotification + * @group Mage_AdminNotification_Model + */ + public function testCheckUpdate(): void + { + $this->assertInstanceOf(Mage_AdminNotification_Model_Feed::class, $this->subject->checkUpdate()); + } +} diff --git a/tests/unit/Mage/Adminhtml/Block/Cms/PageTest.php.tmp b/tests/unit/Mage/Adminhtml/Block/Cms/PageTest.php.tmp new file mode 100644 index 00000000000..1922944509f --- /dev/null +++ b/tests/unit/Mage/Adminhtml/Block/Cms/PageTest.php.tmp @@ -0,0 +1,48 @@ +subject = new Mage_Adminhtml_Block_Cms_Page(); + } + + /** + * @return void + * + * @group Mage_Adminhtml + * @group Mage_Adminhtml_Block + */ + public function testGetHeaderCssClass(): void + { + #$this->assertSame(Mage_Adminhtml_Block_Cms_Page::class, $this->subject->getHeaderCssClass()); + } +} diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AccountTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AccountTest.php new file mode 100644 index 00000000000..285320d1597 --- /dev/null +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AccountTest.php @@ -0,0 +1,56 @@ +subject = new Mage_Adminhtml_Block_Customer_Edit_Tab_Account(); + } + + /** + * @throws Mage_Core_Exception + * + * @group Mage_Adminhtml + * @group Mage_Adminhtml_Block + */ +// public function testInitForm(): void +// { +// $mock = $this->getMockBuilder(Mage_Adminhtml_Block_Customer_Edit_Tab_Account::class) +// ->setMethods(['getRegistryCurrentCustomer']) +// ->getMock(); +// +// $mock->expects($this->any()) +// ->method('getRegistryCurrentCustomer') +// // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation +// ->willReturn(new Mage_Customer_Model_Customer); +// +// $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Account::class, $mock->initForm()); +// } +} diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php new file mode 100644 index 00000000000..c378f22e685 --- /dev/null +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php @@ -0,0 +1,57 @@ +subject = new Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses(); + } + + /** + * @group Mage_Adminhtml + * @group Mage_Adminhtml_Block + */ + public function testInitForm(): void + { + $mock = $this->getMockBuilder(Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::class) + ->setMethods(['getRegistryCurrentCustomer', 'isReadonly']) + ->getMock(); + + $mock->expects($this->any()) + ->method('getRegistryCurrentCustomer') + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation + ->willReturn(new Mage_Customer_Model_Customer()); + + $mock->expects($this->any()) + ->method('isReadonly') + ->willReturn(true); + + $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::class, $mock->initForm()); + } +} diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php new file mode 100644 index 00000000000..94a24582212 --- /dev/null +++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php @@ -0,0 +1,54 @@ +subject = new Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter(); + } + + /** + * + * @group Mage_Adminhtml + * @group Mage_Adminhtml_Block + */ + public function testInitForm(): void + { + $mock = $this->getMockBuilder(Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter::class) + ->setMethods(['getRegistryCurrentCustomer']) + ->getMock(); + + $mock->expects($this->any()) + ->method('getRegistryCurrentCustomer') + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation + ->willReturn(new Mage_Customer_Model_Customer()); + + $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter::class, $mock->initForm()); + } +} diff --git a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php new file mode 100644 index 00000000000..6ce95285fd4 --- /dev/null +++ b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php @@ -0,0 +1,42 @@ +subject = new Mage_Adminhtml_Block_System_Cache_Form(); + } + + /** + * @group Mage_Adminhtml + */ + public function testInitForm(): void + { + $this->assertInstanceOf(Mage_Adminhtml_Block_System_Cache_Form::class, $this->subject->initForm()); + } +} diff --git a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php new file mode 100644 index 00000000000..db3e41430fe --- /dev/null +++ b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php @@ -0,0 +1,42 @@ +subject = new Mage_Adminhtml_Block_System_Config_Form(); + } + + /** + * @group Mage_Adminhtml + */ + public function testInitForm(): void + { + $this->assertInstanceOf(Mage_Adminhtml_Block_System_Config_Form::class, $this->subject->initForm()); + } +} diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php new file mode 100644 index 00000000000..433b9c1d4fe --- /dev/null +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php @@ -0,0 +1,53 @@ +subject = new Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View(); + } + + /** + * @group Mage_Adminhtml + * @group Mage_Adminhtml_Block + */ + public function testInitForm(): void + { + $mock = $this->getMockBuilder(Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View::class) + ->setMethods(['getRegistryCurrentConvertProfile']) + ->getMock(); + + $mock->expects($this->any()) + ->method('getRegistryCurrentConvertProfile') + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation + ->willReturn(new Mage_Dataflow_Model_Profile()); + + $this->assertInstanceOf(Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View::class, $mock->initForm()); + } +} diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php new file mode 100644 index 00000000000..ae38cdfa4f7 --- /dev/null +++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php @@ -0,0 +1,53 @@ +subject = new Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Edit(); + } + + /** + * @group Mage_Adminhtml + * @group Mage_Adminhtml_Block + */ + public function testInitForm(): void + { + $mock = $this->getMockBuilder(Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Edit::class) + ->setMethods(['getRegistryCurrentConvertProfile']) + ->getMock(); + + $mock->expects($this->any()) + ->method('getRegistryCurrentConvertProfile') + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation + ->willReturn(new Mage_Dataflow_Model_Profile()); + + $this->assertInstanceOf(Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Edit::class, $mock->initForm()); + } +} diff --git a/tests/unit/Mage/Cms/Block/BlockTest.php b/tests/unit/Mage/Cms/Block/BlockTest.php new file mode 100644 index 00000000000..28b80285b7c --- /dev/null +++ b/tests/unit/Mage/Cms/Block/BlockTest.php @@ -0,0 +1,54 @@ +getMockBuilder(Mage_Cms_Block_Block::class) + ->setMethods(['getBlockId']) + ->getMock(); + + $mock->expects($this->any())->method('getBlockId')->willReturn($blockId); + $this->assertIsArray($mock->getCacheKeyInfo()); + } + + /** + * @return array[] + */ + public function provideGetCacheKeyInfoData(): array + { + return [ + 'valid block ID' => [ + '2' + ], + 'invalid block ID' => [ + '0' + ] + ]; + } +} diff --git a/tests/unit/Mage/Cms/Block/PageTest.php b/tests/unit/Mage/Cms/Block/PageTest.php new file mode 100644 index 00000000000..7e6bf982ea7 --- /dev/null +++ b/tests/unit/Mage/Cms/Block/PageTest.php @@ -0,0 +1,55 @@ +getMockBuilder(Mage_Cms_Block_Page::class) + ->setMethods(['getPageId']) + ->getMock(); + + $mock->expects($this->any())->method('getPageId')->willReturn($pageId); + $this->assertInstanceOf(Mage_Cms_Model_Page::class, $mock->getPage()); + } + + /** + * @return array[] + */ + public function provideGetPageData(): array + { + return [ + 'valid page ID' => [ + '2' + ], + 'invalid page ID' => [ + '0' + ] + ]; + } +} diff --git a/tests/unit/Mage/Cms/Block/Widget/BlockTest.php b/tests/unit/Mage/Cms/Block/Widget/BlockTest.php new file mode 100644 index 00000000000..32e53b340b2 --- /dev/null +++ b/tests/unit/Mage/Cms/Block/Widget/BlockTest.php @@ -0,0 +1,73 @@ +subject = new Mage_Cms_Block_Widget_Block(); + } + + /** + * @dataProvider provideGetCacheKeyInfoData + * @group Mage_Cms + * @group Mage_Cms_Block + */ + public function testGetCacheKeyInfo(string $blockId): void + { + $mock = $this->getMockBuilder(Mage_Cms_Block_Widget_Block::class) + ->setMethods(['getBlockId']) + ->getMock(); + + $mock->expects($this->any())->method('getBlockId')->willReturn($blockId); + $this->assertIsArray($mock->getCacheKeyInfo()); + } + + /** + * @return array[] + */ + public function provideGetCacheKeyInfoData(): array + { + return [ + 'valid block ID' => [ + '2' + ], + 'invalid block ID' => [ + '0' + ] + ]; + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Block + */ + public function testIsRequestFromAdminArea(): void + { + $this->assertIsBool($this->subject->isRequestFromAdminArea()); + } +} diff --git a/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php b/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php new file mode 100644 index 00000000000..a08bf86c9e2 --- /dev/null +++ b/tests/unit/Mage/Cms/Block/Widget/Page/LinkTest.php @@ -0,0 +1,61 @@ +subject = new Mage_Cms_Block_Widget_Page_Link(); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Block + */ + public function testGetHref(): void + { + $this->assertIsString($this->subject->getHref()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Block + */ + public function testGetTitle(): void + { + $this->assertIsString($this->subject->getTitle()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Block + */ +// public function testGetAnchorText(): void +// { +// $this->assertIsString($this->subject->getAnchorText()); +// } +} diff --git a/tests/unit/Mage/Cms/Helper/DataTest.php b/tests/unit/Mage/Cms/Helper/DataTest.php new file mode 100644 index 00000000000..953c9267e55 --- /dev/null +++ b/tests/unit/Mage/Cms/Helper/DataTest.php @@ -0,0 +1,72 @@ +subject = Mage::helper('cms/data'); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Helper + */ + public function testGetAllowedStreamWrappers(): void + { + $this->assertIsArray($this->subject->getAllowedStreamWrappers()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Helper + */ + public function testGetBlockTemplateProcessor(): void + { + $this->assertInstanceOf(Varien_Filter_Template::class, $this->subject->getBlockTemplateProcessor()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Helper + */ + public function testGetPageTemplateProcessor(): void + { + $this->assertInstanceOf(Varien_Filter_Template::class, $this->subject->getPageTemplateProcessor()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Helper + */ + public function testIsSwfDisabled(): void + { + $this->assertTrue($this->subject->isSwfDisabled()); + } +} diff --git a/tests/unit/Mage/Cms/Helper/Wysiwyg/ImagesTest.php b/tests/unit/Mage/Cms/Helper/Wysiwyg/ImagesTest.php new file mode 100644 index 00000000000..d84135dbafb --- /dev/null +++ b/tests/unit/Mage/Cms/Helper/Wysiwyg/ImagesTest.php @@ -0,0 +1,110 @@ +subject = Mage::helper('cms/wysiwyg_images'); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Helper + */ + public function testGetCurrentPath(): void + { + $this->assertIsString($this->subject->getCurrentPath()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Helper + */ + public function testGetCurrentUrl(): void + { + $this->assertIsString($this->subject->getCurrentUrl()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Helper + */ + public function testGetStorage(): void + { + $this->assertInstanceOf(Mage_Cms_Model_Wysiwyg_Images_Storage::class, $this->subject->getStorage()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Helper + */ + public function testIdEncode(): void + { + $this->assertIsString($this->subject->idEncode(self::TEST_STRING)); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Helper + */ + public function testIdDecode(): void + { + $this->assertIsString($this->subject->idDecode(self::TEST_STRING)); + } + + /** + * @dataProvider provideGetShortFilenameData + * @group Mage_Cms + * @group Mage_Cms_Helper + */ + public function testGetShortFilename(string $expectedResult, string $filename, int $maxLength): void + { + $this->assertEquals($expectedResult, $this->subject->getShortFilename($filename, $maxLength)); + } + + /** + * @return array[] + */ + public function provideGetShortFilenameData(): array + { + return [ + 'full length' => [ + '0123456789', + self::TEST_STRING, + 20, + ], + 'truncated' => [ + '01234...', + self::TEST_STRING, + 5, + ] + ]; + } +} diff --git a/tests/unit/Mage/Cms/Model/PageTest.php b/tests/unit/Mage/Cms/Model/PageTest.php new file mode 100644 index 00000000000..5e5779c8a2b --- /dev/null +++ b/tests/unit/Mage/Cms/Model/PageTest.php @@ -0,0 +1,88 @@ +subject = Mage::getModel('cms/page'); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testLoad(): void + { + $this->assertInstanceOf(Mage_Cms_Model_Page::class, $this->subject->load(null)); + $this->assertInstanceOf(Mage_Cms_Model_Page::class, $this->subject->load(2)); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testCheckIdentifier(): void + { + $this->assertIsString($this->subject->checkIdentifier('home', 1)); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testGetCmsPageTitleByIdentifier(): void + { + $this->assertNotFalse($this->subject->getCmsPageTitleByIdentifier('home')); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testGetCmsPageTitleById(): void + { + $this->assertNotFalse($this->subject->getCmsPageTitleById(2)); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testGetCmsPageIdentifierById(): void + { + $this->assertNotFalse($this->subject->getCmsPageIdentifierById(2)); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testGetAvailableStatuses(): void + { + $this->assertIsArray($this->subject->getAvailableStatuses()); + } +} diff --git a/tests/unit/Mage/Cms/Model/Wysiwyg/ConfigTest.php b/tests/unit/Mage/Cms/Model/Wysiwyg/ConfigTest.php new file mode 100644 index 00000000000..c106ba0c128 --- /dev/null +++ b/tests/unit/Mage/Cms/Model/Wysiwyg/ConfigTest.php @@ -0,0 +1,82 @@ +subject = Mage::getModel('cms/wysiwyg_config'); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + * @runInSeparateProcess + */ + public function testGetConfig(): void + { + $this->assertInstanceOf(Varien_Object::class, $this->subject->getConfig()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testGetSkinImagePlaceholderUrl(): void + { + $this->assertIsString($this->subject->getSkinImagePlaceholderUrl()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testGetSkinImagePlaceholderPath(): void + { + $this->assertIsString($this->subject->getSkinImagePlaceholderPath()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testIsEnabled(): void + { + $this->assertIsBool($this->subject->isEnabled()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testIsHidden(): void + { + $this->assertIsBool($this->subject->isHidden()); + } +} diff --git a/tests/unit/Mage/Cms/Model/Wysiwyg/Images/StorageTest.php b/tests/unit/Mage/Cms/Model/Wysiwyg/Images/StorageTest.php new file mode 100644 index 00000000000..cdbf85fd8ff --- /dev/null +++ b/tests/unit/Mage/Cms/Model/Wysiwyg/Images/StorageTest.php @@ -0,0 +1,93 @@ +subject = Mage::getModel('cms/wysiwyg_images_storage'); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testGetThumbsPath(): void + { + $this->assertIsString($this->subject->getThumbsPath()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + * @runInSeparateProcess + */ + public function testResizeOnTheFly(): void + { + $this->assertFalse($this->subject->resizeOnTheFly('not-existing.jpeg')); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testGetHelper(): void + { + $this->assertInstanceOf(Mage_Cms_Helper_Wysiwyg_Images::class, $this->subject->getHelper()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + * @runInSeparateProcess + */ + public function testGetSession(): void + { + $this->assertInstanceOf(Mage_Adminhtml_Model_Session::class, $this->subject->getSession()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testGetThumbnailRoot(): void + { + $this->assertIsString($this->subject->getThumbnailRoot()); + } + + /** + * @group Mage_Cms + * @group Mage_Cms_Model + */ + public function testIsImage(): void + { + $this->assertIsBool($this->subject->isImage('test.jpeg')); + } +} diff --git a/tests/unit/Mage/Core/Helper/CookieTest.php b/tests/unit/Mage/Core/Helper/CookieTest.php new file mode 100644 index 00000000000..86f02e54a76 --- /dev/null +++ b/tests/unit/Mage/Core/Helper/CookieTest.php @@ -0,0 +1,69 @@ +subject = Mage::helper('core/cookie'); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testIsUserNotAllowSaveCookie(): void + { + $this->assertIsBool($this->subject->isUserNotAllowSaveCookie()); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetAcceptedSaveCookiesWebsiteIds(): void + { + $this->assertIsString($this->subject->getAcceptedSaveCookiesWebsiteIds()); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetCookieRestrictionLifetime(): void + { + $this->assertIsInt($this->subject->getCookieRestrictionLifetime()); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetCookieRestrictionNoticeCmsBlockIdentifier(): void + { + $this->assertIsString($this->subject->getCookieRestrictionNoticeCmsBlockIdentifier()); + } +} diff --git a/tests/unit/Mage/Core/Helper/DataTest.php b/tests/unit/Mage/Core/Helper/DataTest.php new file mode 100644 index 00000000000..0ebb92464b2 --- /dev/null +++ b/tests/unit/Mage/Core/Helper/DataTest.php @@ -0,0 +1,137 @@ +subject = Mage::helper('core/data'); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetEncryptor(): void + { + $this->assertInstanceOf(Mage_Core_Model_Encryption::class, $this->subject->getEncryptor()); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testEncrypt(): void + { + $this->assertIsString($this->subject->encrypt('test')); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testDecrypt(): void + { + $this->assertIsString($this->subject->decrypt('test')); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testValidateKey(): void + { + $this->assertInstanceOf(Varien_Crypt_Mcrypt::class, $this->subject->validateKey('test')); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetRandomString(): void + { + $this->assertIsString($this->subject->getRandomString(5)); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetHash(): void + { + $this->assertIsString($this->subject->getHash('test')); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetHashPassword(): void + { + $this->assertIsString($this->subject->getHashPassword('test', 1)); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testValidateHash(): void + { + $this->assertIsBool($this->subject->validateHash('test', '1')); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetStoreId(): void + { + $this->assertIsString($this->subject->getStoreId()); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testRemoveAccents(): void + { + $str = 'Ae-Ä Oe-Ö Ue-Ü ae-ä oe-ö ue-ü'; + $this->assertEquals('Ae-Ae Oe-Oe Ue-Ue ae-ae oe-oe ue-ue', $this->subject->removeAccents($str, true)); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testIsDevAllowed(): void + { + $this->assertIsBool($this->subject->isDevAllowed()); + } +} diff --git a/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php similarity index 72% rename from dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php rename to tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php index ed7911d29ba..d5f22a6378c 100644 --- a/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php +++ b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php @@ -1,69 +1,98 @@ buildPath($section, $group, $field); - } +namespace OpenMage\Tests\Unit\Mage\Core\Helper; - public function exposedBuildNodePath(string $scope, string $path): string - { - return $this->buildNodePath($scope, $path); - } -} +use Mage; +use Mage_Core_Exception; +use Mage_Core_Helper_EnvironmentConfigLoader; +use PHPUnit\Framework\TestCase; +use Varien_Simplexml_Config; class EnvironmentConfigLoaderTest extends TestCase { + public const XML_PATH_GENERAL = 'general/store_information/name'; + + public const XML_PATH_DEFAULT = 'default/general/store_information/name'; + + public const XML_PATH_WEBSITE = 'websites/base/general/store_information/name'; + + public const XML_PATH_STORE = 'stores/german/general/store_information/name'; + + /** + * @throws Mage_Core_Exception + */ public function setup(): void { - \Mage::setRoot(''); + Mage::setRoot(); } - public function testBuildPath() + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testBuildPath(): void { - $environmentConfigLoaderHelper = new TestEnvLoaderHelper(); + $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper(); $path = $environmentConfigLoaderHelper->exposedBuildPath('GENERAL', 'STORE_INFORMATION', 'NAME'); - $this->assertEquals('general/store_information/name', $path); + $this->assertEquals(self::XML_PATH_GENERAL, $path); } - public function testBuildNodePath() + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testBuildNodePath(): void { - $environmentConfigLoaderHelper = new TestEnvLoaderHelper(); - $nodePath = $environmentConfigLoaderHelper->exposedBuildNodePath('DEFAULT', 'general/store_information/name'); - $this->assertEquals('default/general/store_information/name', $nodePath); + $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper(); + $nodePath = $environmentConfigLoaderHelper->exposedBuildNodePath('DEFAULT', self::XML_PATH_GENERAL); + $this->assertEquals(self::XML_PATH_DEFAULT, $nodePath); } - public function test_xml_has_test_strings() + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testXmlHasTestStrings(): void { $xmlStruct = $this->getTestXml(); - $xml = new \Varien_Simplexml_Config(); + $xml = new Varien_Simplexml_Config(); $xml->loadString($xmlStruct); - $this->assertEquals('test_default', (string)$xml->getNode('default/general/store_information/name')); - $this->assertEquals('test_website', (string)$xml->getNode('websites/base/general/store_information/name')); - $this->assertEquals('test_store', (string)$xml->getNode('stores/german/general/store_information/name')); + $this->assertEquals('test_default', (string)$xml->getNode(self::XML_PATH_DEFAULT)); + $this->assertEquals('test_website', (string)$xml->getNode(self::XML_PATH_WEBSITE)); + $this->assertEquals('test_store', (string)$xml->getNode(self::XML_PATH_STORE)); } /** - * @dataProvider env_overrides_correct_config_keys - * @test + * @dataProvider envOverridesCorrectConfigKeysDataProvider + * + * @group Mage_Core + * @group Mage_Core_Helper */ - public function env_overrides_for_valid_config_keys(array $config) + public function testEnvOverridesForValidConfigKeys(array $config): void { $xmlStruct = $this->getTestXml(); - $xmlDefault = new \Varien_Simplexml_Config(); + $xmlDefault = new Varien_Simplexml_Config(); $xmlDefault->loadString($xmlStruct); - $xml = new \Varien_Simplexml_Config(); + $xml = new Varien_Simplexml_Config(); $xml->loadString($xmlStruct); - // act + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation $loader = new Mage_Core_Helper_EnvironmentConfigLoader(); $loader->setEnvStore([ $config['env_path'] => $config['value'] @@ -78,7 +107,10 @@ public function env_overrides_for_valid_config_keys(array $config) $this->assertNotEquals((string)$defaultValue, (string)$valueAfterOverride, 'Default value was not overridden.'); } - public function env_overrides_correct_config_keys(): array + /** + * @return array>> + */ + public function envOverridesCorrectConfigKeysDataProvider(): array { $defaultPath = 'OPENMAGE_CONFIG__DEFAULT__GENERAL__STORE_INFORMATION__NAME'; $defaultPathWithDash = 'OPENMAGE_CONFIG__DEFAULT__GENERAL__FOO-BAR__NAME'; @@ -96,7 +128,7 @@ public function env_overrides_correct_config_keys(): array [ 'Case DEFAULT overrides.' => [ 'case' => 'DEFAULT', - 'xml_path' => 'default/general/store_information/name', + 'xml_path' => self::XML_PATH_DEFAULT, 'env_path' => $defaultPath, 'value' => 'default_new_value' ] @@ -120,7 +152,7 @@ public function env_overrides_correct_config_keys(): array [ 'Case STORE overrides.' => [ 'case' => 'STORE', - 'xml_path' => 'stores/german/general/store_information/name', + 'xml_path' => self::XML_PATH_STORE, 'env_path' => $storePath, 'value' => 'store_new_value' ] @@ -144,7 +176,7 @@ public function env_overrides_correct_config_keys(): array [ 'Case WEBSITE overrides.' => [ 'case' => 'WEBSITE', - 'xml_path' => 'websites/base/general/store_information/name', + 'xml_path' => self::XML_PATH_WEBSITE, 'env_path' => $websitePath, 'value' => 'website_new_value' ] @@ -169,41 +201,44 @@ public function env_overrides_correct_config_keys(): array } /** - * @dataProvider env_does_not_override_on_wrong_config_keys - * @test + * @dataProvider envDoesNotOverrideOnWrongConfigKeysDataProvider + * @param array $config + * + * @group Mage_Core */ - public function env_does_not_override_for_invalid_config_keys(array $config) + public function testEnvDoesNotOverrideForInvalidConfigKeys(array $config): void { $xmlStruct = $this->getTestXml(); - $xmlDefault = new \Varien_Simplexml_Config(); + $xmlDefault = new Varien_Simplexml_Config(); $xmlDefault->loadString($xmlStruct); - $xml = new \Varien_Simplexml_Config(); + $xml = new Varien_Simplexml_Config(); $xml->loadString($xmlStruct); $defaultValue = 'test_default'; - $this->assertEquals($defaultValue, (string)$xml->getNode('default/general/store_information/name')); + $this->assertEquals($defaultValue, (string)$xml->getNode(self::XML_PATH_DEFAULT)); $defaultWebsiteValue = 'test_website'; - $this->assertEquals($defaultWebsiteValue, (string)$xml->getNode('websites/base/general/store_information/name')); + $this->assertEquals($defaultWebsiteValue, (string)$xml->getNode(self::XML_PATH_WEBSITE)); $defaultStoreValue = 'test_store'; - $this->assertEquals($defaultStoreValue, (string)$xml->getNode('stores/german/general/store_information/name')); + $this->assertEquals($defaultStoreValue, (string)$xml->getNode(self::XML_PATH_STORE)); - // act + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation $loader = new Mage_Core_Helper_EnvironmentConfigLoader(); $loader->setEnvStore([ $config['path'] => $config['value'] ]); $loader->overrideEnvironment($xml); + $valueAfterCheck = ''; switch ($config['case']) { case 'DEFAULT': - $valueAfterCheck = $xml->getNode('default/general/store_information/name'); + $valueAfterCheck = $xml->getNode(self::XML_PATH_DEFAULT); break; case 'STORE': - $valueAfterCheck = $xml->getNode('stores/german/general/store_information/name'); + $valueAfterCheck = $xml->getNode(self::XML_PATH_STORE); break; case 'WEBSITE': - $valueAfterCheck = $xml->getNode('websites/base/general/store_information/name'); + $valueAfterCheck = $xml->getNode(self::XML_PATH_WEBSITE); break; } @@ -211,11 +246,15 @@ public function env_does_not_override_for_invalid_config_keys(array $config) $this->assertTrue(!str_contains('value_will_not_be_changed', (string)$valueAfterCheck), 'Default value was wrongfully overridden.'); } - public function env_does_not_override_on_wrong_config_keys(): array + /** + * @return array>> + */ + public function envDoesNotOverrideOnWrongConfigKeysDataProvider(): array { $defaultPath = 'OPENMAGE_CONFIG__DEFAULT__GENERAL__ST'; $websitePath = 'OPENMAGE_CONFIG__WEBSITES__BASE__GENERAL__ST'; $storePath = 'OPENMAGE_CONFIG__STORES__GERMAN__GENERAL__ST'; + return [ [ 'Case DEFAULT with ' . $defaultPath . ' will not override.' => [ @@ -241,9 +280,6 @@ public function env_does_not_override_on_wrong_config_keys(): array ]; } - /** - * @return string - */ public function getTestXml(): string { return <<buildPath($section, $group, $field); + } + + public function exposedBuildNodePath(string $scope, string $path): string + { + return $this->buildNodePath($scope, $path); + } +} diff --git a/tests/unit/Mage/Core/Helper/HintTest.php b/tests/unit/Mage/Core/Helper/HintTest.php new file mode 100644 index 00000000000..8e46bef0a5d --- /dev/null +++ b/tests/unit/Mage/Core/Helper/HintTest.php @@ -0,0 +1,44 @@ +subject = Mage::helper('core/hint'); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetHintByCode(): void + { + $this->assertNull($this->subject->getHintByCode('test')); + } +} diff --git a/tests/unit/Mage/Core/Helper/JsTest.php b/tests/unit/Mage/Core/Helper/JsTest.php new file mode 100644 index 00000000000..af32162631f --- /dev/null +++ b/tests/unit/Mage/Core/Helper/JsTest.php @@ -0,0 +1,107 @@ +subject = Mage::helper('core/js'); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetTranslateJson(): void + { + $this->assertIsString($this->subject->getTranslateJson()); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetTranslatorScript(): void + { + $this->assertIsString($this->subject->getTranslatorScript()); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testIncludeScript(): void + { + $this->assertIsString($this->subject->includeScript('test')); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testIncludeSkinScript(): void + { + $this->assertIsString($this->subject->includeSkinScript('test')); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetDeleteConfirmJs(): void + { + $this->assertStringStartsWith('deleteConfirm', $this->subject->getDeleteConfirmJs('foo')); + $this->assertStringStartsWith('deleteConfirm', $this->subject->getDeleteConfirmJs('foo', 'bar')); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetConfirmSetLocationJs(): void + { + $this->assertStringStartsWith('confirmSetLocation', $this->subject->getConfirmSetLocationJs('foo')); + $this->assertStringStartsWith('confirmSetLocation', $this->subject->getConfirmSetLocationJs('foo', 'bar')); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetSetLocationJs(): void + { + $this->assertStringStartsWith('setLocation', $this->subject->getSetLocationJs('foo')); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetSaveAndContinueEditJs(): void + { + $this->assertStringStartsWith('saveAndContinueEdit', $this->subject->getSaveAndContinueEditJs('foo')); + } +} diff --git a/tests/unit/Mage/Core/Helper/PurifierTest.php b/tests/unit/Mage/Core/Helper/PurifierTest.php new file mode 100644 index 00000000000..2a4a613a747 --- /dev/null +++ b/tests/unit/Mage/Core/Helper/PurifierTest.php @@ -0,0 +1,45 @@ +subject = Mage::helper('core/purifier'); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testPurify(): void + { + $this->assertIsArray($this->subject->purify([])); + $this->assertIsString($this->subject->purify('')); + } +} diff --git a/tests/unit/Mage/Core/Helper/SecurityTest.php b/tests/unit/Mage/Core/Helper/SecurityTest.php new file mode 100644 index 00000000000..f674f16a82d --- /dev/null +++ b/tests/unit/Mage/Core/Helper/SecurityTest.php @@ -0,0 +1,148 @@ +subject = Mage::helper('core/security'); + } + + /** + * @return array|Mage_Page_Block_Html_Topmenu_Renderer|Mage_Core_Block_Template|string>> + * + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function validateAgainstBlockMethodBlacklistDataProvider(): array + { + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation + $topmenu = new Mage_Page_Block_Html_Topmenu_Renderer(); + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation + $template = new Mage_Core_Block_Template(); + + return [ + [ + $topmenu, + 'setData', + [] + ], + [ + $template, + 'setData', + [] + ], + ]; + } + + /** + * @dataProvider validateAgainstBlockMethodBlacklistDataProvider + * @doesNotPerformAssertions if data is correct, then NO exception is thrown, so we don't need an assertion + * @param string[] $args + * @throws Mage_Core_Exception + * + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testValidateAgainstBlockMethodBlacklist( + Mage_Core_Block_Abstract $block, + string $method, + array $args + ): void { + $this->subject->validateAgainstBlockMethodBlacklist($block, $method, $args); + } + + /** + * @return array|Mage_Page_Block_Html_Topmenu_Renderer|Mage_Core_Block_Template|string>> + */ + public function forbiddenBlockMethodsDataProvider(): array + { + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation + $topmenu = new Mage_Page_Block_Html_Topmenu_Renderer(); + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation + $template = new Mage_Core_Block_Template(); + + return [ + [ + $template, + 'fetchView', + [] + ], + [ + $topmenu, + 'fetchView', + [] + ], + [ + $topmenu, + 'render', + [] + ], + [ + $template, + 'Mage_Core_Block_Template::fetchView', + [] + ], + [ + $topmenu, + 'Mage_Page_Block_Html_Topmenu_Renderer::fetchView', + [] + ], + 'parent class name is passed as second arg' => [ + $topmenu, + 'Mage_Core_Block_Template::fetchView', + [] + ], + 'parent class name is passed as second arg2' => [ + $topmenu, + 'Mage_Core_Block_Template::render', + [] + ], + ]; + } + + /** + * @dataProvider forbiddenBlockMethodsDataProvider + * @param string[] $args + * @throws Mage_Core_Exception + * + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testValidateAgainstBlockMethodBlacklistThrowsException( + Mage_Core_Block_Abstract $block, + string $method, + array $args + ): void { + $this->expectExceptionMessage(sprintf('Action with combination block %s and method %s is forbidden.', get_class($block), $method)); + $this->subject->validateAgainstBlockMethodBlacklist($block, $method, $args); + } +} diff --git a/tests/unit/Mage/Core/Helper/StringTest.php b/tests/unit/Mage/Core/Helper/StringTest.php new file mode 100644 index 00000000000..46c0f38fcd3 --- /dev/null +++ b/tests/unit/Mage/Core/Helper/StringTest.php @@ -0,0 +1,148 @@ +subject = Mage::helper('core/string'); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testTruncate(): void + { + $this->assertEquals('', $this->subject->truncate(null)); + $this->assertEquals('', $this->subject->truncate(self::TEST_STRING, 0)); + + $this->assertEquals('', $this->subject->truncate(self::TEST_STRING, 3)); + + $remainder = ''; + $this->assertEquals('12...', $this->subject->truncate(self::TEST_STRING, 5, '...', $remainder, false)); + + $resultString = $this->subject->truncate(self::TEST_STRING, 5, '...'); + $this->assertEquals('12...', $resultString); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testSubstr(): void + { + $resultString = $this->subject->substr(self::TEST_STRING, 2, 2); + $this->assertEquals('34', $resultString); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testSplitInjection(): void + { + $resultString = $this->subject->splitInjection(self::TEST_STRING, 1, '-', ' '); + #$this->assertEquals('1-2-3-4-5-6-7-8-9-0-', $resultString); + $this->assertIsString($resultString); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testStrlen(): void + { + $this->assertEquals(10, $this->subject->strlen(self::TEST_STRING)); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testStrSplit(): void + { + $this->assertIsArray($this->subject->str_split('')); + $this->assertIsArray($this->subject->str_split(self::TEST_STRING)); + $this->assertIsArray($this->subject->str_split(self::TEST_STRING, 3)); + $this->assertIsArray($this->subject->str_split(self::TEST_STRING, 3, true, true)); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testSplitWords(): void + { + $this->assertIsArray($this->subject->splitWords(null)); + $this->assertIsArray($this->subject->splitWords('')); + $this->assertIsArray($this->subject->splitWords(self::TEST_STRING)); + $this->assertIsArray($this->subject->splitWords(self::TEST_STRING, true)); + $this->assertIsArray($this->subject->splitWords(self::TEST_STRING, true, 1)); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testParseQueryStr(): void + { + $this->assertIsArray($this->subject->parseQueryStr(self::TEST_STRING)); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetArrayHelper(): void + { + $this->assertInstanceOf(Mage_Core_Helper_Array::class, $this->subject->getArrayHelper()); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testUnserialize(): void + { + $this->assertNull($this->subject->unserialize(null)); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testValidateSerializedObject(): void + { + $this->assertIsBool($this->subject->validateSerializedObject(self::TEST_STRING)); + $this->assertIsBool($this->subject->validateSerializedObject(self::TEST_STRING_JSON)); + } +} diff --git a/tests/unit/Mage/Core/Helper/UrlTest.php b/tests/unit/Mage/Core/Helper/UrlTest.php new file mode 100644 index 00000000000..e6539bf1746 --- /dev/null +++ b/tests/unit/Mage/Core/Helper/UrlTest.php @@ -0,0 +1,108 @@ +subject = Mage::helper('core/url'); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetCurrentBase64Url(): void + { + $this->assertIsString($this->subject->getCurrentBase64Url()); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetEncodedUrl(): void + { + $this->assertIsString($this->subject->getEncodedUrl()); + $this->assertIsString($this->subject->getEncodedUrl(self::TEST_URL_1)); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testGetHomeUrl(): void + { + $this->assertIsString($this->subject->getHomeUrl()); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testAddRequestParam(): void + { + $this->assertIsString($this->subject->addRequestParam(self::TEST_URL_1, [0 => 'int'])); + $this->assertIsString($this->subject->addRequestParam(self::TEST_URL_1, ['null' => null])); + $this->assertIsString($this->subject->addRequestParam(self::TEST_URL_1, ['key' => 'value'])); + $this->assertIsString($this->subject->addRequestParam(self::TEST_URL_1, ['key' => ['subKey' => 'subValue']])); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testRemoveRequestParam(): void + { + $this->assertIsString($this->subject->removeRequestParam(self::TEST_URL_1, 'foo')); + $this->assertIsString($this->subject->removeRequestParam(self::TEST_URL_2, 'foo')); + } + + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testEncodePunycode(): void + { + $this->assertIsString($this->subject->encodePunycode(self::TEST_URL_1)); + $this->assertIsString($this->subject->encodePunycode(self::TEST_URL_PUNY)); + } + /** + * @group Mage_Core + * @group Mage_Core_Helper + */ + public function testDecodePunycode(): void + { + $this->assertIsString($this->subject->decodePunycode(self::TEST_URL_1)); + $this->assertIsString($this->subject->decodePunycode(self::TEST_URL_PUNY)); + } +} diff --git a/tests/unit/Mage/Core/Model/ConfigTest.php b/tests/unit/Mage/Core/Model/ConfigTest.php new file mode 100644 index 00000000000..7e90bd5d27a --- /dev/null +++ b/tests/unit/Mage/Core/Model/ConfigTest.php @@ -0,0 +1,38 @@ +subject = Mage::getModel('core/config'); + } + + /** + * @group Mage_Core + * @group Mage_Core_Model + */ + public function testSaveDeleteGetConfig(): void + { + $path = 'test/config'; + $value = 'foo'; + + $this->assertFalse($this->subject->getConfig($path)); + + $this->subject->saveConfig($path, $value); + $this->assertEquals($value, $this->subject->getConfig($path)); + + $this->subject->deleteConfig($path); + $this->assertFalse($this->subject->getConfig($path)); + } +} diff --git a/tests/unit/Mage/Core/Model/LocaleTest.php b/tests/unit/Mage/Core/Model/LocaleTest.php new file mode 100644 index 00000000000..8d36593db77 --- /dev/null +++ b/tests/unit/Mage/Core/Model/LocaleTest.php @@ -0,0 +1,77 @@ +subject = Mage::getModel('core/locale'); + } + + /** + * @dataProvider provideGetNumberData + * @param string|float|int $value + * + * @group Mage_Core + */ + public function testGetNumber(?float $expectedResult, $value): void + { + $this->assertEquals($expectedResult, $this->subject->getNumber($value)); + } + + /** + * @return array|float|int|string|null>> + */ + public function provideGetNumberData(): array + { + return [ + 'array' => [ + 1.0, + [1] + ], + 'int' => [ + 1.0, + 1 + ], + 'string' => [ + 1.0, + '1' + ], + 'string_comma' => [ + 1.0, + '1,0' + ], + 'string_dot' => [ + 1.0, + '1.0' + ], + 'null' => [ + null, + null + ], + ]; + } +} diff --git a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php new file mode 100644 index 00000000000..6cbc6f3a964 --- /dev/null +++ b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php @@ -0,0 +1,92 @@ +string'; + + public Mage_Core_Model_Security_HtmlEscapedString $subject; + + /** + * @dataProvider provideHtmlEscapedStringAsStringData + * @param array $allowedTags + * + * @group Mage_Core + */ + public function testToSting(string $expectedResult, string $string, ?array $allowedTags): void + { + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation + $this->subject = new Mage_Core_Model_Security_HtmlEscapedString($string, $allowedTags); + $this->assertEquals($expectedResult, $this->subject->__toString()); + } + + /** + * @dataProvider provideHtmlEscapedStringGetUnescapedValueData + * @param array $allowedTags + * + * @group Mage_Core + */ + public function testGetUnescapedValue(string $expectedResult, string $string, ?array $allowedTags): void + { + // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation + $this->subject = new Mage_Core_Model_Security_HtmlEscapedString($string, $allowedTags); + $this->assertEquals($expectedResult, $this->subject->getUnescapedValue()); + } + + /** + * @return array|string|null>> + */ + public function provideHtmlEscapedStringAsStringData(): array + { + return [ + 'tags_null' => [ + 'This is a bold <b>string</b>', + self::TEST_STRING, + null + ], + 'tags_array' => [ + self::TEST_STRING, + self::TEST_STRING, + ['b'] + ], + ]; + } + + /** + * @return array|string|null>> + */ + public function provideHtmlEscapedStringGetUnescapedValueData(): array + { + return [ + 'tags_null' => [ + self::TEST_STRING, + self::TEST_STRING, + null + ], + 'tags_array' => [ + self::TEST_STRING, + self::TEST_STRING, + ['some-invalid-value'] + ], + ]; + } +} diff --git a/tests/unit/Mage/Core/Model/UrlTest.php b/tests/unit/Mage/Core/Model/UrlTest.php new file mode 100644 index 00000000000..c6c644783ec --- /dev/null +++ b/tests/unit/Mage/Core/Model/UrlTest.php @@ -0,0 +1,42 @@ +subject = Mage::getModel('core/url'); + } + + /** + * @group Mage_Core + * @group Mage_Core_Model + */ + public function testGetSecure(): void + { + $this->assertIsBool($this->subject->getSecure()); + } +} diff --git a/tests/unit/Mage/Core/Model/VariableTest.php b/tests/unit/Mage/Core/Model/VariableTest.php new file mode 100644 index 00000000000..d27e4608d9e --- /dev/null +++ b/tests/unit/Mage/Core/Model/VariableTest.php @@ -0,0 +1,42 @@ +subject = Mage::getModel('core/variable'); + } + + /** + * @group Mage_Core + * @group Mage_Core_Model + */ + public function testGetVariablesOptionArray(): void + { + $this->assertIsArray($this->subject->getVariablesOptionArray()); + } +} diff --git a/tests/unit/Mage/Core/Model/WebsiteTest.php b/tests/unit/Mage/Core/Model/WebsiteTest.php new file mode 100644 index 00000000000..f0b5bf678ce --- /dev/null +++ b/tests/unit/Mage/Core/Model/WebsiteTest.php @@ -0,0 +1,163 @@ +subject = Mage::getModel('core/website'); + } + + /** + * @group Mage_Core + */ + public function testLoad(): void + { + $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->load(1)); + $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->load('default')); + } + + /** + * @group Mage_Core + */ + public function testLoadConfig(): void + { + $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->loadConfig('1')); + $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->loadConfig('default')); + } + + /** + * @group Mage_Core + */ + public function testGetStoreCollection(): void + { + $this->assertInstanceOf(Mage_Core_Model_Resource_Store_Collection::class, $this->subject->getStoreCollection()); + } + + /** + * @group Mage_Core + */ + public function testGetGroupCollection(): void + { + $this->assertInstanceOf(Mage_Core_Model_Resource_Store_Group_Collection::class, $this->subject->getGroupCollection()); + } + + /** + * @group Mage_Core + */ + public function testGetStores(): void + { + $this->assertIsArray($this->subject->getStores()); + } + + /** + * @group Mage_Core + */ + public function testGetStoreIds(): void + { + $this->assertIsArray($this->subject->getStoreIds()); + } + + /** + * @group Mage_Core + */ + public function testGetStoreCodes(): void + { + $this->assertIsArray($this->subject->getStoreCodes()); + } + + /** + * @group Mage_Core + */ + public function testGetStoresCount(): void + { + $this->assertIsInt($this->subject->getStoresCount()); + } + + /** + * @group Mage_Core + */ + public function testGetGroups(): void + { + $this->assertIsArray($this->subject->getGroups()); + } + + /** + * @group Mage_Core + */ + public function testGetGroupIds(): void + { + $this->assertIsArray($this->subject->getGroupIds()); + } + + /** + * @group Mage_Core + */ + public function testGetGroupsCount(): void + { + $this->assertIsInt($this->subject->getGroupsCount()); + } + + /** + * @group Mage_Core + */ + public function testGetBaseCurrency(): void + { + $this->assertIsObject($this->subject->getBaseCurrency()); + $this->assertInstanceOf(Mage_Directory_Model_Currency::class, $this->subject->getBaseCurrency()); + } + +// /** +// * @group Mage_Core +// */ +// public function testGetDefaultStore(): void +// { +// $this->assertIsObject($this->subject->getDefaultStore()); +// $this->assertInstanceOf(Mage_Core_Model_Store::class, $this->subject->getDefaultStore()); +// } + + /** + * @group Mage_Core + */ + public function testGetDefaultStoresSelect(): void + { + $this->assertIsObject($this->subject->getDefaultStoresSelect()); + $this->assertInstanceOf(Varien_Db_Select::class, $this->subject->getDefaultStoresSelect(true)); + } + + /** + * @group Mage_Core + */ + public function testIsReadOnly(): void + { + $this->assertFalse($this->subject->isReadOnly()); + $this->assertTrue($this->subject->isReadOnly(true)); + } +} diff --git a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php new file mode 100644 index 00000000000..0cd08647cd7 --- /dev/null +++ b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php @@ -0,0 +1,148 @@ +subject = Mage::getModel('customer/convert_adapter_customer'); + } + +// /** + // * @return void + // * @throws Throwable + // * + // * @group Mage_Customer + // */ + // public function testSaveRowNoWebsite(): void + // { + // $data = []; + // try { + // $this->subject->saveRow($data); + // $this->fail(); + // } catch (Mage_Core_Exception $e) { + // $this->assertEquals('Skipping import row, required field "website" is not defined.', $e->getMessage()); + // } + // } + // + // /** + // * @return void + // * @throws Throwable + // * + // * @group Mage_Customer + // */ + // public function testSaveRowNoEmail(): void + // { + // $data = [ + // 'website' => 'base', + // ]; + // try { + // $this->subject->saveRow($data); + // $this->fail(); + // } catch (Mage_Core_Exception $e) { + // $this->assertEquals('Skipping import row, required field "email" is not defined.', $e->getMessage()); + // } + // } + // + // /** + // * @return void + // * @throws Throwable + // * + // * @group Mage_Customer + // */ + // public function testSaveRowNoGroup(): void + // { + // $data = [ + // 'website' => 'base', + // 'email' => 'test@example.com', + // ]; + // try { + // $this->subject->saveRow($data); + // $this->fail(); + // } catch (Mage_Core_Exception $e) { + // $this->assertEquals('Skipping import row, the value "" is not valid for the "group" field.', $e->getMessage()); + // } + // } + // + // /** + // * @return void + // * @throws Throwable + // * + // * @group Mage_Customer + // */ + // public function testSaveRowNoFirstname(): void + // { + // $data = [ + // 'website' => 'base', + // 'email' => 'test@example.com', + // 'group' => 'General', + // ]; + // try { + // $this->subject->saveRow($data); + // $this->fail(); + // } catch (Mage_Core_Exception $e) { + // $this->expectExceptionMessage('Skip import row, required field "firstname" for the new customer is not defined.'); + // } + // } + // + // /** + // * @return void + // * @throws Throwable + // * + // * @group Mage_Customer + // */ + // public function testSaveRowNoLastname(): void + // { + // $data = [ + // 'website' => 'base', + // 'email' => 'test@example.com', + // 'group' => 'General', + // 'firstname' => 'John', + // ]; + // try { + // $this->subject->saveRow($data); + // $this->fail(); + // } catch (Mage_Core_Exception $e) { + // $this->assertEquals('Skip import row, required field "lastname" for the new customer is not defined.', $e->getMessage()); + // } + // } + /** + * @throws Throwable + * @group Mage_Customer + */ + public function testSaveRow(): void + { + $data = [ + 'website' => 'base', + 'email' => 'test@example.com', + 'group' => 'General', + 'firstname' => 'John', + 'lastname' => 'Doe', + ]; + $this->assertInstanceOf(Mage_Customer_Model_Convert_Adapter_Customer::class, $this->subject->saveRow($data)); + } +} diff --git a/tests/unit/Mage/Customer/Model/CustomerTest.php b/tests/unit/Mage/Customer/Model/CustomerTest.php new file mode 100644 index 00000000000..e6d4cb953eb --- /dev/null +++ b/tests/unit/Mage/Customer/Model/CustomerTest.php @@ -0,0 +1,44 @@ +subject = Mage::getModel('customer/customer'); + } + + /** + * @group Mage_Customer + * @group Mage_Customer_Model + */ + public function testValidateAddress(): void + { + $data = []; + $this->assertIsBool($this->subject->validateAddress($data)); + } +} diff --git a/tests/unit/Mage/Downloadable/Helper/FileTest.php b/tests/unit/Mage/Downloadable/Helper/FileTest.php new file mode 100644 index 00000000000..f7dab1cc54b --- /dev/null +++ b/tests/unit/Mage/Downloadable/Helper/FileTest.php @@ -0,0 +1,78 @@ +subject = Mage::helper('downloadable/file'); + } + + /** + * @dataProvider provideGetFilePathData + * + * @group Mage_Downloadable + */ + public function testGetFilePath(string $expectedResult, string $path, ?string $file): void + { + $result = $this->subject->getFilePath($path, $file); + $this->assertEquals($expectedResult, $result); + } + + /** + * @return array> + */ + public function provideGetFilePathData(): array + { + return [ + 'strings path and strings file' => [ + 'path' . DS . 'file', + 'path', + 'file' + ], + 'strings path and strings file with slash' => [ + 'path' . DS . 'file', + 'path', + '/file' + ], + 'string path and null file' => [ + 'path' . DS, + 'path', + null + ], + 'string path and empty file' => [ + 'path' . DS, + 'path', + '' + ], + 'strings path and strings file named 0' => [ + 'path' . DS . '0', + 'path', + '0' + ], + ]; + } +} diff --git a/tests/unit/Mage/Log/Helper/DataTest.php b/tests/unit/Mage/Log/Helper/DataTest.php new file mode 100644 index 00000000000..f80bf35d482 --- /dev/null +++ b/tests/unit/Mage/Log/Helper/DataTest.php @@ -0,0 +1,72 @@ +subject = Mage::helper('log/data'); + } + + /** + * @group Mage_Log + * @group Mage_Log_Helper + */ + public function testIsVisitorLogEnabled(): void + { + $this->assertIsBool($this->subject->isVisitorLogEnabled()); + } + + /** + * @group Mage_Log + * @group Mage_Log_Helper + */ + public function testIsLogEnabled(): void + { + $this->assertIsBool($this->subject->isLogEnabled()); + } + + /** + * @group Mage_Log + * @group Mage_Log_Helper + */ + public function testIsLogDisabled(): void + { + $this->assertIsBool($this->subject->isLogDisabled()); + } + + /** + * @group Mage_Log + * @group Mage_Log_Helper + */ + public function testIsLogFileExtensionValid(): void + { + $this->assertIsBool($this->subject->isLogFileExtensionValid('invalid.file')); + $this->assertIsBool($this->subject->isLogFileExtensionValid('valid.log')); + } +} diff --git a/tests/unit/Mage/Log/Model/AggregationTest.php b/tests/unit/Mage/Log/Model/AggregationTest.php new file mode 100644 index 00000000000..129d0f39c1a --- /dev/null +++ b/tests/unit/Mage/Log/Model/AggregationTest.php @@ -0,0 +1,43 @@ +subject = Mage::getModel('log/aggregation'); + } + + /** + * @group Mage_Log + * @group Mage_Log_Model + * @doesNotPerformAssertions + */ + public function testRun(): void + { + $this->subject->run(); + } +} diff --git a/tests/unit/Mage/Log/Model/CronTest.php b/tests/unit/Mage/Log/Model/CronTest.php new file mode 100644 index 00000000000..e32f95bd266 --- /dev/null +++ b/tests/unit/Mage/Log/Model/CronTest.php @@ -0,0 +1,42 @@ +subject = Mage::getModel('log/cron'); + } + + /** + * @group Mage_Log + * @group Mage_Log_Model + */ + public function testLogClean(): void + { + $this->assertInstanceOf(Mage_Log_Model_Cron::class, $this->subject->logClean()); + } +} diff --git a/tests/unit/Mage/Log/Model/CustomerTest.php b/tests/unit/Mage/Log/Model/CustomerTest.php new file mode 100644 index 00000000000..532f9526426 --- /dev/null +++ b/tests/unit/Mage/Log/Model/CustomerTest.php @@ -0,0 +1,42 @@ +subject = Mage::getModel('log/customer'); + } + + /** + * @group Mage_Log + * @group Mage_Log_Model + */ + public function testGetLoginAtTimestamp(): void + { + $this->assertNull($this->subject->getLoginAtTimestamp()); + } +} diff --git a/tests/unit/Mage/Log/Model/LogTest.php b/tests/unit/Mage/Log/Model/LogTest.php new file mode 100644 index 00000000000..d8581165a59 --- /dev/null +++ b/tests/unit/Mage/Log/Model/LogTest.php @@ -0,0 +1,42 @@ +subject = Mage::getModel('log/log'); + } + + /** + * @group Mage_Log + * @group Mage_Log_Model + */ + public function testClean(): void + { + $this->assertInstanceOf(Mage_Log_Model_Log::class, $this->subject->clean()); + } +} diff --git a/tests/unit/Mage/Log/Model/VisitorTest.php b/tests/unit/Mage/Log/Model/VisitorTest.php new file mode 100644 index 00000000000..605a3f31eae --- /dev/null +++ b/tests/unit/Mage/Log/Model/VisitorTest.php @@ -0,0 +1,83 @@ +subject = Mage::getModel('log/visitor'); + } + + /** + * @group Mage_Log + * @group Mage_Log_Model + * @runInSeparateProcess + */ + public function testInitServerData(): void + { + $this->assertInstanceOf(Mage_Log_Model_Visitor::class, $this->subject->initServerData()); + } + + /** + * @group Mage_Log + * @group Mage_Log_Model + * @runInSeparateProcess + */ + public function testGetOnlineMinutesInterval(): void + { + $this->assertIsInt($this->subject->getOnlineMinutesInterval()); + } + + /** + * @group Mage_Log + * @group Mage_Log_Model + * @runInSeparateProcess + */ + public function testGetUrl(): void + { + $this->assertIsString($this->subject->getUrl()); + } + + /** + * @group Mage_Log + * @group Mage_Log_Model + * @runInSeparateProcess + */ + public function testGetFirstVisitAt(): void + { + $this->assertIsString($this->subject->getFirstVisitAt()); + } + + /** + * @group Mage_Log + * @group Mage_Log_Model + * @runInSeparateProcess + */ + public function testGetLastVisitAt(): void + { + $this->assertIsString($this->subject->getLastVisitAt()); + } +} diff --git a/tests/unit/Mage/Page/Block/Html/HeadTest.php b/tests/unit/Mage/Page/Block/Html/HeadTest.php new file mode 100644 index 00000000000..779e31323c5 --- /dev/null +++ b/tests/unit/Mage/Page/Block/Html/HeadTest.php @@ -0,0 +1,79 @@ +subject = new Mage_Page_Block_Html_Head(); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testAddCss(): void + { + $this->assertInstanceOf(Mage_Page_Block_Html_Head::class, $this->subject->addCss('test')); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testAddJs(): void + { + $this->assertInstanceOf(Mage_Page_Block_Html_Head::class, $this->subject->addJs('test')); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testAddCssIe(): void + { + $this->assertInstanceOf(Mage_Page_Block_Html_Head::class, $this->subject->addCssIe('test')); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testAddJsIe(): void + { + $this->assertInstanceOf(Mage_Page_Block_Html_Head::class, $this->subject->addJsIe('test')); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testAddLinkRel(): void + { + $this->assertInstanceOf(Mage_Page_Block_Html_Head::class, $this->subject->addLinkRel('test', 'ref')); + } +} diff --git a/tests/unit/Mage/Page/Block/Html/HeaderTest.php b/tests/unit/Mage/Page/Block/Html/HeaderTest.php new file mode 100644 index 00000000000..d3fd54d04eb --- /dev/null +++ b/tests/unit/Mage/Page/Block/Html/HeaderTest.php @@ -0,0 +1,80 @@ +subject = new Mage_Page_Block_Html_Header(); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ +// public function testGetIsHomePage(): void +// { +// $this->assertIsBool($this->subject->getIsHomePage()); +// } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testSetLogo(): void + { + $this->assertInstanceOf(Mage_Page_Block_Html_Header::class, $this->subject->setLogo('src', 'alt')); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testGetLogoSrc(): void + { + $this->assertIsString($this->subject->getLogoSrc()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testGetLogoSrcSmall(): void + { + $this->assertIsString($this->subject->getLogoSrcSmall()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testGetLogoAlt(): void + { + $this->assertInstanceOf(Mage_Core_Model_Security_HtmlEscapedString::class, $this->subject->getLogoAlt()); + } +} diff --git a/tests/unit/Mage/Page/Block/HtmlTest.php b/tests/unit/Mage/Page/Block/HtmlTest.php new file mode 100644 index 00000000000..52b969d5784 --- /dev/null +++ b/tests/unit/Mage/Page/Block/HtmlTest.php @@ -0,0 +1,70 @@ +subject = new Mage_Page_Block_Html(); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testGetBaseUrl(): void + { + $this->assertIsString($this->subject->getBaseUrl()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testGetBaseSecureUrl(): void + { + $this->assertIsString($this->subject->getBaseSecureUrl()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ +// public function testGetCurrentUrl(): void +// { +// $this->assertIsString($this->subject->getCurrentUrl()); +// } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testGetPrintLogoUrl(): void + { + $this->assertIsString($this->subject->getPrintLogoUrl()); + } +} diff --git a/tests/unit/Mage/Page/Block/RedirectTest.php b/tests/unit/Mage/Page/Block/RedirectTest.php new file mode 100644 index 00000000000..6c4dc432f50 --- /dev/null +++ b/tests/unit/Mage/Page/Block/RedirectTest.php @@ -0,0 +1,106 @@ +subject = new Mage_Page_Block_Redirect(); + } + + /** + * @group Mage_Page + * @group Mage_Page_Model + */ + public function testGetTargetUrl(): void + { + $this->assertEquals('', $this->subject->getTargetURL()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testGetMessage(): void + { + $this->assertEquals('', $this->subject->getMessage()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testGetRedirectOutput(): void + { + $this->assertIsString($this->subject->getRedirectOutput()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testGetJsRedirect(): void + { + $this->assertIsString($this->subject->getJsRedirect()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testGetHtmlFormRedirect(): void + { + $this->assertIsString($this->subject->getHtmlFormRedirect()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testIsHtmlFormRedirect(): void + { + $this->assertIsBool($this->subject->isHtmlFormRedirect()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testGetFormId(): void + { + $this->assertEquals('', $this->subject->getFormId()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testGetFormMethod(): void + { + $this->assertEquals('POST', $this->subject->getFormMethod()); + } +} diff --git a/tests/unit/Mage/Page/Block/SwitchTest.php b/tests/unit/Mage/Page/Block/SwitchTest.php new file mode 100644 index 00000000000..b71c5ff1157 --- /dev/null +++ b/tests/unit/Mage/Page/Block/SwitchTest.php @@ -0,0 +1,115 @@ +subject = new Mage_Page_Block_Switch(); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testGetCurrentWebsiteId(): void + { + $this->assertIsString($this->subject->getCurrentWebsiteId()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testGetCurrentGroupId(): void + { + $this->assertIsString($this->subject->getCurrentGroupId()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testGetCurrentStoreId(): void + { + $this->assertIsString($this->subject->getCurrentStoreId()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testGetCurrentStoreCode(): void + { + $this->assertIsString($this->subject->getCurrentStoreCode()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testGetRawGroups(): void + { + $this->assertIsArray($this->subject->getRawGroups()); + } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ +// public function testGetRawStores(): void +// { +// $this->assertIsArray($this->subject->getRawStores()); +// } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ +// public function testGetGroups(): void +// { +// $this->assertIsArray($this->subject->getGroups()); +// } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ +// public function testGetStores(): void +// { +// $this->assertIsArray($this->subject->getStores()); +// } + + /** + * @group Mage_Page + * @group Mage_Page_Block + */ + public function testIsStoreInUrl(): void + { + $this->assertIsBool($this->subject->isStoreInUrl()); + } +} diff --git a/tests/unit/Mage/Sitemap/Model/SitemapTest.php b/tests/unit/Mage/Sitemap/Model/SitemapTest.php new file mode 100644 index 00000000000..32e658e0f0c --- /dev/null +++ b/tests/unit/Mage/Sitemap/Model/SitemapTest.php @@ -0,0 +1,46 @@ +subject = Mage::getModel('sitemap/sitemap'); + } + + /** + * @group Mage_Sitemap + */ + public function testGenerateXml(): void + { + $mock = $this->getMockBuilder(Mage_Sitemap_Model_Sitemap::class) + ->setMethods(['getSitemapFilename']) + ->getMock(); + + $mock->expects($this->any())->method('getSitemapFilename')->willReturn('text.xml'); + $this->assertInstanceOf(Mage_Sitemap_Model_Sitemap::class, $mock->generateXml()); + } +} diff --git a/tests/unit/Mage/Uploader/Helper/DataTest.php b/tests/unit/Mage/Uploader/Helper/DataTest.php new file mode 100644 index 00000000000..ca94d5b71e2 --- /dev/null +++ b/tests/unit/Mage/Uploader/Helper/DataTest.php @@ -0,0 +1,40 @@ +subject = Mage::helper('uploader/data'); + } + + /** + * @group Mage_Uploader + */ + public function testIsModuleEnabled(): void + { + $this->assertIsBool($this->subject->isModuleEnabled()); + } +} diff --git a/dev/tests/unit/Mage/Uploader/Helper/FileTest.php b/tests/unit/Mage/Uploader/Helper/FileTest.php similarity index 70% rename from dev/tests/unit/Mage/Uploader/Helper/FileTest.php rename to tests/unit/Mage/Uploader/Helper/FileTest.php index 72db51d7ec1..fa159a197bd 100644 --- a/dev/tests/unit/Mage/Uploader/Helper/FileTest.php +++ b/tests/unit/Mage/Uploader/Helper/FileTest.php @@ -1,24 +1,38 @@ setNode('global/mime/types/test-new-node', 'application/octet-stream'); + + /** @var Mage_Core_Model_Config $config */ + $config = Mage::getConfig(); + $config->setNode('global/mime/types/test-new-node', 'application/octet-stream'); $this->subject = Mage::helper('uploader/file'); } @@ -26,11 +40,12 @@ public function setUp(): void * @dataProvider provideGetMimeTypeFromExtensionListData * @param array $expectedResult * @param string|array $extensionsList - * @return void + * + * @group Mage_Uploader */ public function testGetMimeTypeFromExtensionList(array $expectedResult, $extensionsList): void { - self::assertSame($expectedResult, $this->subject->getMimeTypeFromExtensionList($extensionsList)); + $this->assertEquals($expectedResult, $this->subject->getMimeTypeFromExtensionList($extensionsList)); } /** @@ -66,16 +81,25 @@ public function provideGetMimeTypeFromExtensionListData(): array ]; } + /** + * @group Mage_Uploader + */ public function testGetPostMaxSize(): void { - self::assertIsString($this->subject->getPostMaxSize()); + $this->assertIsString($this->subject->getPostMaxSize()); } + /** + * @group Mage_Uploader + */ public function testGetUploadMaxSize(): void { - self::assertIsString($this->subject->getUploadMaxSize()); + $this->assertIsString($this->subject->getUploadMaxSize()); } + /** + * @group Mage_Uploader + */ public function testGetDataMaxSize(): void { $mock = $this->getMockBuilder(Mage_Uploader_Helper_File::class) @@ -84,14 +108,13 @@ public function testGetDataMaxSize(): void $mock->expects($this->once())->method('getPostMaxSize')->willReturn('1G'); $mock->expects($this->once())->method('getUploadMaxSize')->willReturn('1M'); - self::assertSame('1M', $mock->getDataMaxSize()); + $this->assertEquals('1M', $mock->getDataMaxSize()); } /** * @dataProvider provideGetDataMaxSizeInBytesData - * @param int $expectedResult - * @param string $maxSize - * @return void + * + * @group Mage_Uploader */ public function testGetDataMaxSizeInBytes(int $expectedResult, string $maxSize): void { @@ -100,7 +123,7 @@ public function testGetDataMaxSizeInBytes(int $expectedResult, string $maxSize): ->getMock(); $mock->expects($this->once())->method('getDataMaxSize')->willReturn($maxSize); - self::assertSame($expectedResult, $mock->getDataMaxSizeInBytes()); + $this->assertEquals($expectedResult, $mock->getDataMaxSizeInBytes()); } /** diff --git a/tests/unit/Varien/Data/Form/Filter/DateTest.php b/tests/unit/Varien/Data/Form/Filter/DateTest.php new file mode 100644 index 00000000000..d4401088952 --- /dev/null +++ b/tests/unit/Varien/Data/Form/Filter/DateTest.php @@ -0,0 +1,53 @@ +subject = new Varien_Data_Form_Filter_Date(null, 'en_US'); + } + + /** + * @group Varien_Data + */ + public function testInputFilter(): void + { + $this->assertEquals('', $this->subject->inputFilter('')); + $this->assertEquals(null, $this->subject->inputFilter(null)); + $this->assertEquals('1990-05-18', $this->subject->inputFilter('1990-05-18')); + $this->assertEquals('0090-05-18', $this->subject->inputFilter('90-05-18')); + $this->assertEquals('1990-05-08', $this->subject->inputFilter('1990-5-8')); + $this->assertEquals('1970-01-01', $this->subject->inputFilter('1970-01-01')); + + try { + $this->subject->inputFilter('1990-18-18'); + } catch (Throwable $e) { + // PHP7: bcsub(): bcmath function argument is not well-formed + // PHP8: bcsub(): Argument #1 ($num1) is not well-formed + $this->assertStringStartsWith('bcsub():', $e->getMessage()); + } + } +} diff --git a/tests/unit/Varien/Data/Form/Filter/DatetimeTest.php b/tests/unit/Varien/Data/Form/Filter/DatetimeTest.php new file mode 100644 index 00000000000..152cfad883a --- /dev/null +++ b/tests/unit/Varien/Data/Form/Filter/DatetimeTest.php @@ -0,0 +1,52 @@ +subject = new Varien_Data_Form_Filter_Datetime(null, 'en_US'); + } + + /** + * @group Varien_Data + */ + public function testInputFilter(): void + { + $this->assertEquals('', $this->subject->inputFilter('')); + $this->assertEquals(null, $this->subject->inputFilter(null)); + $this->assertEquals('1990-05-18 00:00:00', $this->subject->inputFilter('1990-05-18')); + $this->assertEquals('0090-05-18 00:00:00', $this->subject->inputFilter('90-05-18')); + $this->assertEquals('1990-05-08 00:00:00', $this->subject->inputFilter('1990-5-8')); + + try { + $this->subject->inputFilter('1990-18-18'); + } catch (Throwable $e) { + // PHP7: bcsub(): bcmath function argument is not well-formed + // PHP8: bcsub(): Argument #1 ($num1) is not well-formed + $this->assertStringStartsWith('bcsub():', $e->getMessage()); + } + } +} diff --git a/dev/tests/unit/Varien/Db/VarienDbAdapterPdoMysqlTest.php b/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php similarity index 69% rename from dev/tests/unit/Varien/Db/VarienDbAdapterPdoMysqlTest.php rename to tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php index 0d36667c07d..c1d3b341aef 100644 --- a/dev/tests/unit/Varien/Db/VarienDbAdapterPdoMysqlTest.php +++ b/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php @@ -1,14 +1,30 @@ getConstructor(); $constructor->invoke($this->adapter, $config); } + /** + * @group Varien_Db + */ public function testGetHostInfoWithUnixSocket(): void { - $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); + $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); $method->setAccessible(true); $fakeSocket = '/var/run/mysqld/mysqld.sock'; + + /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, $fakeSocket); $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_UNIX_SOCKET); @@ -46,11 +68,15 @@ public function testGetHostInfoWithUnixSocket(): void $this->assertNull($hostInfo->getPort()); } + /** + * @group Varien_Db + */ public function testGetHostInfoWithIpv4Address(): void { - $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); + $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); $method->setAccessible(true); + /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, '192.168.1.1:3306'); $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV4_ADDRESS); @@ -59,11 +85,15 @@ public function testGetHostInfoWithIpv4Address(): void $this->assertNull($hostInfo->getUnixSocket()); } + /** + * @group Varien_Db + */ public function testGetHostInfoWithIpv4AddressWithoutPort(): void { - $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); + $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); $method->setAccessible(true); + /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, '192.168.1.1'); $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV4_ADDRESS); @@ -72,11 +102,15 @@ public function testGetHostInfoWithIpv4AddressWithoutPort(): void $this->assertNull($hostInfo->getUnixSocket()); } + /** + * @group Varien_Db + */ public function testGetHostInfoWithHostname(): void { - $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); + $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); $method->setAccessible(true); + /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, 'db.example.com:3306'); $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_HOSTNAME); @@ -85,11 +119,15 @@ public function testGetHostInfoWithHostname(): void $this->assertNull($hostInfo->getUnixSocket()); } + /** + * @group Varien_Db + */ public function testGetHostInfoWithHostnameWithoutPort(): void { - $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); + $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); $method->setAccessible(true); + /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, 'db.example.com'); $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_HOSTNAME); @@ -98,11 +136,15 @@ public function testGetHostInfoWithHostnameWithoutPort(): void $this->assertNull($hostInfo->getUnixSocket()); } + /** + * @group Varien_Db + */ public function testGetHostInfoWithIpv6Address(): void { - $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); + $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); $method->setAccessible(true); + /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, '[2001:db8::1]:3306'); $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS); @@ -111,11 +153,15 @@ public function testGetHostInfoWithIpv6Address(): void $this->assertNull($hostInfo->getUnixSocket()); } + /** + * @group Varien_Db + */ public function testGetHostInfoWithIpv6AddressWithoutPort(): void { - $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); + $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); $method->setAccessible(true); + /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, '2001:db8::1'); $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS); @@ -124,11 +170,15 @@ public function testGetHostInfoWithIpv6AddressWithoutPort(): void $this->assertNull($hostInfo->getUnixSocket()); } + /** + * @group Varien_Db + */ public function testGetHostInfoWithIpv6AddressWithZoneId(): void { - $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); + $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); $method->setAccessible(true); + /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, '[fe80::1%eth0]:3306'); $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS); @@ -137,11 +187,15 @@ public function testGetHostInfoWithIpv6AddressWithZoneId(): void $this->assertNull($hostInfo->getUnixSocket()); } + /** + * @group Varien_Db + */ public function testGetHostInfoWithIpv6AddressWithZoneIdWithoutPort(): void { - $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); + $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo'); $method->setAccessible(true); + /** @var Varien_Object $hostInfo */ $hostInfo = $method->invoke($this->adapter, 'fe80::1%eth0'); $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS); @@ -149,4 +203,4 @@ public function testGetHostInfoWithIpv6AddressWithZoneIdWithoutPort(): void $this->assertNull($hostInfo->getPort()); $this->assertNull($hostInfo->getUnixSocket()); } -} \ No newline at end of file +} diff --git a/tests/unit/Varien/ObjectTest.php b/tests/unit/Varien/ObjectTest.php new file mode 100644 index 00000000000..16070cddb9c --- /dev/null +++ b/tests/unit/Varien/ObjectTest.php @@ -0,0 +1,256 @@ +subject = new Varien_Object(); + } + + /** + * @dataProvider provideGetDataData + * @param mixed $expectedResult + * @param string $setKey + * @param mixed $setValue + * @param string|int|null $index + * + * @group Varien_Object + */ + public function testGetData($expectedResult, $setKey, $setValue, string $key, $index = null): void + { + $this->subject->setData($setKey, $setValue); + $this->assertEquals($expectedResult, $this->subject->getData($key, $index)); + } + + /** + * @return array|int|string>|int|stdClass|string|Varien_Object|null>> + */ + public function provideGetDataData(): array + { + return [ + 'empty_key' => [ + ['empty_key' => ['empty_value']], + 'empty_key', + ['empty_value'], + '' + ], + 'string' => [ + 'value', + 'string', + 'value', + 'string' + ], + 'int' => [ + 1, + 'int', + 1, + 'int' + ], + 'numeric' => [ + '1', + 'numeric', + '1', + 'numeric' + ], + 'array' => [ + ['string', 1], + 'array', + ['string', 1], + 'array', + ], + 'array_index_int' => [ + 'string', + 'array_index_int', + ['string', 1], + 'array_index_int', + 0, + ], + 'array_index_int_invalid' => [ + null, + 'array_index_int_invalid', + ['string', 1], + 'array_index_int_invalid', + 999, + ], + 'array_index_string' => [ + 1, + 'array_index_string', + ['string' => 'string', 'int' => 1], + 'array_index_string', + 'int', + ], + 'array_index_string_string' => [ + null, + 'array_index_string_string', + 'some_string', + 'array_index_string_string', + 'not-exists', + ], + 'array_index_string_varien_object' => [ + [], + 'array_index_string_varien_object', + new Varien_Object(['array' => []]), + 'array_index_string_varien_object', + 'array', + ], + 'array_index_string_std_class' => [ + null, + 'array_index_string_std_class', + new stdClass(), + 'array_index_string_std_class', + 'not-exists', + ], + 'array_nested' => [ + 1, + 'array_nested', + ['nested' => ['string' => 'string', 'int' => 1]], + 'array_nested/nested/int', + ], + 'array_nested_invalid_key' => [ + null, + 'array_nested', + ['nested' => ['string' => 'string', 'int' => 1]], + 'array_nested/nested/invalid_key', + ], + 'array_nested_empty_key' => [ + null, + 'array_nested', + ['nested' => ['string' => 'string', 'int' => '']], + 'array_nested/nested/', + ], + 'array_nested_string' => [ + 'some"\n"string', + 'array_nested_string', + ['nested' => 'some"\n"string'], + 'array_nested_string/nested', + ], + 'array_nested_varien_object' => [ + null, + 'array_nested_varien_object', + new Varien_Object(), + 'array_nested_varien_object/nested', + ], + 'array_nested_std_class' => [ + null, + 'array_nested_std_class', + new stdClass(), + 'array_nested_std_class/nested', + ], + 'array_nested_key_not_exists' => [ + null, + 'array_nested_key_not_exists', + ['nested' => ['string' => 'string', 'int' => 1]], + 'array_nested_key_not_exists_test/nested/int', + ], + ]; + } + + /** + * @group Varien_Object + */ + public function testToString(): void + { + $this->subject->setString1('open'); + $this->subject->setString2('mage'); + $this->assertEquals('open, mage', $this->subject->toString()); + $this->assertEquals('openmage', $this->subject->toString('{{string1}}{{string2}}')); + $this->assertEquals('open', $this->subject->toString('{{string1}}{{string_not_exists}}')); + } + + /** + * @group Varien_Object + */ + public function testGetSetUnsData(): void + { + $this->assertTrue($this->subject->isEmpty()); + $this->subject->setABC('abc'); + $this->subject->setData('efg', 'efg'); + $this->subject->set123('123'); + $this->subject->setData('345', '345'); + $this->subject->setKeyAFirst('value_a_first'); + $this->subject->setData('key_a_2nd', 'value_a_2nd'); + $this->subject->setKeyA3rd('value_a_3rd'); + $this->subject->setData('left', 'over'); + $this->assertFalse($this->subject->isEmpty()); + + $this->assertEquals('abc', $this->subject->getData('a_b_c')); + $this->assertEquals('abc', $this->subject->getABC()); + $this->subject->unsetData('a_b_c'); + + $this->assertEquals('efg', $this->subject->getData('efg')); + $this->assertEquals('efg', $this->subject->getEfg()); + $this->subject->unsEfg(); + + $this->assertEquals('123', $this->subject->getData('123')); + $this->assertEquals('123', $this->subject->get123()); + $this->subject->uns123(); + + $this->subject->unsetData('345'); + + $this->assertEquals('value_a_first', $this->subject->getData('key_a_first')); + $this->assertEquals('value_a_first', $this->subject->getKeyAFirst()); + $this->subject->unsetData('key_a_first'); + + $this->assertEquals('value_a_2nd', $this->subject->getData('key_a_2nd')); + $this->assertEquals('value_a_2nd', $this->subject->getKeyA_2nd()); + $this->subject->unsetData('key_a_2nd'); + + $this->assertEquals('value_a_3rd', $this->subject->getData('key_a3rd')); + $this->assertEquals('value_a_3rd', $this->subject->getKeyA3rd()); + $this->subject->unsetData('key_a3rd'); + + $this->assertEquals(['left' => 'over'], $this->subject->getData()); + + $this->subject->unsetData(); + $this->assertEquals([], $this->subject->getData()); + $this->assertTrue($this->subject->isEmpty()); + + try { + /** @phpstan-ignore-next-line */ + $this->subject->notData(); + $this->fail('Invalid __call'); + } catch (Varien_Exception $exception) { + $this->assertStringStartsWith('Invalid method', $exception->getMessage()); + } + } + + /** + * @group Varien_Object + */ + public function testOffset(): void + { + $this->assertFalse($this->subject->offsetExists('off')); + + $this->subject->offsetSet('off', 'set'); + $this->assertTrue($this->subject->offsetExists('off')); + $this->assertEquals('set', $this->subject->offsetGet('off')); + $this->assertEquals(null, $this->subject->offsetGet('not-exists')); + + $this->subject->offsetUnset('off'); + $this->assertFalse($this->subject->offsetExists('off')); + } +}