diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index a4fac799b21..00000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,143 +0,0 @@ -build: false -clone_folder: c:\projects\phpbb -version: '{build}' - -services: - - iis - -environment: - matrix: - - db: mssql - db_version: sql2012sp1 - php: 7.0 - - db: mssql - db_version: sql2014 - php: 7.0 - - db: mssql - db_version: sql2016 - php: 7.1.12 -# - db: mssql -# db_version: sql2017 -# php: 7.1 -# - db: mariadb -# php: 7.1 -# - db: mysqli -# php: 7.1 -# - db: sqlite -# php: 7.1 -# - db: postgresql -# php: 7.1 - -hosts: - phpbb.test: 127.0.0.1 - -init: - - SET PATH=%systemroot%\system32\inetsrv\;C:\Program Files\OpenSSL;C:\tools\php;c:\php;%PATH% - - SET ANSICON=121x90 (121x90) - - REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f - -before_test: - - ps: | - Set-Service wuauserv -StartupType Manual - cinst -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','') - Get-ChildItem -Path "c:\tools\php$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1$2')" -Recurse | - Move-Item -destination "c:\tools\php" - cd c:\tools\php - cat php.ini-development | %{$_ -replace "memory_limit = 128M","memory_limit = 1024M"} | Out-File -Encoding "Default" php.ini - Add-Content php.ini "`n date.timezone=UTC" - Add-Content php.ini "`n display_errors=On" - Add-Content php.ini "`n extension_dir=ext" - Add-Content php.ini "`n extension=php_openssl.dll" - Add-Content php.ini "`n extension=php_mbstring.dll" - Add-Content php.ini "`n extension=php_curl.dll" - Add-Content php.ini "`n extension=php_gd2.dll" - Add-Content php.ini "`n extension=php_tidy.dll" - Add-Content php.ini "`n extension=php_fileinfo.dll" - Add-Content php.ini "`n extension=php_pdo_sqlite.dll" - Add-Content php.ini "`n extension=php_sqlite3.dll" - Add-Content php.ini "`n extension=php_pdo_mysql.dll" - Add-Content php.ini "`n extension=php_mysqli.dll" - Add-Content php.ini "`n extension=php_pdo_pgsql.dll" - Add-Content php.ini "`n extension=php_pgsql.dll" - - # Get MSSQL driver - if ($env:db -eq "mssql") { - cd c:\tools\php\ext - $DLLVersion = "4.1.6.1" - appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/sqlsrv/$($:DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip - 7z x -y php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip > $null - appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip - 7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip > $null - Remove-Item c:\tools\php\* -include .zip - cd c:\tools\php - Add-Content php.ini "`nextension=php_sqlsrv.dll" - Add-Content php.ini "`nextension=php_pdo_sqlsrv.dll" - Add-Content php.ini "`n" - - $instanceName = $env:db_version.ToUpper() - Start-Service "MSSQL`$$instanceName" - Set-Variable -Name "sqlServerPath" -Value "(local)\$($env:db_version.ToUpper())" - - # Create database write test config - sqlcmd -S $sqlServerPath -Q "Use [master]; CREATE DATABASE [phpbb_test] COLLATE Latin1_General_CI_AS" - $data = "", "`n`t`n`t`t`n`t") | Set-Content c:\projects\phpbb\phpBB\web.config - (Get-Content c:\projects\phpbb\phpBB\web.config).replace("`t", "`t`t`n`t") | Set-Content c:\projects\phpbb\phpBB\web.config - - cd c:\projects\phpbb\phpBB - - php ..\composer.phar install - - choco install -y urlrewrite - - ps: New-WebSite -Name 'phpBBTest' -PhysicalPath 'c:\projects\phpbb\phpBB' -Force - - ps: Import-Module WebAdministration; Set-ItemProperty 'IIS:\Sites\phpBBTest' -name Bindings -value @{protocol='http';bindingInformation='*:80:phpbb.test'} - - echo Change default anonymous user AUTH to ApplicationPool - - appcmd set config -section:anonymousAuthentication /username:"" --password - - echo Setup FAST-CGI configuration - - appcmd set config /section:system.webServer/fastCGI /+[fullPath='C:\tools\php\php-cgi.exe'] - - echo Setup FACT-CGI handler - - appcmd set config /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='C:\tools\php\php-cgi.exe',resourceType='Either'] - - iisreset - - NET START W3SVC - - mkdir "C:\projects\phpbb\phpBB\cache\test" - - mkdir "C:\projects\phpbb\phpBB\cache\installer" - - icacls "C:\projects\phpbb\phpBB\cache" /grant Users:F /T - - icacls "C:\projects\phpbb\phpBB\files" /grant Users:F /T - - icacls "C:\projects\phpbb\phpBB\store" /grant Users:F /T - - icacls "C:\projects\phpbb\phpBB\images\avatars\upload" /grant Users:F /T - -test_script: - - cd c:\projects\phpbb - - php -e phpBB\vendor\phpunit\phpunit\phpunit --verbose diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000000..9eaeefdb12d --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,22 @@ +# Debian version +ARG VARIANT="bookworm" +FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT} + +# Install PHP +RUN apt-get -y update && apt-get -y install software-properties-common +RUN add-apt-repository ppa:ondrej/php +RUN apt-get -y update +RUN apt-get -y install php8.4 php8.4-xml php8.4-mbstring php8.4-curl php8.4-zip php8.4-xdebug + +# Install Composer +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + +# Install MySQL +RUN apt-get -y install mysql-server php8.4-mysql + +# Xdebug +ADD resources/xdebug.ini /etc/php/8.4/apache2/conf.d/xdebug.ini + +# Configure Apache +RUN echo "Listen 8080" >> /etc/apache2/ports.conf && \ + a2enmod rewrite diff --git a/.devcontainer/customisations-team/devcontainer.json b/.devcontainer/customisations-team/devcontainer.json new file mode 100644 index 00000000000..5a0803656e0 --- /dev/null +++ b/.devcontainer/customisations-team/devcontainer.json @@ -0,0 +1,37 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: +// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.1/containers/ubuntu +{ + "name": "phpBB (Customisations Team)", + "build": { + "dockerfile": "../Dockerfile", + "args": { + "VARIANT": "ubuntu-22.04" + } + }, + + // Configure tool-specific properties. + "customizations": { + // Configure properties specific to VS Code. + "vscode": { + "settings": { + // Allow Xdebug to listen to requests from remote (or container) + "remote.localPortHost": "allInterfaces" + }, + //"devPort": {}, + // Specify which VS Code extensions to install (List of IDs) + "extensions": ["xdebug.php-debug"] + } + }, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + "forwardPorts": [80, 9003], + + // Use 'postCreateCommand' to run commands after the container is created. + "postStartCommand": "bash .devcontainer/customisations-team/setup.sh", + + // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "vscode", + "features": { + "github-cli": "latest" + } +} diff --git a/.devcontainer/customisations-team/phpbb-config.yml b/.devcontainer/customisations-team/phpbb-config.yml new file mode 100644 index 00000000000..1ddc1f4247c --- /dev/null +++ b/.devcontainer/customisations-team/phpbb-config.yml @@ -0,0 +1,37 @@ +installer: + admin: + name: admin + password: adminadmin + email: admin@example.org + + board: + lang: en + name: My Board (with Titania) + description: My amazing new phpBB board (with Titania) + + database: + dbms: mysqli + dbhost: 127.0.0.1 + dbport: 3306 + dbuser: phpbb + dbpasswd: phpbb + dbname: phpbb + table_prefix: phpbb_ + + email: + enabled: false + smtp_delivery : ~ + smtp_host: ~ + smtp_port: ~ + smtp_user: ~ + smtp_pass: ~ + + server: + cookie_secure: false + server_protocol: http:// + force_server_vars: true + server_name: localhost + server_port: 80 + script_path: / + + extensions: ["phpbb/titania"] diff --git a/.devcontainer/customisations-team/setup.sh b/.devcontainer/customisations-team/setup.sh new file mode 100644 index 00000000000..a29d5681b61 --- /dev/null +++ b/.devcontainer/customisations-team/setup.sh @@ -0,0 +1,81 @@ +# setup.sh - Customisations Team +# Commands to install and configure phpBB +echo "[Codespaces] Customisations Team configuration..." + +# Start MySQL +echo "[Codespaces] Start MySQL" +sudo service mysql start + +# Start Apache +echo "[Codespaces] Start Apache" +sudo apache2ctl start + +# Create a MySQL user to use +echo "[Codespaces] Create MySQL user" +sudo mysql -u root< +# @license GNU General Public License, version 2 (GPL-2.0) +# +# For full copyright and license information, please see +# the docs/CREDITS.txt file. +# +set -e + +if [ ! -f doctum.phar ]; then + # Download the latest (5.x.x) release if the file does not exist + # Remove it to update your phar + curl -O https://doctum.long-term.support/releases/5/doctum.phar + rm -f doctum.phar.sha256 + curl -O https://doctum.long-term.support/releases/5/doctum.phar.sha256 + sha256sum --strict --check doctum.phar.sha256 + rm -f doctum.phar.sha256 + chmod +x ./doctum.phar + # You can fetch the latest (5.x.x) version code here: + # https://doctum.long-term.support/releases/5/VERSION +fi +# Show the version to inform users of the script +./doctum.phar version --text +./doctum.phar parse build/doctum-checkout.conf.php -v diff --git a/.github/check-executable-files.sh b/.github/check-executable-files.sh new file mode 100755 index 00000000000..d9d0800f00e --- /dev/null +++ b/.github/check-executable-files.sh @@ -0,0 +1,63 @@ +#!/bin/bash +# +# This file is part of the phpBB Forum Software package. +# +# @copyright (c) phpBB Limited +# @license GNU General Public License, version 2 (GPL-2.0) +# +# For full copyright and license information, please see +# the docs/CREDITS.txt file. +# +set -e + +root="$1" +path="${root}phpBB/" + +# Check the permissions of the files + +# The following variables MUST NOT contain any wildcard +# Directories to skip +directories_skipped="-path ${path}develop -o -path ${path}vendor" + +# Files to skip +files_skipped="-false" + +# Files which have to be executable +executable_files="-path ${path}bin/* -o -path ${path}install/phpbbcli.php" + +incorrect_files=$( \ + find ${path} \ + '(' \ + '(' \ + ${directories_skipped} \ + ')' \ + -a -type d -prune -a -type f \ + ')' -o \ + '(' \ + -type f -a \ + -not '(' \ + ${files_skipped} \ + ')' -a \ + '(' \ + '(' \ + '(' \ + ${executable_files} \ + ')' -a \ + -not -perm /100 \ + ')' -o \ + '(' \ + -not '(' \ + ${executable_files} \ + ')' -a \ + -perm /111 \ + ')' \ + ')' \ + ')' \ + ) + +if [ "${incorrect_files}" != '' ] +then + echo "The following files do not have proper permissions:"; + ls -la ${incorrect_files} + exit 1; +fi diff --git a/travis/check-image-icc-profiles.sh b/.github/check-image-icc-profiles.sh similarity index 54% rename from travis/check-image-icc-profiles.sh rename to .github/check-image-icc-profiles.sh index 05c7de2d27b..d0444dc7f50 100755 --- a/travis/check-image-icc-profiles.sh +++ b/.github/check-image-icc-profiles.sh @@ -10,12 +10,5 @@ # set -e -DB=$1 -TRAVIS_PHP_VERSION=$2 -NOTESTS=$3 - -if [ "$NOTESTS" == '1' ] -then - find . -type f -a -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' -a -not -wholename '*vendor/*' | \ - parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' -fi +find . -type f -a -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' -a -not -wholename '*vendor/*' | \ + parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' diff --git a/.github/check-js.sh b/.github/check-js.sh new file mode 100755 index 00000000000..85518ca5010 --- /dev/null +++ b/.github/check-js.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# +# This file is part of the phpBB Forum Software package. +# +# @copyright (c) phpBB Limited +# @license GNU General Public License, version 2 (GPL-2.0) +# +# For full copyright and license information, please see +# the docs/CREDITS.txt file. +# +set -e +set +x + +sudo npm install -g > /dev/null +npm ci > /dev/null +set -x +node_modules/eslint/bin/eslint.js "phpBB/**/*.js" --ignore-pattern "phpBB/ext/" +node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig" --ignore-pattern "phpBB/ext/" diff --git a/.github/check-stylesheet.sh b/.github/check-stylesheet.sh new file mode 100755 index 00000000000..70a8a70d9b4 --- /dev/null +++ b/.github/check-stylesheet.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# +# This file is part of the phpBB Forum Software package. +# +# @copyright (c) phpBB Limited +# @license GNU General Public License, version 2 (GPL-2.0) +# +# For full copyright and license information, please see +# the docs/CREDITS.txt file. +# +set -e +set +x + +sudo npm install -g > /dev/null +npm ci > /dev/null +set -x +node_modules/stylelint/bin/stylelint.js "phpBB/styles/prosilver/theme/*.css" +node_modules/stylelint/bin/stylelint.js "phpBB/adm/style/*.css" diff --git a/.github/ext-check-executable-files.sh b/.github/ext-check-executable-files.sh new file mode 100755 index 00000000000..09db25d40bd --- /dev/null +++ b/.github/ext-check-executable-files.sh @@ -0,0 +1,64 @@ +#!/bin/bash +# +# This file is part of the phpBB Forum Software package. +# +# @copyright (c) phpBB Limited +# @license GNU General Public License, version 2 (GPL-2.0) +# +# For full copyright and license information, please see +# the docs/CREDITS.txt file. +# +set -e + +root="$1" +extname="$2" +path="${root}phpBB/ext/${extname}/" + +# Check the permissions of the files + +# The following variables MUST NOT contain any wildcard +# Directories to skip +directories_skipped="-path ${path}develop -o -path ${path}vendor -o -path ${path}.git" + +# Files to skip +files_skipped="-false" + +# Files which have to be executable +executable_files="-path ${path}bin/* -o -path ${path}install/phpbbcli.php" + +incorrect_files=$( \ + find ${path} \ + '(' \ + '(' \ + ${directories_skipped} \ + ')' \ + -a -type d -prune -a -type f \ + ')' -o \ + '(' \ + -type f -a \ + -not '(' \ + ${files_skipped} \ + ')' -a \ + '(' \ + '(' \ + '(' \ + ${executable_files} \ + ')' -a \ + -not -perm /100 \ + ')' -o \ + '(' \ + -not '(' \ + ${executable_files} \ + ')' -a \ + -perm /111 \ + ')' \ + ')' \ + ')' \ + ) + +if [ "${incorrect_files}" != '' ] +then + echo "The following files do not have proper permissions:"; + ls -la ${incorrect_files} + exit 1; +fi diff --git a/travis/ext-sniff.sh b/.github/ext-sniff.sh similarity index 73% rename from travis/ext-sniff.sh rename to .github/ext-sniff.sh index ca4d2115bab..fc5bafc008c 100755 --- a/travis/ext-sniff.sh +++ b/.github/ext-sniff.sh @@ -11,10 +11,8 @@ set -e set -x -DB=$1 -TRAVIS_PHP_VERSION=$2 -EXTNAME=$3 -NOTESTS=$4 +EXTNAME=$1 +NOTESTS=$2 if [ "$NOTESTS" == "1" ] then @@ -22,7 +20,6 @@ then -s \ --extensions=php \ --standard=build/code_sniffer/ruleset-php-extensions.xml \ - "--ignore=phpBB/ext/$EXTNAME/tests/*" \ - "--ignore=phpBB/ext/$EXTNAME/vendor/*" \ - "phpBB/ext/$EXTNAME" + --ignore=*/"$EXTNAME"/tests/*,*/"$EXTNAME"/vendor/* \ + phpBB/ext/"$EXTNAME" fi diff --git a/.github/ldap/base.ldif b/.github/ldap/base.ldif new file mode 100644 index 00000000000..09fe7cecc69 --- /dev/null +++ b/.github/ldap/base.ldif @@ -0,0 +1,41 @@ +dn: dc=example,dc=com +objectClass: top +objectClass: dcObject +objectClass: organization +o: example +dc: example + +dn: ou=foo,dc=example,dc=com +objectClass: organizationalUnit +ou: foo + +dn: cn=admin,dc=example,dc=com +objectClass: simpleSecurityObject +objectClass: organizationalRole +cn: admin +description: LDAP administrator +userPassword:: e1NTSEF9NytMR2gveUxTMzdsc3RRd1V1dENZSVA0TWdYdm9SdDY= + +dn: ou=group,dc=example,dc=com +objectClass: organizationalUnit +ou: group + +dn: cn=admin,ou=foo,dc=example,dc=com +objectClass: posixAccount +objectClass: inetOrgPerson +objectClass: organizationalPerson +objectClass: person +loginShell: /bin/bash +homeDirectory: /home/admin +uid: admin +cn: admin +uidNumber: 10000 +gidNumber: 10000 +sn: admin +mail: admin@example.com +userPassword:: e1NTSEF9WHpueGZURHZZc21JSkl6czdMVXBjdCtWYTA1dlMzVlQ= + +dn: cn=admin,ou=group,dc=example,dc=com +objectClass: posixGroup +gidNumber: 10000 +cn: admin diff --git a/.github/ldap/slapd.conf b/.github/ldap/slapd.conf new file mode 100644 index 00000000000..9f6aa980f7b --- /dev/null +++ b/.github/ldap/slapd.conf @@ -0,0 +1,17 @@ +# See slapd.conf(5) for details on configuration options. +include /etc/ldap/schema/core.schema +include /etc/ldap/schema/cosine.schema +include /etc/ldap/schema/inetorgperson.schema +include /etc/ldap/schema/nis.schema + +pidfile /var/tmp/slapd/slapd.pid +argsfile /var/tmp/slapd/slapd.args + +modulepath /usr/lib/openldap + +database ldif +directory /var/tmp/slapd + +suffix "dc=example,dc=com" +rootdn "cn=admin,dc=example,dc=com" +rootpw adminadmin diff --git a/travis/phing-sniff.sh b/.github/phing-sniff.sh similarity index 70% rename from travis/phing-sniff.sh rename to .github/phing-sniff.sh index 3f43b64130e..7e1595c385e 100755 --- a/travis/phing-sniff.sh +++ b/.github/phing-sniff.sh @@ -11,13 +11,6 @@ set -e set -x -DB=$1 -TRAVIS_PHP_VERSION=$2 -NOTESTS=$3 - -if [ "$NOTESTS" == '1' ] -then - cd build - ../phpBB/vendor/bin/phing sniff - cd .. -fi +cd build +../phpBB/vendor/bin/phing sniff +cd .. diff --git a/.github/phpunit-mariadb-github.xml b/.github/phpunit-mariadb-github.xml new file mode 100644 index 00000000000..d5ab282b3d1 --- /dev/null +++ b/.github/phpunit-mariadb-github.xml @@ -0,0 +1,48 @@ + + + + + ../tests + ../tests/functional + ../tests/lint_test.php + + + ../tests/functional + + + + + slow + + + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + + + + + + + + + + + + diff --git a/.github/phpunit-mssql-github.xml b/.github/phpunit-mssql-github.xml new file mode 100644 index 00000000000..bd240fa534b --- /dev/null +++ b/.github/phpunit-mssql-github.xml @@ -0,0 +1,50 @@ + + + + + ../tests + ../tests/functional + ../tests/lint_test.php + + + ../tests/functional + + + + + slow + + + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + + + + + + + + + + + + + + diff --git a/.github/phpunit-mysql-github.xml b/.github/phpunit-mysql-github.xml new file mode 100644 index 00000000000..ff42cf36dfd --- /dev/null +++ b/.github/phpunit-mysql-github.xml @@ -0,0 +1,50 @@ + + + + + ../tests + ../tests/functional + ../tests/lint_test.php + + + ../tests/functional + + + + + slow + + + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + + + + + + + + + + + + + + diff --git a/.github/phpunit-postgres-github.xml b/.github/phpunit-postgres-github.xml new file mode 100644 index 00000000000..1636901039f --- /dev/null +++ b/.github/phpunit-postgres-github.xml @@ -0,0 +1,50 @@ + + + + + ../tests + ../tests/functional + ../tests/lint_test.php + + + ../tests/functional + + + + + slow + + + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + + + + + + + + + + + + + + diff --git a/.github/phpunit-psql-windows-github.xml b/.github/phpunit-psql-windows-github.xml new file mode 100644 index 00000000000..7e71405e484 --- /dev/null +++ b/.github/phpunit-psql-windows-github.xml @@ -0,0 +1,53 @@ + + + + + ../tests + ../tests/functional + ../tests/lint_test.php + + + ../tests/functional + + + + + slow + + + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + + + + + + + + + + + + + + diff --git a/.github/phpunit-sqlite3-github.xml b/.github/phpunit-sqlite3-github.xml new file mode 100644 index 00000000000..1ade12292c3 --- /dev/null +++ b/.github/phpunit-sqlite3-github.xml @@ -0,0 +1,44 @@ + + + + + ../tests + ../tests/functional + ../tests/lint_test.php + + + ../tests/functional + + + + + slow + + + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + + + + + + + + diff --git a/travis/prepare-extension.sh b/.github/prepare-extension.sh similarity index 74% rename from travis/prepare-extension.sh rename to .github/prepare-extension.sh index 4518f935f8a..d3adc95ec5d 100755 --- a/travis/prepare-extension.sh +++ b/.github/prepare-extension.sh @@ -12,11 +12,11 @@ set -e set -x EXTNAME=$1 -BRANCH=$2 # Move the extension in place mkdir --parents phpBB/ext/$EXTNAME cp -R ../tmp/* phpBB/ext/$EXTNAME -# Move the extensions travis/phpunit-*-travis.xml files in place -cp -R travis/* phpBB/ext/$EXTNAME/travis +# Move the test files for extensions in place +cp -R .github/*.xml phpBB/ext/$EXTNAME/.github +cp -R .github/*.sh phpBB/ext/$EXTNAME/.github diff --git a/travis/setup-database.sh b/.github/setup-database.sh similarity index 59% rename from travis/setup-database.sh rename to .github/setup-database.sh index cbd5e93e835..49af1a70e90 100755 --- a/travis/setup-database.sh +++ b/.github/setup-database.sh @@ -12,13 +12,7 @@ set -e set -x DB=$1 -TRAVIS_PHP_VERSION=$2 -NOTESTS=$3 - -if [ "$NOTESTS" == '1' ] -then - exit 0 -fi +MYISAM=$2 if [ "$DB" == "postgres" ] then @@ -26,12 +20,7 @@ then psql -c 'create database phpbb_tests;' -U postgres fi -if [ "$TRAVIS_PHP_VERSION" == "5.6" -a "$DB" == "mysqli" ] -then - mysql -e 'SET GLOBAL storage_engine=MyISAM;' -fi - -if [ "$DB" == "mysql" -o "$DB" == "mysqli" -o "$DB" == "mariadb" ] +if [ "$MYISAM" == '1' ] then - mysql -e 'create database IF NOT EXISTS phpbb_tests;' + mysql -h 127.0.0.1 -u root -e 'SET GLOBAL default_storage_engine=MyISAM;' fi diff --git a/travis/setup-exiftool.sh b/.github/setup-exiftool.sh similarity index 94% rename from travis/setup-exiftool.sh rename to .github/setup-exiftool.sh index 04999b86006..082e621c7bb 100755 --- a/travis/setup-exiftool.sh +++ b/.github/setup-exiftool.sh @@ -10,5 +10,4 @@ # set -e -sudo apt-get update sudo apt-get install -y parallel libimage-exiftool-perl diff --git a/.github/setup-ldap.sh b/.github/setup-ldap.sh new file mode 100755 index 00000000000..226c625ee10 --- /dev/null +++ b/.github/setup-ldap.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# This file is part of the phpBB Forum Software package. +# +# @copyright (c) phpBB Limited +# @license GNU General Public License, version 2 (GPL-2.0) +# +# For full copyright and license information, please see +# the docs/CREDITS.txt file. +# +set -e +set -x + +sudo apt-get -y install ldap-utils slapd +mkdir /var/tmp/slapd +cp .github/ldap/slapd.conf /var/tmp/slapd/slapd.conf +slapd -d 256 -d 128 -f /var/tmp/slapd/slapd.conf -h ldap://localhost:3389 & +sleep 3 +ldapadd -H ldap://localhost:3389 -D "cn=admin,dc=example,dc=com" -w adminadmin -f .github/ldap/base.ldif diff --git a/travis/setup-phpbb.sh b/.github/setup-phpbb.sh similarity index 66% rename from travis/setup-phpbb.sh rename to .github/setup-phpbb.sh index be9eb703d52..cfec319f2e5 100755 --- a/travis/setup-phpbb.sh +++ b/.github/setup-phpbb.sh @@ -12,28 +12,18 @@ set -e set -x DB=$1 -TRAVIS_PHP_VERSION=$2 +PHP_VERSION=$2 NOTESTS=$3 if [ "$NOTESTS" == '1' ] then - travis/setup-exiftool.sh - travis/setup-unbuffer.sh -fi - -if [ "$DB" == "mariadb" ] -then - travis/setup-mariadb.sh -fi - -if [ "$NOTESTS" != '1' ] -then - travis/setup-php-extensions.sh + .github/setup-exiftool.sh + .github/setup-unbuffer.sh fi if [ "$NOTESTS" != '1' ] then - travis/setup-webserver.sh + .github/setup-webserver.sh fi cd phpBB diff --git a/.github/setup-sphinx.sh b/.github/setup-sphinx.sh new file mode 100755 index 00000000000..9e056aa1b89 --- /dev/null +++ b/.github/setup-sphinx.sh @@ -0,0 +1,143 @@ +#!/bin/bash +# +# This file is part of the phpBB Forum Software package. +# +# @copyright (c) phpBB Limited +# @license GNU General Public License, version 2 (GPL-2.0) +# +# For full copyright and license information, please see +# the docs/CREDITS.txt file. +# +set -e +set -x + +sudo apt-get install -q -y sphinxsearch + +DIR=$(dirname "$0") + +SPHINX_DAEMON_HOST="localhost" +SPHINX_DAEMON_PORT="9312" +SPHINX_CONF="$DIR/sphinx.conf" +SPHINX_DATA_DIR="/var/run/sphinxsearch" +SPHINX_LOG="$SPHINX_DATA_DIR/log/searchd.log" +SPHINX_QUERY_LOG="$SPHINX_DATA_DIR/log/sphinx-query.log" +ID="saw9zf2fdhp1goue" # Randomly generated via phpBB unique_id() + +PHPBB_TEST_DBHOST="0.0.0.0" +PHPBB_TEST_DBNAME="phpbb_tests" +PHPBB_TEST_DBUSER="root" +PHPBB_TEST_DBPASSWD="" + +sudo service sphinxsearch stop +sudo mkdir -p "$SPHINX_DATA_DIR/log" +sudo chown "sphinxsearch" "$SPHINX_DATA_DIR/log" + +# Generate configuration file for Sphinx +echo " +source source_phpbb_${ID}_main +{ + type = mysql # mysql or pgsql + sql_host = $PHPBB_TEST_DBHOST + sql_user = $PHPBB_TEST_DBUSER + sql_pass = $PHPBB_TEST_DBPASSWD + sql_db = $PHPBB_TEST_DBNAME + sql_port = + sql_query_pre = SET NAMES 'utf8' + sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = (SELECT MAX(post_id) FROM phpbb_posts) WHERE counter_id = 1 + sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts + sql_range_step = 5000 + sql_query = SELECT \ + p.post_id AS id, \ + p.forum_id, \ + p.topic_id, \ + p.poster_id, \ + p.post_visibility, \ + CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \ + p.post_time, \ + p.post_subject, \ + p.post_subject as title, \ + p.post_text as data, \ + t.topic_last_post_time, \ + 0 as deleted \ + FROM phpbb_posts p, phpbb_topics t \ + WHERE \ + p.topic_id = t.topic_id \ + AND p.post_id >= \$start AND p.post_id <= \$end + sql_query_post = + sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = \$maxid WHERE counter_id = 1 + sql_attr_uint = forum_id + sql_attr_uint = topic_id + sql_attr_uint = poster_id + sql_attr_uint = post_visibility + sql_attr_bool = topic_first_post + sql_attr_bool = deleted + sql_attr_timestamp = post_time + sql_attr_timestamp = topic_last_post_time + sql_attr_string = post_subject +} +source source_phpbb_${ID}_delta : source_phpbb_${ID}_main +{ + sql_query_pre = SET NAMES 'utf8' + sql_query_range = + sql_range_step = + sql_query = SELECT \ + p.post_id AS id, \ + p.forum_id, \ + p.topic_id, \ + p.poster_id, \ + p.post_visibility, \ + CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \ + p.post_time, \ + p.post_subject, \ + p.post_subject as title, \ + p.post_text as data, \ + t.topic_last_post_time, \ + 0 as deleted \ + FROM phpbb_posts p, phpbb_topics t \ + WHERE \ + p.topic_id = t.topic_id \ + AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) + sql_query_post_index = +} +index index_phpbb_${ID}_main +{ + path = $SPHINX_DATA_DIR/index_phpbb_${ID}_main + source = source_phpbb_${ID}_main + docinfo = extern + morphology = none + stopwords = + wordforms = + exceptions = + min_word_len = 2 + charset_table = U+FF10..U+FF19->0..9, 0..9, U+FF41..U+FF5A->a..z, U+FF21..U+FF3A->a..z, A..Z->a..z, a..z, U+0149, U+017F, U+0138, U+00DF, U+00FF, U+00C0..U+00D6->U+00E0..U+00F6, U+00E0..U+00F6, U+00D8..U+00DE->U+00F8..U+00FE, U+00F8..U+00FE, U+0100->U+0101, U+0101, U+0102->U+0103, U+0103, U+0104->U+0105, U+0105, U+0106->U+0107, U+0107, U+0108->U+0109, U+0109, U+010A->U+010B, U+010B, U+010C->U+010D, U+010D, U+010E->U+010F, U+010F, U+0110->U+0111, U+0111, U+0112->U+0113, U+0113, U+0114->U+0115, U+0115, U+0116->U+0117, U+0117, U+0118->U+0119, U+0119, U+011A->U+011B, U+011B, U+011C->U+011D, U+011D, U+011E->U+011F, U+011F, U+0130->U+0131, U+0131, U+0132->U+0133, U+0133, U+0134->U+0135, U+0135, U+0136->U+0137, U+0137, U+0139->U+013A, U+013A, U+013B->U+013C, U+013C, U+013D->U+013E, U+013E, U+013F->U+0140, U+0140, U+0141->U+0142, U+0142, U+0143->U+0144, U+0144, U+0145->U+0146, U+0146, U+0147->U+0148, U+0148, U+014A->U+014B, U+014B, U+014C->U+014D, U+014D, U+014E->U+014F, U+014F, U+0150->U+0151, U+0151, U+0152->U+0153, U+0153, U+0154->U+0155, U+0155, U+0156->U+0157, U+0157, U+0158->U+0159, U+0159, U+015A->U+015B, U+015B, U+015C->U+015D, U+015D, U+015E->U+015F, U+015F, U+0160->U+0161, U+0161, U+0162->U+0163, U+0163, U+0164->U+0165, U+0165, U+0166->U+0167, U+0167, U+0168->U+0169, U+0169, U+016A->U+016B, U+016B, U+016C->U+016D, U+016D, U+016E->U+016F, U+016F, U+0170->U+0171, U+0171, U+0172->U+0173, U+0173, U+0174->U+0175, U+0175, U+0176->U+0177, U+0177, U+0178->U+00FF, U+00FF, U+0179->U+017A, U+017A, U+017B->U+017C, U+017C, U+017D->U+017E, U+017E, U+0410..U+042F->U+0430..U+044F, U+0430..U+044F, U+4E00..U+9FFF + ignore_chars = U+0027, U+002C + min_prefix_len = 3 + min_infix_len = 0 + html_strip = 1 + index_exact_words = 0 + blend_chars = U+23, U+24, U+25, U+26, U+40 +} +index index_phpbb_${ID}_delta : index_phpbb_${ID}_main +{ + path = $SPHINX_DATA_DIR/index_phpbb_${ID}_delta + source = source_phpbb_${ID}_delta +} +indexer +{ + mem_limit = 512M +} +searchd +{ + listen = $SPHINX_DAEMON_PORT + log = $SPHINX_LOG + query_log = $SPHINX_QUERY_LOG + read_timeout = 5 + max_children = 30 + pid_file = $SPHINX_DATA_DIR/searchd.pid + binlog_path = $SPHINX_DATA_DIR +} +" > $SPHINX_CONF + +sudo mv "$SPHINX_CONF" "/etc/sphinxsearch/sphinx.conf" +sudo sed -i "s/START=no/START=yes/g" "/etc/default/sphinxsearch" +sudo chmod 777 "/var/run/sphinxsearch" diff --git a/travis/setup-unbuffer.sh b/.github/setup-unbuffer.sh similarity index 94% rename from travis/setup-unbuffer.sh rename to .github/setup-unbuffer.sh index 4423d1b8b6b..4828a88997c 100755 --- a/travis/setup-unbuffer.sh +++ b/.github/setup-unbuffer.sh @@ -10,5 +10,4 @@ # set -e -sudo apt-get update sudo apt-get install -y expect-dev diff --git a/.github/setup-webserver.sh b/.github/setup-webserver.sh new file mode 100755 index 00000000000..7232807e3ef --- /dev/null +++ b/.github/setup-webserver.sh @@ -0,0 +1,80 @@ +#!/bin/bash +# +# This file is part of the phpBB Forum Software package. +# +# @copyright (c) phpBB Limited +# @license GNU General Public License, version 2 (GPL-2.0) +# +# For full copyright and license information, please see +# the docs/CREDITS.txt file. +# +set -e +set -x + +sudo apt-get install -y nginx coreutils + +sudo service nginx stop + +DIR=$(dirname "$0") +USER=$(whoami) +PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB") +NGINX_SITE_CONF="/etc/nginx/sites-enabled/default" +NGINX_CONF="/etc/nginx/nginx.conf" +APP_SOCK=$(realpath "$DIR")/php-app.sock +NGINX_PHP_CONF="$DIR/nginx-php.conf" + +# php-fpm +PHP_FPM_BIN="/usr/sbin/php-fpm$PHP_VERSION" +PHP_FPM_CONF="$DIR/php-fpm.conf" + +if [ ! -f $PHP_FPM_BIN ] && [ -f "/usr/bin/php-fpm" ] +then + PHP_FPM_BIN="/usr/bin/php-fpm" +fi + +if [ ! -f $PHP_FPM_BIN ] +then + sudo apt-get install php$PHP_VERSION-fpm php$PHP_VERSION-cli \ + php$PHP_VERSION-curl php$PHP_VERSION-xml php$PHP_VERSION-mbstring \ + php$PHP_VERSION-zip php$PHP_VERSION-mysql php$PHP_VERSION-sqlite3 \ + php$PHP_VERSION-intl php$PHP_VERSION-gd php$PHP_VERSION-pgsql + sudo service php$PHP_VERSION-fpm start + sudo service php$PHP_VERSION-fpm status +fi + +echo " + [global] + + [ci] + user = $USER + group = $USER + listen = $APP_SOCK + listen.mode = 0666 + pm = static + pm.max_children = 2 + + php_admin_value[memory_limit] = 128M +" > $PHP_FPM_CONF + +sudo $PHP_FPM_BIN \ + --fpm-config "$DIR/php-fpm.conf" + +# nginx +sudo sed -i "s/user www-data;/user $USER;/g" $NGINX_CONF +sudo cp "$DIR/../phpBB/docs/nginx.sample.conf" "$NGINX_SITE_CONF" +sudo sed -i \ + -e "s/example\.com/localhost/g" \ + -e "s|root /path/to/phpbb;|root $PHPBB_ROOT_PATH;|g" \ + $NGINX_SITE_CONF + +# Generate FastCGI configuration for Nginx +echo " +upstream php { + server unix:$APP_SOCK; +} +" > $NGINX_PHP_CONF + +sudo mv "$NGINX_PHP_CONF" /etc/nginx/conf.d/php.conf + +sudo nginx -T +sudo service nginx start diff --git a/.github/workflows/check_merge_to_master.yml b/.github/workflows/check_merge_to_master.yml new file mode 100644 index 00000000000..45288a072a9 --- /dev/null +++ b/.github/workflows/check_merge_to_master.yml @@ -0,0 +1,70 @@ +name: Check merge to master + +on: + pull_request_target: + types: [ opened, synchronize, reopened ] + branches: + - 3.3.x + +jobs: + merge-check: + if: github.event_name == 'pull_request_target' && github.event.pull_request.base.ref == '3.3.x' + runs-on: ubuntu-latest + steps: + - name: Checkout the repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 # Ensure full history is fetched + + - name: Set up Git user + run: | + git config --global user.name "github-actions" + git config --global user.email "github-actions@github.com" + + - name: Fetch all branches + run: git fetch origin + + - name: Simulate merging PR into 3.3.x + id: simulate_merge + run: | + git checkout 3.3.x + git fetch origin pull/${{ github.event.pull_request.number }}/head + git merge --no-ff FETCH_HEAD || exit 1 + + - name: Attempt to merge updated 3.3.x into master + id: merge_master + run: | + git checkout master + if git merge --no-ff 3.3.x --no-commit; then + echo "mergeable=true" >> $GITHUB_OUTPUT + else + echo "mergeable=false" >> $GITHUB_OUTPUT + git merge --abort + fi + + - name: Find Comment + uses: peter-evans/find-comment@v3 + id: fc + with: + issue-number: ${{ github.event.pull_request.number }} + comment-author: 'github-actions[bot]' + body-includes: The attempt to merge branch `3.3.x` into `master` has completed + + - name: Post comment on PR + if: always() # Ensure this step always runs, regardless of merge result + uses: peter-evans/create-or-update-comment@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + issue-number: ${{ github.event.pull_request.number }} + comment-id: ${{ steps.fc.outputs.comment-id }} + edit-mode: replace + body: | + The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR. + + - Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success ✅' || 'Conflict ❌' }} + + ${{ steps.merge_master.outputs.mergeable == 'true' && 'This PR is ready to be merged.' || 'A separate PR will be needed to merge `3.3.x` into `master`.' }} + + - name: Mark job as succeeded + if: always() + run: echo "Merge check completed. Ignoring the result to avoid failed status." diff --git a/.github/workflows/merge_3.3.x_to_master.yml b/.github/workflows/merge_3.3.x_to_master.yml new file mode 100644 index 00000000000..9aea009c3a3 --- /dev/null +++ b/.github/workflows/merge_3.3.x_to_master.yml @@ -0,0 +1,60 @@ +name: Merge 3.3.x into master + +on: + push: + branches: + - 3.3.x + +jobs: + merge-branch: + runs-on: ubuntu-latest + + steps: + - uses: actions/create-github-app-token@v1 + id: app-token + with: + app-id: ${{ vars.MERGE_MASTER_APP_ID }} + private-key: ${{ secrets.MERGE_MASTER_SECRET }} + + - name: Checkout the repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 # Fetch full history for proper merging + ref: 3.3.x # Checkout the 3.3.x branch + token: ${{ steps.app-token.outputs.token }} + + - name: Fetch the latest commit information + id: get-commit-info + run: | + # Get the latest commit SHA and its author details + COMMIT_SHA=$(git rev-parse HEAD) + COMMIT_AUTHOR_NAME=$(git log -1 --pretty=format:'%an' $COMMIT_SHA) + COMMIT_AUTHOR_EMAIL=$(git log -1 --pretty=format:'%ae' $COMMIT_SHA) + + # Save them as output for later steps + echo "commit_sha=$COMMIT_SHA" >> $GITHUB_ENV + echo "commit_author_name=$COMMIT_AUTHOR_NAME" >> $GITHUB_ENV + echo "commit_author_email=$COMMIT_AUTHOR_EMAIL" >> $GITHUB_ENV + + - name: Set up Git with the pull request author's info + run: | + git config --global user.name "${{ env.commit_author_name }}" + git config --global user.email "${{ env.commit_author_email }}" + + - name: Fetch all branches + run: git fetch --all + + - name: Merge 3.3.x into master + run: | + git checkout master + if git merge --no-ff 3.3.x; then + echo "merge_failed=false" >> $GITHUB_ENV + else + echo "merge_failed=true" >> $GITHUB_ENV + fi + + - name: Push changes to master if merge was successful + if: env.merge_failed == 'false' + run: git push origin master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 00000000000..319ddaf4edd --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,636 @@ +name: Tests + +on: + push: + branches: + - 3.3.x + - master + - 'prep-release-*' + tags: + - 'release-*' + pull_request: + branches: + - 3.3.x + - master + - 'prep-release-*' + +jobs: + # Basic checks, e.g. parse errors, commit messages, etc. + basic-checks: + runs-on: ubuntu-latest + strategy: + matrix: + include: + - db: 'none' + php: '8.2' + NOTESTS: 1 + + name: PHP ${{ matrix.php }} - ${{ matrix.db }} + + steps: + - name: Update Ubuntu package lists + run: | + sudo apt-get update -y --allow-releaseinfo-change + + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 100 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv + coverage: none + + - name: Get Composer Cache Directory + id: composer-cache + run: | + cd phpBB + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + cd .. + + - name: Cache Composer dependencies + uses: actions/cache@v4 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }} + + - name: Setup environment for phpBB + env: + DB: ${{ matrix.db }} + PHP_VERSION: ${{ matrix.php }} + NOTESTS: '1' + run: | + .github/setup-phpbb.sh $DB $PHP_VERSION $NOTESTS + + - name: Phing sniff + run: | + .github/phing-sniff.sh + + - name: Check doctum parse errors + run: | + .github/check-doctum-parse-errors.sh + + - name: Check code with psalm + run: | + phpBB/vendor/bin/psalm --output-format=github + + - name: Check image ICC profiles + run: | + .github/check-image-icc-profiles.sh + + - name: Check executable files + run: | + .github/check-executable-files.sh ./ + + - name: Check stylesheets + run: | + .github/check-stylesheet.sh + + - name: Lint JavaScript files + run: | + .github/check-js.sh + + - name: Check commit message + if: github.event_name == 'pull_request' + run: | + git fetch origin $GITHUB_BASE_REF &> /dev/null + git-tools/commit-msg-hook-range.sh $(git rev-parse origin/$GITHUB_BASE_REF)..$GITHUB_SHA + + # Tests for MySQL and MariaDB + mysql-tests: + runs-on: ubuntu-latest + strategy: + matrix: + include: + - php: '8.2' + db: "mariadb:10.2" + - php: '8.2' + db: "mariadb:10.3" + - php: '8.2' + db: "mariadb:10.4" + - php: '8.2' + db: "mariadb:10.6" + - php: '8.2' + db: "mariadb:10.9" + - php: '8.2' + db: "mariadb:10.10" + - php: '8.2' + db: "mariadb:10.11" + - php: '8.2' + db: "mysql:8.0" + db_alias: "MySQL Slow Tests" + SLOWTESTS: 1 + - php: '8.2' + db: "mysql:8.0" + db_alias: "MyISAM Tests" + MYISAM: 1 + - php: '8.2' + db: "mysql:8.0" + - php: '8.2' + db: "mysql:8.4" + - php: '8.2' + db: "mysql:9.4" + - php: '8.3' + db: "mysql:8.0" + - php: '8.4' + db: "mysql:8.4" + - php: '8.5' + db: "mysql:8.4" + - php: '8.5' + db: "mysql:9.4" + + name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} + + services: + mysql: + image: ${{ matrix.db }} + env: + MYSQL_ALLOW_EMPTY_PASSWORD: yes + MYSQL_DATABASE: phpbb_tests + ports: + - 3306:3306 + options: >- + --health-cmd="mysqladmin ping" + --health-interval=10s + --health-timeout=5s + --health-retries=3 + + redis: + image: redis + options: >- + --health-cmd "redis-cli ping" + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + - 6379:6379 + + steps: + - name: Update Ubuntu package lists + run: | + sudo apt-get update -y --allow-releaseinfo-change + + - name: Checkout repository + uses: actions/checkout@v4 + + - id: database-type + env: + MATRIX_DB: ${{ matrix.db }} + run: | + db=$(echo "${MATRIX_DB%%:*}") + echo "db=$db" >> $GITHUB_OUTPUT + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, mysqli, pdo, pdo_mysql, ldap + coverage: none + + - name: Get Composer Cache Directory + id: composer-cache + env: + PHP_VERSION: ${{ matrix.php }} + run: | + cd phpBB + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + cd .. + + - name: Cache Composer dependencies + uses: actions/cache@v4 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }} + + - name: Setup environment for phpBB + env: + DB: ${{steps.database-type.outputs.db}} + PHP_VERSION: ${{ matrix.php }} + NOTESTS: '0' + run: | + .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0} + + - name: Setup database + env: + DB: ${{steps.database-type.outputs.db}} + MYISAM: ${{ matrix.MYISAM != 1 && '0' || '1' }} + run: | + .github/setup-database.sh $DB $MYISAM + + - name: Setup LDAP + if: ${{ matrix.SLOWTESTS == 1 }} + run: | + .github/setup-ldap.sh + + - name: Setup node + uses: actions/setup-node@v6 + with: + node-version: 20 + - name: Setup node dependencies + run: npm ci + + - name: Setup SPHINX + run: | + .github/setup-sphinx.sh + + - name: Lint tests + if: ${{ matrix.SLOWTESTS != 1 && steps.database-type.outputs.db == 'mysql' }} + run: phpBB/vendor/bin/phpunit tests/lint_test.php + + - name: Run unit tests + env: + DB: ${{steps.database-type.outputs.db}} + if: ${{ matrix.SLOWTESTS != 1 && matrix.NOTESTS != 1 }} + run: | + phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --display-all-issues --stop-on-error + + - name: Slow tests + env: + DB: ${{steps.database-type.outputs.db}} + if: ${{ matrix.SLOWTESTS == 1 }} + run: | + phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --group slow + + # Tests for PostgreSQL + postgres-tests: + runs-on: ubuntu-latest + strategy: + matrix: + include: + - php: '8.2' + db: "postgres:9.5" + - php: '8.2' + db: "postgres:9.6" + - php: '8.2' + db: "postgres:10" + - php: '8.2' + db: "postgres:11" + - php: '8.2' + db: "postgres:12" + - php: '8.2' + db: "postgres:13" + - php: '8.2' + db: "postgres:14" + - php: '8.2' + db: "postgres:15" + - php: '8.3' + db: "postgres:9.5" + - php: '8.4' + db: "postgres:9.5" + - php: '8.5' + db: "postgres:9.5" + + name: PHP ${{ matrix.php }} - ${{ matrix.db }} + + services: + postgres: + image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && matrix.db != 'postgres:14' && matrix.db != 'postgres:15' && 'postgres:10' || matrix.db }} + env: + POSTGRES_HOST: localhost + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + ports: + - 5432:5432 + options: >- + -v /var/run/postgresql:/var/run/postgresql + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + + redis: + image: redis + options: >- + --health-cmd "redis-cli ping" + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + - 6379:6379 + + steps: + - name: Update Ubuntu package lists + run: | + sudo apt-get update -y --allow-releaseinfo-change + + - name: Checkout repository + uses: actions/checkout@v4 + + - id: database-type + env: + MATRIX_DB: ${{ matrix.db }} + run: | + db=$(echo "${MATRIX_DB%%:*}") + echo "db=$db" >> $GITHUB_OUTPUT + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, pgsql, pdo, pdo_pgsql + coverage: none + + - name: Get Composer Cache Directory + id: composer-cache + env: + PHP_VERSION: ${{ matrix.php }} + run: | + cd phpBB + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + cd .. + + - name: Cache Composer dependencies + uses: actions/cache@v4 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }} + + - name: Setup environment for phpBB + env: + DB: ${{steps.database-type.outputs.db}} + PHP_VERSION: ${{ matrix.php }} + NOTESTS: '0' + run: | + .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0} + + - name: Setup database + env: + DB: ${{steps.database-type.outputs.db}} + MYISAM: '0' + run: | + .github/setup-database.sh $DB $MYISAM + + - name: Setup node + uses: actions/setup-node@v6 + with: + node-version: 20 + - name: Setup node dependencies + run: npm ci + + - name: Run unit tests + env: + DB: ${{steps.database-type.outputs.db}} + run: | + phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --display-all-issues --stop-on-error + + # Other database types, namely sqlite3 and mssql + other-tests: + runs-on: ubuntu-22.04 + strategy: + matrix: + include: + - php: '8.2' + db: "sqlite3" + - php: '8.2' + db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04" + db_alias: 'MSSQL 2019' + - php: '8.2' + db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04" + db_alias: 'MSSQL 2022' + + name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} + + services: + mssql: + image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }} + env: + SA_PASSWORD: "Pssw0rd_12" + ACCEPT_EULA: "y" + ports: + - 1433:1433 + options: >- + --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Pssw0rd_12' -Q \"Use [master]; CREATE DATABASE [phpbb_tests] COLLATE Latin1_General_CI_AS\" || exit 1" + --health-interval 10s + --health-timeout 5s + --health-retries 5 + --health-start-period 10s + + redis: + image: redis + options: >- + --health-cmd "redis-cli ping" + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + - 6379:6379 + + + steps: + - name: Update Ubuntu package lists + run: | + sudo apt-get update -y --allow-releaseinfo-change + + - name: Checkout repository + uses: actions/checkout@v4 + + - id: database-type + env: + MATRIX_DB: ${{ matrix.db }} + run: | + if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ] + then + db='mssql' + else + db=$(echo "${MATRIX_DB%%:*}") + fi + echo "db=$db" >> $GITHUB_OUTPUT + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, sqlsrv, pdo, pdo_sqlsrv + coverage: none + + - name: Get Composer Cache Directory + id: composer-cache + env: + PHP_VERSION: ${{ matrix.php }} + run: | + cd phpBB + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + cd .. + + - name: Cache Composer dependencies + uses: actions/cache@v4 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }} + + - name: Setup environment for phpBB + env: + DB: ${{steps.database-type.outputs.db}} + PHP_VERSION: ${{ matrix.php }} + NOTESTS: '0' + run: | + .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0} + + - name: Setup database + env: + DB: ${{steps.database-type.outputs.db}} + MYISAM: '0' + run: | + .github/setup-database.sh $DB $MYISAM + + - name: Setup node + uses: actions/setup-node@v6 + with: + node-version: 20 + - name: Setup node dependencies + run: npm ci + + - name: Run unit tests + env: + DB: ${{steps.database-type.outputs.db}} + run: | + phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --display-all-issues --stop-on-error + + # Test with IIS & PostgreSQL on Windows + windows-tests: + runs-on: windows-2025 + strategy: + matrix: + php: ['8.2', '8.3', '8.4', '8.5'] + db: ['postgres'] + + name: Windows - PHP ${{ matrix.php }} - ${{ matrix.db }} + + steps: + - name: Prepare git for Windows + run: | + git config --system core.autocrlf false + git config --system core.eol lf + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql, sodium, bz2, fileinfo + ini-values: upload_tmp_dir=${{ runner.temp }}, sys_temp_dir=${{ runner.temp }} + coverage: none + + - name: Get Composer Cache Directory + id: composer-cache + run: | + cd phpBB + echo "dir=$(composer config cache-files-dir)" >> $env:GITHUB_OUTPUT + cd .. + + - name: Cache Composer dependencies + uses: actions/cache@v4 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: composer-${{ matrix.php }}-${{ hashFiles('phpBB/composer.lock') }} + + - name: Setup environment for phpBB + env: + GITHUB_WORKSPACE: ${{ github.workspace }} + TEMP_DIR: ${{ runner.temp }} + run: | + # Disable Windows Defender real-time monitoring early to improve performance + Set-MpPreference -DisableRealtimeMonitoring $true + + Enable-WindowsOptionalFeature -Online -FeatureName IIS-WebServerRole, IIS-WebServer, IIS-CommonHttpFeatures, IIS-ManagementConsole, IIS-HttpErrors, IIS-HttpRedirect, IIS-WindowsAuthentication, IIS-StaticContent, IIS-DefaultDocument, IIS-HttpCompressionStatic, IIS-DirectoryBrowsing, IIS-WebServerManagementTools, IIS-CGI -All + Set-Service wuauserv -StartupType Manual + (Get-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config).replace("", "`n`t`n`t`t`n`t") | Set-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config + (Get-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config).replace("`t", "`t`t`n`t") | Set-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config + choco install urlrewrite -y + Import-Module WebAdministration + New-WebSite -Name 'phpBBTest' -PhysicalPath "${env:GITHUB_WORKSPACE}\phpBB" -Force + $session = Get-PSSession -Name WinPSCompatSession + $sb = {Set-ItemProperty 'IIS:\Sites\phpBBTest' -name Bindings -value @{protocol='http';bindingInformation='*:80:phpbb.test'}} + Invoke-Command -Scriptblock $sb -Session $session + $sb = {Set-WebConfigurationProperty -filter /system.WebServer/security/authentication/AnonymousAuthentication -name enabled -value true -location "IIS:\Sites\phpBBTest"} + Invoke-Command -Scriptblock $sb -Session $session + Add-Content -Path $env:windir\System32\drivers\etc\hosts -Value "`r`n127.0.0.1`tphpbb.test" -Force + [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";%windir%\system32\inetsrv") + echo Setup FAST-CGI configuration + Add-WebConfiguration -Filter /system.webServer/fastCgi -PSPath IIS:\ -Value @{fullpath="C:\tools\php\php-cgi.exe"} + echo Setup FACT-CGI handler + New-WebHandler -Name "PHP-FastCGI" -Path "*.php" -Modules FastCgiModule -ScriptProcessor "C:\tools\php\php-cgi.exe" -Verb '*' -ResourceType Either + iisreset + NET START W3SVC + + # Wait for IIS to be ready and test connectivity + Start-Sleep -Seconds 10 + try { + $response = Invoke-WebRequest -Uri "http://phpbb.test/" -UseBasicParsing -TimeoutSec 30 + Write-Host "Web server is responding: $($response.StatusCode)" + } catch { + Write-Host "Web server test failed: $_" + } + + # Create directories and set permissions more efficiently + $dirs = @("cache\test", "cache\installer") + foreach ($dir in $dirs) { + New-Item -Path "${env:GITHUB_WORKSPACE}\phpBB\$dir" -ItemType Directory -Force + } + + # Set permissions in batch for better performance + $paths = @("cache", "files", "store", "ext", "vendor-ext", "images\avatars\upload") + foreach ($path in $paths) { + if (Test-Path "${env:GITHUB_WORKSPACE}\phpBB\$path") { + icacls "${env:GITHUB_WORKSPACE}\phpBB\$path" /grant Users:F /T /Q + } + } + + # Set permissions for specific files + $files = @("composer-ext.json", "composer-ext.lock") + foreach ($file in $files) { + if (Test-Path "${env:GITHUB_WORKSPACE}\phpBB\$file") { + icacls "${env:GITHUB_WORKSPACE}\phpBB\$file" /grant Users:F /Q + } + } + + $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule("IIS_IUSRS", "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow") + $acl = Get-ACL "${env:TEMP_DIR}" + $acl.AddAccessRule($accessRule) + Set-ACL -Path "${env:TEMP_DIR}" -ACLObject $acl + cd ${env:GITHUB_WORKSPACE}\phpBB + php ..\composer.phar install + cd .. + - name: Setup database + run: | + $postgreSqlSvc = Get-Service "postgresql*" + Set-Service $postgreSqlSvc.Name -StartupType manual + $runningStatus = [System.ServiceProcess.ServiceControllerStatus]::Running + $maxStartTimeout = New-TimeSpan -Seconds 120 + try { + $postgreSqlSvc.Start() + $postgreSqlSvc.WaitForStatus($runningStatus, $maxStartTimeout) + } catch { + $_ | select * + } + [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";${env:PGBIN}") + $env:PGPASSWORD = 'root' + + # Optimize PostgreSQL for testing performance + psql -c "ALTER SYSTEM SET fsync = off;" -U postgres + psql -c "ALTER SYSTEM SET synchronous_commit = off;" -U postgres + psql -c "ALTER SYSTEM SET checkpoint_completion_target = 0.9;" -U postgres + psql -c "ALTER SYSTEM SET wal_buffers = '16MB';" -U postgres + psql -c "ALTER SYSTEM SET shared_buffers = '128MB';" -U postgres + psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres + psql -c 'create database phpbb_tests;' -U postgres + + Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender + + - name: Setup node + uses: actions/setup-node@v6 + with: + node-version: 20 + - name: Setup node dependencies + run: npm ci + + - name: Run unit tests + uses: nick-fields/retry@v3 + with: + timeout_minutes: 15 + max_attempts: 3 + command: phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --display-all-issues --stop-on-error --exclude-group functional,slow diff --git a/.gitignore b/.gitignore index 10a4e85c2ed..9d4e1bf2f9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +1,60 @@ -*~ -/phpunit.xml +# Excludes cache /phpBB/cache/* !/phpBB/cache/.htaccess !/phpBB/cache/index.html -/phpBB/composer.phar + +# Excludes user data /phpBB/config*.php* /phpBB/ext/* /phpBB/files/* /phpBB/images/avatars/gallery/* /phpBB/images/avatars/upload/* /phpBB/images/ranks/* -/phpBB/install/schemas/schema.json +/phpBB/store/* + +# Excludes all custom langages /phpBB/language/* !/phpBB/language/en -/phpBB/store/* + +# Excludes all custom styles /phpBB/styles/* !/phpBB/styles/prosilver +!/phpBB/styles/prosilver/theme/en +!/phpBB/styles/prosilver/theme/images !/phpBB/styles/all -node_modules + +# Excludes all custom env +/phpBB/config/* +!/phpBB/config/default +!/phpBB/config/development +!/phpBB/config/installer +!/phpBB/config/production +!/phpBB/config/test +!/phpBB/config/.htaccess + +# Excludes vendors /phpBB/vendor /phpBB/vendor-ext/* !/phpBB/vendor-ext/.git-keep /phpBB/composer-ext.json /phpBB/composer-ext.lock + +# Excludes test / dev files +/phpunit.xml +/.phpunit.result.cache +/phpBB/composer.phar /tests/phpbb_unit_tests.sqlite* /tests/test_config*.php /tests/tmp/* /tests/vendor /vagrant/phpbb-install-config.yml .vagrant +node_modules +/build/package_signature + +# Excludes IDE / editors files +*~ +.idea +*.DS_Store* +/.vscode +/.phpunit.result.cache diff --git a/.jscsrc b/.jscsrc deleted file mode 100644 index 9dd5ab82e6c..00000000000 --- a/.jscsrc +++ /dev/null @@ -1,78 +0,0 @@ - -{ - "excludeFiles": ["node_modules/**", "**/build/**"], - "requireCurlyBraces": [ - "if", "else", "for", "while", "do", "try", "catch" - ], - "requireSpaceBeforeKeywords": [ - "else", "while", "catch" - ], - "requireSpaceAfterKeywords": [ - "do", "for", "if", "else", "switch", "case", "try", "catch", "while", "return", "typeof" - ], - "requireSpaceBeforeBlockStatements": true, - "requireParenthesesAroundIIFE": true, - "requireSpacesInConditionalExpression": { - "afterTest": true, - "beforeConsequent": true, - "afterConsequent": true, - "beforeAlternate": true - }, - "requireSpacesInAnonymousFunctionExpression": { - "beforeOpeningCurlyBrace": true - }, - "disallowSpacesInNamedFunctionExpression": { - "beforeOpeningRoundBrace": true - }, - "requireSpacesInFunction": { - "beforeOpeningCurlyBrace": true - }, - "disallowSpacesInCallExpression": true, - "requireBlocksOnNewline": true, - "requirePaddingNewlinesBeforeKeywords": ["case"], - "disallowEmptyBlocks": true, - "disallowSpacesInsideArrayBrackets": "nested", - "disallowSpacesInsideParentheses": true, - "requireSpacesInsideObjectBrackets": "all", - "disallowQuotedKeysInObjects": "allButReserved", - "disallowSpaceAfterObjectKeys": true, - "requireSpaceBeforeObjectValues": true, - "requireCommaBeforeLineBreak": true, - "requireOperatorBeforeLineBreak": [ - "?", "=", "+", "-", "/", "*", "===", "!==", ">", ">=", "<", "<=" - ], - "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"], - "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], - "requireSpaceBeforeBinaryOperators": [ - "=", "+", "+=", "-", "-=", "/", "/=", "*", "*=", "===", "!==", "<", "<=", ">", ">=" - ], - "requireSpaceAfterBinaryOperators": [ - "=", "+", "+=", "-", "-=", "/", "/=", "*", "*=", "===", "!==", "<", "<=", ">", ">=" - ], - "disallowKeywords": ["with"], - "disallowMultipleLineStrings": true, - "disallowMixedSpacesAndTabs": "smart", - "disallowTrailingWhitespace": true, - "disallowTrailingComma": true, - "disallowKeywordsOnNewLine": ["else"], - "requireLineFeedAtFileEnd": true, - "maximumLineLength": { - "value": 120, - "tabSize": 4, - "allowUrlComments": true, - "allowRegex": true - }, - "requireCapitalizedConstructors": true, - "requireDotNotation": true, - "disallowYodaConditions": true, - "requireSpaceAfterLineComment": { - "allExcept": ["#", "="] - }, - "disallowNewlineBeforeBlockStatements": true, - "validateQuoteMarks": { - "mark": "'", - "escape": true - }, - "validateParameterSeparator": ", ", - "safeContextKeyword": ["that"] -} diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index c1efecd5735..00000000000 --- a/.jshintrc +++ /dev/null @@ -1,25 +0,0 @@ - -{ - "bitwise": true, - "curly": true, - "eqeqeq": true, - "es3": true, - "forin": false, - "freeze": true, - "newcap": true, - "noarg": true, - "noempty": true, - "nonbsp": true, - "undef": true, - "unused": true, - "strict": true, - - "browser": true, - "devel": true, - "jquery": true, - - "globals": { - "JSON": true, - "phpbb": true - } -} diff --git a/.postcss-sorting.json b/.postcss-sorting.json deleted file mode 100644 index 11a55f3c3d9..00000000000 --- a/.postcss-sorting.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "order": [ - "custom-properties", - "dollar-variables", - { - "type": "at-rule", - "name": "include" - }, - "declarations", - "rules", - { - "type": "at-rule", - "name": "media" - } - ], - "properties-order": [ - { - "emptyLineBefore": false, - "properties": [ - "font", - "font-family", - "font-size", - "font-weight", - "font-style", - "font-variant", - "font-size-adjust", - "font-stretch", - "font-effect", - "font-emphasize", - "font-emphasize-position", - "font-emphasize-style", - "font-smooth", - "font-smoothing", - "line-height", - "text-align", - "text-align-last", - "vertical-align", - "white-space", - "text-decoration", - "text-emphasis", - "text-emphasis-color", - "text-emphasis-style", - "text-emphasis-position", - "text-indent", - "text-justify", - "letter-spacing", - "word-spacing", - "writing-mode", - "text-outline", - "text-transform", - "text-size-adjust", - "text-wrap", - "text-overflow", - "text-overflow-ellipsis", - "text-overflow-mode", - "word-wrap", - "word-break", - "tab-size", - "hyphens" - ] - }, - { - "emptyLineBefore": false, - "properties": [ - "background", - "background-color", - "background-image", - "background-repeat", - "background-attachment", - "background-position", - "background-position-x", - "background-position-y", - "background-clip", - "background-origin", - "background-size", - "interpolation-mode", - "filter", - "border", - "border-width", - "border-style", - "border-color", - "border-top", - "border-top-width", - "border-top-style", - "border-top-color", - "border-right", - "border-right-width", - "border-right-style", - "border-right-color", - "border-bottom", - "border-bottom-width", - "border-bottom-style", - "border-bottom-color", - "border-left", - "border-left-width", - "border-left-style", - "border-left-color", - "border-radius", - "border-top-left-radius", - "border-top-right-radius", - "border-bottom-right-radius", - "border-bottom-left-radius", - "border-image", - "border-image-source", - "border-image-slice", - "border-image-width", - "border-image-outset", - "border-image-repeat", - "outline", - "outline-width", - "outline-style", - "outline-color", - "outline-offset", - "tap-highlight-color" - ] - }, - { - "emptyLineBefore": false, - "properties": [ - "box-decoration-break", - "box-shadow", - "text-shadow" - ] - }, - { - "emptyLineBefore": false, - "properties": [ - "color", - "opacity" - ] - }, - { - "emptyLineBefore": false, - "properties": [ - "position", - "z-index", - "top", - "right", - "bottom", - "left" - ] - }, - { - "emptyLineBefore": false, - "properties": [ - "display", - "visibility", - "float", - "clear", - "overflow", - "overflow-x", - "overflow-y", - "overflow-scrolling", - "clip", - "zoom", - "flex", - "flex-direction", - "flex-order", - "flex-pack", - "flex-align", - "flex-basis", - "flex-grow", - "flex-shrink", - "flex-wrap", - "justify-content", - "align-items", - "align-self" - ] - }, - { - "emptyLineBefore": false, - "properties": [ - "box-sizing", - "width", - "min-width", - "max-width", - "height", - "min-height", - "max-height", - "margin", - "margin-top", - "margin-right", - "margin-bottom", - "margin-left", - "padding", - "padding-top", - "padding-right", - "padding-bottom", - "padding-left" - ] - }, - { - "emptyLineBefore": false, - "properties": [ - "table-layout", - "empty-cells", - "caption-side", - "border-spacing", - "border-collapse", - "list-style", - "list-style-position", - "list-style-type", - "list-style-image" - ] - }, - { - "emptyLineBefore": false, - "properties": [ - "content", - "quotes", - "counter-reset", - "counter-increment", - "resize", - "cursor", - "touch-callout", - "touch-action", - "user-select", - "nav-index", - "nav-up", - "nav-right", - "nav-down", - "nav-left", - "transition", - "transition-delay", - "transition-timing-function", - "transition-duration", - "transition-property", - "transform", - "transform-origin", - "animation", - "animation-name", - "animation-duration", - "animation-play-state", - "animation-timing-function", - "animation-delay", - "animation-iteration-count", - "animation-direction", - "pointer-events" - ] - } - ], - "unspecified-properties-position": "bottomAlphabetical" -} diff --git a/.stylelintrc b/.stylelintrc index fc50e40c1ca..82c0db3515b 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -3,7 +3,7 @@ "stylelint-order" ], "ignoreFiles": [ - "./phpBB/styles/prosilver/theme/normalize.css", + "./phpBB/styles/prosilver/theme/normalize.css" ], "rules": { "at-rule-name-case": "lower", @@ -61,10 +61,10 @@ "declaration-empty-line-before": "never", - "declaration-property-unit-blacklist": { + "declaration-property-unit-disallowed-list": { "line-height": ["rem", "em", "%"] }, - "declaration-property-unit-whitelist": { + "declaration-property-unit-allowed-list": { "height": ["px", "%", "vh"], "width": ["px", "%", "vw"], "font-size": ["px", "rem", "%"], @@ -180,21 +180,27 @@ "value-list-comma-newline-before": "never-multi-line", "value-list-comma-space-after": "always-single-line", "value-list-comma-space-before": "never", - "order/declaration-block-order": [ + "order/order": [ "custom-properties", "dollar-variables", { "type": "at-rule", - "name": "include" + "name": "include", + "parameter": "type" }, "declarations", "rules", + { + "type": "at-rule", + "name": "include", + "parameter": "fluid" + }, { "type": "at-rule", "name": "media" } ], - "order/declaration-block-properties-specified-order": [ + "order/properties-order": [ [ "font", "font-family", @@ -385,7 +391,7 @@ "animation-direction", "pointer-events" ], - { unspecified: "bottomAlphabetical" } + { "unspecified": "bottomAlphabetical" } ] } } diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 39b858801b6..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,57 +0,0 @@ -language: php -sudo: required -dist: precise - -matrix: - include: - - php: 5.6 - env: DB=none;NOTESTS=1 - - php: 5.6 - env: DB=mariadb - - php: 5.6 - env: DB=postgres - - php: 5.6 - env: DB=sqlite3 - - php: 5.6 - env: DB=mysqli;SLOWTESTS=1 - - php: 5.6 - env: DB=mysqli # MyISAM - - php: 5.6 - env: DB=mysql - - php: 7.0 - env: DB=mysqli - - php: 7.1 - env: DB=mysqli - - php: 7.2 - env: DB=mysqli - - php: nightly - env: DB=mysqli - allow_failures: - - php: nightly - fast_finish: true - -addons: - apt: - sources: - - node - -services: - - redis-server - -install: - - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS - -before_script: - - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS - - phantomjs --webdriver=8910 > /dev/null & - -script: - - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION $NOTESTS - - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION $NOTESTS - - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS - - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./ - - travis/check-stylesheet.sh $NOTESTS - - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/lint_test.php; fi" - - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --verbose --stop-on-error; fi" - - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi" - - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git remote set-branches --add origin $TRAVIS_BRANCH && git fetch && git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA; fi" diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000000..46ce7fa44d1 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,18 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Debug phpBB", + "type": "php", + "request": "launch", + "port": 9003, + "pathMappings": { + "/var/www/html": "${workspaceRoot}/phpBB/" + }, + "log": true + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..aec06519756 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "php.debug.ideKey": "VSCODE" +} diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000000..ce992b2ce7a --- /dev/null +++ b/LICENSE @@ -0,0 +1,281 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + diff --git a/README.md b/README.md index d1854dc74d4..228d62047f6 100644 --- a/README.md +++ b/README.md @@ -1,40 +1,50 @@ -[![phpBB](https://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com) - -## ABOUT +[phpBB](https://www.phpbb.com) phpBB is a free open-source bulletin board written in PHP. -## COMMUNITY +## 🧑🏻‍🤝🏻🧑🏽 Community + +Get your copy of phpBB, find support and lots more on [phpBB.com](https://www.phpbb.com). Discuss the development on [area51](https://area51.phpbb.com/phpBB/index.php). -Get your copy of phpBB, find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the development on [area51](http://area51.phpbb.com/phpBB/index.php). +## 👨‍💻 Contribute -## INSTALLING DEPENDENCIES +1. [Create an account on phpBB.com](https://www.phpbb.com/community/ucp.php?mode=register) +2. [Create a ticket (unless there already is one)](https://tracker.phpbb.com/secure/CreateIssue!default.jspa) +3. Read our [Coding guidelines](https://area51.phpbb.com/docs/dev/development/coding_guidelines.html) and [Git Contribution Guidelines](https://area51.phpbb.com/docs/dev/development/git.html) +4. Send us a pull request -To be able to run an installation from the repo (and not from a pre-built package) you need to run the following commands to install phpBB's dependencies. +### 🏗️ Setting up a development build of phpBB - cd phpBB - php ../composer.phar install +To run an installation from the repo (and not from a pre-built package) on a local server, run the following commands: +- Fork phpbb/phpbb to your GitHub account, then create a local clone of it: + ``` + git clone https://github.com/your_github_name/phpbb.git + ``` +- Install phpBB's dependencies (from the root of your phpbb repo): + ``` + cd phpBB + php ../composer.phar install + ``` -## CONTRIBUTE +Alternatively, you can read: -1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register) -2. [Create a ticket (unless there already is one)](http://tracker.phpbb.com/secure/CreateIssue!default.jspa) -3. Read our [Coding guidelines](https://area51.phpbb.com/docs/dev/development/coding_guidelines.html) and [Git Contribution Guidelines](https://area51.phpbb.com/docs/dev/development/git.html) -4. Send us a pull request +* Our [Vagrant documentation](phpBB/docs/vagrant.md) to find out how to use Vagrant to develop and contribute to phpBB. +* Our [GitHub Codespaces documentation](phpBB/docs/codespaces.md) to learn about phpBB's cloud-based development environment. -## VAGRANT +## 📓 Documentation -Read our [Vagrant documentation](phpBB/docs/vagrant.md) to find out how to use Vagrant to develop and contribute to phpBB. +phpBB's [Development Documentation](https://area51.phpbb.com/docs/dev/index.html) contains all the information you'll need to learn about developing for phpBB's core, extensions and automated testing. -## AUTOMATED TESTING +## 🔬 Automated Testing -We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](https://bamboo.phpbb.com) or check our travis builds below: +We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](https://bamboo.phpbb.com) or check our GitHub Actions below: -* [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=master)](http://travis-ci.org/phpbb/phpbb)[![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/master?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/master) **master** - Latest development version -* [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.2.x)](http://travis-ci.org/phpbb/phpbb)[![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/3.2.x?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/3.2.x) **3.2.x** - Development of version 3.2.x -* [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.1.x)](http://travis-ci.org/phpbb/phpbb) **3.1.x** - Development of version 3.1.x +Branch | Description | GitHub Actions | +------- | ----------- | -------------- | +**master** | Latest development version | ![Tests](https://github.com/phpbb/phpbb/actions/workflows/tests.yml/badge.svg?branch=master) | +**3.3.x** | Development of version 3.3.x | ![Tests](https://github.com/phpbb/phpbb/actions/workflows/tests.yml/badge.svg?branch=3.3.x) | -## LICENSE +## 📜 License [GNU General Public License v2](http://opensource.org/licenses/gpl-2.0.php) diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000000..b62f160225e --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,13 @@ +# Security Policy + +## Reporting a Vulnerability + +Please do not post potential security vulnerabilities publicly. Instead, report them to the phpBB team. +We take security very seriously and will respond to reports about potential security vulnerabilities as quickly as possible. +There are multiple ways a potential security vulnerability can be reported: + +- HackerOne: [phpBB | Vulnerability Disclosure Program | HackerOne](https://hackerone.com/phpbb) +- Create a report in the security tracker: [Security Tracker](https://www.phpbb.com/security/) +- Send an email: [security@phpbb.com](mailto:security@phpbb.com) + +Please provide as much detail as possible when reporting a vulnerability. You can expect to receive an update on your report within a few days. If the vulnerability is accepted, we will work on a fix and keep you informed of the progress. If the vulnerability is declined, we will provide an explanation. diff --git a/Vagrantfile b/Vagrantfile index ab225c9ad91..c80dfd98f86 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -11,15 +11,15 @@ aliasesPath = "vagrant/aliases" require File.expand_path(confDir + '/scripts/homestead.rb') Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - if File.exists? aliasesPath then + if File.exist? aliasesPath then config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases" end - if File.exists? homesteadYamlPath then + if File.exist? homesteadYamlPath then Homestead.configure(config, YAML::load(File.read(homesteadYamlPath))) end - if File.exists? afterScriptPath then + if File.exist? afterScriptPath then config.vm.provision "shell", path: afterScriptPath end end diff --git a/build/build.xml b/build/build.xml index 8bf6fb750f5..a1c5511457d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + @@ -81,31 +81,47 @@ --ignore=${project.basedir}/phpBB/phpbb/db/migration/data/v30x/* phpBB/phpbb" dir="." returnProperty="retval-php-strict" passthru="true" /> + + + + + - + + + + + + + + + + @@ -121,13 +137,13 @@ @@ -159,31 +175,32 @@ - + - + - + - + + save/phpbb-${prevversion}_to_${newversion}_language.patch" /> save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" /> + + + + + + @@ -212,6 +235,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/build_changelog.php b/build/build_changelog.php index 2d38480f9fa..e95ed0e7b93 100755 --- a/build/build_changelog.php +++ b/build/build_changelog.php @@ -1,16 +1,16 @@ #!/usr/bin/env php -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ + * + * This file is part of the phpBB Forum Software package. + * + * @copyright (c) phpBB Limited + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ if ($_SERVER['argc'] != 2) { @@ -18,40 +18,54 @@ exit(1); } -$fixVersion = $_SERVER['argv'][1]; +if ($_SERVER['argv'][1] == '--stdin') +{ + $stdIn = file_get_contents('php://stdin'); + // XML output from tracker can be directly piped to this script using: + // cat tracker_output.xml | php build/build_changelog.php --stdin + $xml = simplexml_load_string($stdIn); +} +else +{ + $fixVersion = $_SERVER['argv'][1]; -$query = 'project IN (PHPBB3, SECURITY) - AND resolution = Fixed - AND fixVersion = "' . $fixVersion . '" - AND status IN ("Unverified Fix", Closed)'; + $query = 'project IN (PHPBB, PHPBB3, SECURITY) + AND resolution = Fixed + AND fixVersion = "' . $fixVersion . '" + AND status IN ("Unverified Fix", Closed)'; -$url = 'http://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000'; -$xml = simplexml_load_string(file_get_contents($url)); + $url = 'https://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000'; + $xml = simplexml_load_string(file_get_contents($url)); +} +$types = []; foreach ($xml->xpath('//item') as $item) { $key = (string) $item->key; - $keyUrl = 'http://tracker.phpbb.com/browse/' . $key; + $keyUrl = 'https://tracker.phpbb.com/browse/' . $key; $keyLink = '' . $key . ''; - $value = str_replace($key, $keyLink, htmlspecialchars($item->title)); + $value = str_replace($key, $keyLink, htmlspecialchars($item->title, ENT_COMPAT)); $value = str_replace(']', '] -', $value); $types[(string) $item->type][$key] = $value; } -ksort($types); -foreach ($types as $type => $tickets) +if (count($types)) { - echo "

$type

\n"; - echo "
    \n"; + ksort($types); + foreach ($types as $type => $tickets) + { + echo "

    $type

    \n"; + echo "
      \n"; - uksort($tickets, 'strnatcasecmp'); + uksort($tickets, 'strnatcasecmp'); - foreach ($tickets as $ticket) - { - echo "
    • $ticket
      • \n"; + foreach ($tickets as $ticket) + { + echo "
    • $ticket
      • \n"; + } + echo "
    \n"; } - echo "
\n"; } diff --git a/build/build_helper.php b/build/build_helper.php index ff93c22a12c..63d0c3c7702 100644 --- a/build/build_helper.php +++ b/build/build_helper.php @@ -33,7 +33,7 @@ class build_package var $status_begun = false; var $num_dots = 0; - function build_package($versions, $verbose = false) + function __construct($versions, $verbose = false) { $this->versions = $versions; $this->verbose = $verbose; @@ -43,14 +43,14 @@ function build_package($versions, $verbose = false) $_before = $this->versions[count($this->versions) - 2]; $this->locations = array( - 'new_version' => dirname(dirname(__FILE__)) . '/phpBB/', - 'old_versions' => dirname(__FILE__) . '/old_versions/', - 'root' => dirname(__FILE__) . '/', - 'package_dir' => dirname(__FILE__) . '/new_version/' + 'new_version' => dirname(__DIR__) . '/phpBB/', + 'old_versions' => __DIR__ . '/old_versions/', + 'root' => __DIR__ . '/', + 'package_dir' => __DIR__ . '/new_version/' ); $this->package_infos = array( - 'package_name' => 'phpBB3', + 'package_name' => 'phpBB', 'name_prefix' => 'phpbb', 'simple_name' => 'release-' . $_latest, 'new_version_number' => $_latest, diff --git a/build/code_sniffer/phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php b/build/code_sniffer/phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php new file mode 100644 index 00000000000..64b30a859e3 --- /dev/null +++ b/build/code_sniffer/phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php @@ -0,0 +1,116 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\Sniffs\CodeLayout; + +use PHP_CodeSniffer\Files\File; +use PHP_CodeSniffer\Sniffs\Sniff; + +/** + * Checks that union type declarations follows the coding guidelines. + */ +class UnionTypesCheckSniff implements Sniff +{ + /** + * {@inheritdoc} + */ + public function register() + { + return [ + T_FUNCTION, + T_CLASS, + ]; + } + + /** + * {@inheritdoc} + */ + public function process(File $phpcsFile, $stackPtr) + { + $tokens = $phpcsFile->getTokens(); + if ($tokens[$stackPtr]['type'] === 'T_FUNCTION') + { + $method_params = $phpcsFile->getMethodParameters($stackPtr); + $method_params_array = array_column($method_params, 'type_hint', 'token'); + foreach ($method_params_array as $stack_pointer => $type_hint) + { + $this->check_union_type($phpcsFile, $stack_pointer, $type_hint); + } + + $method_properties = $phpcsFile->getMethodProperties($stackPtr); + $this->check_union_type($phpcsFile, $stackPtr, $method_properties['return_type']); + } + else if ($tokens[$stackPtr]['type'] === 'T_CLASS') + { + $class_token = $tokens[$stackPtr]; + $class_closer_pointer = $class_token['scope_closer']; + $first_method_pointer = $phpcsFile->findNext(T_FUNCTION, $stackPtr); + $class_members_declarations_end_pointer = $first_method_pointer ?: $class_closer_pointer; + + $stack_pointer = $stackPtr; + while(($class_member_pointer = $phpcsFile->findNext(T_VARIABLE, $stack_pointer)) !== false && ($class_member_pointer < $class_members_declarations_end_pointer)) + { + $properties = $phpcsFile->getMemberProperties($class_member_pointer); + $this->check_union_type($phpcsFile, $class_member_pointer, $properties['type']); + $stack_pointer = $class_member_pointer + 1; + } + } + } + + public function check_union_type(File $phpcsFile, $stack_pointer, $type_hint) + { + if (empty($type_hint)) + { + return; + } + + if (!strpos($type_hint, '|') && $type_hint[0] == '?') // Check nullable shortcut syntax + { + $type = substr($type_hint, 1); + $error = 'Nullable shortcut syntax must not be used. Use union type instead: %1$s|null; found %2$s'; + $data = [$type, $type_hint]; + $phpcsFile->addError($error, $stack_pointer, 'ShortNullableSyntax', $data); + } + else if ((count($types_array = explode('|', $type_hint))) > 1) // Check union type layout + { + $types_array_null_less = $types_array; + + // Check 'null' to be the last element + $null_position = array_search('null', $types_array); + if ($null_position !== false && $null_position != array_key_last($types_array)) + { + $error = 'The "null" type hint must be the last of the union type elements; found %s'; + $data = [implode('|', $types_array)]; + $phpcsFile->addError($error, $stack_pointer, 'NullAlwaysLast', $data); + } + + // Check types excepting 'null' to follow alphabetical order + if ($null_position !== false) + { + array_splice($types_array_null_less, $null_position, 1); + } + + if (count($types_array_null_less) > 1) + { + $types_array_null_less_sorted = $types_array_null_less; + sort($types_array_null_less_sorted); + if (!empty(array_diff_assoc($types_array_null_less, $types_array_null_less_sorted))) + { + $error = 'Union type elements must be sorted alphabetically excepting the "null" type hint must be the last if any; found %s'; + $data = [implode('|', $types_array)]; + $phpcsFile->addError($error, $stack_pointer, 'AlphabeticalSort', $data); + } + } + } + } +} diff --git a/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php b/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php index 8c0ec853ff3..d79657af12c 100644 --- a/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php @@ -11,6 +11,11 @@ * */ +namespace phpbb\Sniffs\Commenting; + +use PHP_CodeSniffer\Files\File; +use PHP_CodeSniffer\Sniffs\Sniff; + /** * Checks that each PHP source file contains a valid header as defined by the * phpBB Coding Guidelines. @@ -18,7 +23,7 @@ * @package code_sniffer * @author Manuel Pichler */ -class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff +class FileCommentSniff implements Sniff { /** * Returns an array of tokens this test wants to listen for. @@ -33,13 +38,13 @@ public function register() /** * Processes this test, when one of its tokens is encountered. * - * @param PHP_CodeSniffer_File $phpcsFile The file being scanned. + * @param File $phpcsFile The file being scanned. * @param int $stackPtr The position of the current token * in the stack passed in $tokens. * - * @return null + * @return void */ - public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) + public function process(File $phpcsFile, $stackPtr): void { // We are only interested in the first file comment. if ($stackPtr !== 0) @@ -62,7 +67,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) // Mark as error if this is not a doc comment else if ($start === false || $tokens[$start]['code'] !== T_DOC_COMMENT_OPEN_TAG) { - $phpcsFile->addError('Missing required file doc comment.', $stackPtr); + $phpcsFile->addError('Missing required file doc comment.', $stackPtr, 'MissingComment'); return; } @@ -82,7 +87,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) if ($tokens[$token]['column'] === 1 && (($tokens[$token]['content'] !== '*' && $tokens[$token]['content'] !== ' ') || ($tokens[$token]['content'] === ' ' && $tokens[$token + 1]['content'] !== '*'))) { $message = 'The file doc comment should not be indented.'; - $phpcsFile->addWarning($message, $token); + $phpcsFile->addWarning($message, $token, 'CommentIndented'); } } @@ -95,13 +100,13 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) if (!(($tokens[$start + 2]['content'] !== '*' && $tokens[$start + 4]['content'] !== '*') || ($tokens[$start + 3]['content'] !== '*' && $tokens[$start + 6]['content'] !== '*'))) { $message = 'The first file comment line should be empty.'; - $phpcsFile->addWarning($message, ($start + 1)); + $phpcsFile->addWarning($message, ($start + 1), 'CommentFirstNotEmpty'); } if ($tokens[$end - 3]['content'] !== '*' && $tokens[$end - 6]['content'] !== '*') { $message = 'The last file comment line should be empty.'; - $phpcsFile->addWarning($message, $end - 1); + $phpcsFile->addWarning($message, $end - 1, 'CommentLastNotEmpty'); } //$this->processPackage($phpcsFile, $start, $tags); @@ -113,59 +118,59 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) /** * Checks that the tags array contains a valid package tag * - * @param PHP_CodeSniffer_File $phpcsFile The context source file instance. + * @param File $phpcsFile The context source file instance. * @param integer The stack pointer for the first comment token. * @param array(string=>array) $tags The found file doc comment tags. * - * @return null + * @return void */ - protected function processPackage(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags) + protected function processPackage(File $phpcsFile, $ptr, $tags): void { if (!isset($tags['package'])) { $message = 'Missing require @package tag in file doc comment.'; - $phpcsFile->addError($message, $ptr); + $phpcsFile->addError($message, $ptr, 'MissingTagPackage'); } else if (preg_match('/^([\w]+)$/', $tags['package'][0]) === 0) { $message = 'Invalid content found for @package tag.'; - $phpcsFile->addWarning($message, $tags['package'][1]); + $phpcsFile->addWarning($message, $tags['package'][1], 'InvalidTagPackage'); } } /** * Checks that the tags array contains a valid version tag * - * @param PHP_CodeSniffer_File $phpcsFile The context source file instance. + * @param File $phpcsFile The context source file instance. * @param integer The stack pointer for the first comment token. * @param array(string=>array) $tags The found file doc comment tags. * - * @return null + * @return void */ - protected function processVersion(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags) + protected function processVersion(File $phpcsFile, $ptr, $tags): void { if (!isset($tags['version'])) { $message = 'Missing require @version tag in file doc comment.'; - $phpcsFile->addError($message, $ptr); + $phpcsFile->addError($message, $ptr, 'MissingTagVersion'); } else if (preg_match('/^\$Id:[^\$]+\$$/', $tags['version'][0]) === 0) { $message = 'Invalid content found for @version tag, use "$Id: $".'; - $phpcsFile->addError($message, $tags['version'][1]); + $phpcsFile->addError($message, $tags['version'][1], 'InvalidTagVersion'); } } /** * Checks that the tags array contains a valid copyright tag * - * @param PHP_CodeSniffer_File $phpcsFile The context source file instance. + * @param File $phpcsFile The context source file instance. * @param integer The stack pointer for the first comment token. * @param array(string=>array) $tags The found file doc comment tags. * - * @return null + * @return void */ - protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags) + protected function processCopyright(File $phpcsFile, $ptr, $tags): void { $copyright = '(c) phpBB Limited '; $tokens = $phpcsFile->getTokens(); @@ -177,7 +182,7 @@ protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags if ($tokens[$tag + 2]['content'] !== $copyright) { $message = 'Invalid content found for the first @copyright tag, use "' . $copyright . '".'; - $phpcsFile->addError($message, $tags['copyright'][0][1]); + $phpcsFile->addError($message, $tags['copyright'][0][1], 'InvalidTagCopyright'); } return; @@ -185,19 +190,19 @@ protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags } $message = 'Missing require @copyright tag in file doc comment.'; - $phpcsFile->addError($message, $ptr); + $phpcsFile->addError($message, $ptr, 'MissingTagCopyright'); } /** * Checks that the tags array contains a valid license tag * - * @param PHP_CodeSniffer_File $phpcsFile The context source file instance. + * @param File $phpcsFile The context source file instance. * @param integer The stack pointer for the first comment token. * @param array(string=>array) $tags The found file doc comment tags. * - * @return null + * @return void */ - protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags) + protected function processLicense(File $phpcsFile, $ptr, $tags): void { $license = 'GNU General Public License, version 2 (GPL-2.0)'; $tokens = $phpcsFile->getTokens(); @@ -210,7 +215,7 @@ protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags) if ($found) { $message = 'It must be only one @license tag in file doc comment.'; - $phpcsFile->addError($message, $ptr); + $phpcsFile->addError($message, $ptr, 'MultiTagVersion'); } $found = true; @@ -218,7 +223,7 @@ protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags) if ($tokens[$tag + 2]['content'] !== $license) { $message = 'Invalid content found for @license tag, use "' . $license . '".'; - $phpcsFile->addError($message, $tags['license'][0][1]); + $phpcsFile->addError($message, $tags['license'][0][1], 'InvalidTagLicense'); } } } @@ -226,7 +231,7 @@ protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags) if (!$found) { $message = 'Missing require @license tag in file doc comment.'; - $phpcsFile->addError($message, $ptr); + $phpcsFile->addError($message, $ptr, 'MissingTagLicense'); } } } diff --git a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php index 885c38c5b45..9e74f25839d 100644 --- a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php @@ -11,11 +11,16 @@ * */ +namespace phpbb\Sniffs\ControlStructures; + +use PHP_CodeSniffer\Files\File; +use PHP_CodeSniffer\Sniffs\Sniff; + /** * Checks that the opening brace of a control structures is on the line after. * From Generic_Sniffs_Functions_OpeningFunctionBraceBsdAllmanSniff */ -class phpbb_Sniffs_ControlStructures_OpeningBraceBsdAllmanSniff implements PHP_CodeSniffer_Sniff +class OpeningBraceBsdAllmanSniff implements Sniff { /** * Registers the tokens that this sniff wants to listen for. @@ -36,13 +41,13 @@ public function register() /** * Processes this test, when one of its tokens is encountered. * - * @param PHP_CodeSniffer_File $phpcsFile The file being scanned. + * @param File $phpcsFile The file being scanned. * @param int $stackPtr The position of the current token in the * stack passed in $tokens. * * @return void */ - public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) + public function process(File $phpcsFile, $stackPtr) { $tokens = $phpcsFile->getTokens(); diff --git a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php index 349bccbb020..daad603a6cb 100644 --- a/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php @@ -10,12 +10,16 @@ * the docs/CREDITS.txt file. * */ +namespace phpbb\Sniffs\ControlStructures; + +use PHP_CodeSniffer\Files\File; +use PHP_CodeSniffer\Sniffs\Sniff; /** * Checks that there is exactly one space between the keyword and the opening * parenthesis of a control structures. */ -class phpbb_Sniffs_ControlStructures_OpeningParenthesisSniff implements PHP_CodeSniffer_Sniff +class OpeningParenthesisSniff implements Sniff { /** * Registers the tokens that this sniff wants to listen for. @@ -36,13 +40,13 @@ public function register() /** * Processes this test, when one of its tokens is encountered. * - * @param PHP_CodeSniffer_File $phpcsFile The file being scanned. + * @param File $phpcsFile The file being scanned. * @param int $stackPtr The position of the current token in the * stack passed in $tokens. * * @return void */ - public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) + public function process(File $phpcsFile, $stackPtr) { $tokens = $phpcsFile->getTokens(); diff --git a/build/code_sniffer/phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php b/build/code_sniffer/phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php new file mode 100644 index 00000000000..948987cd376 --- /dev/null +++ b/build/code_sniffer/phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php @@ -0,0 +1,59 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\Sniffs\ControlStructures; + +use PHP_CodeSniffer\Files\File; +use PHP_CodeSniffer\Sniffs\Sniff; + +/** + * Checks that the visibility qualifiers are placed after the static keyword + * according to the coding guidelines + */ +class StaticKeywordSniff implements Sniff +{ + /** + * Registers the tokens that this sniff wants to listen for. + */ + public function register() + { + return [ + T_STATIC, + ]; + } + + /** + * Processes this test, when one of its tokens is encountered. + * + * @param File $phpcsFile The file being scanned. + * @param int $stackPtr The position of the current token in the stack passed in $tokens. + * + * @return void + */ + public function process(File $phpcsFile, $stackPtr) + { + $tokens = $phpcsFile->getTokens(); + + $disallowed_after_tokens = [ + T_PUBLIC, + T_PROTECTED, + T_PRIVATE, + ]; + + if (in_array($tokens[$stackPtr + 2]['code'], $disallowed_after_tokens)) + { + $error = 'Access specifier (e.g. public) should not follow static scope attribute. Encountered "' . $tokens[$stackPtr + 2]['content'] . '" after static'; + $phpcsFile->addError($error, $stackPtr, 'InvalidStaticFunctionDeclaration'); + } + } +} diff --git a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php index b3cdbf74961..42a0fc5288b 100644 --- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php @@ -11,31 +11,78 @@ * */ +namespace phpbb\Sniffs\Namespaces; + +use PHP_CodeSniffer\Files\File; +use PHP_CodeSniffer\Sniffs\Sniff; + /** * Checks that each use statement is used. */ -class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff +class UnusedUseSniff implements Sniff { + const FIND = [ + T_NS_SEPARATOR, + T_STRING, + T_WHITESPACE, + ]; + + private function getNameTokens() + { + $tokens = [T_NS_SEPARATOR, T_STRING]; + if (defined('T_NAME_QUALIFIED')) + { + $tokens[] = T_NAME_QUALIFIED; + } + if (defined('T_NAME_FULLY_QUALIFIED')) + { + $tokens[] = T_NAME_FULLY_QUALIFIED; + } + if (defined('T_NAME_RELATIVE')) + { + $tokens[] = T_NAME_RELATIVE; + } + return $tokens; + } + /** * {@inheritdoc} */ public function register() { - return array(T_USE); + return [T_USE]; } - protected function check($phpcsFile, $found_name, $full_name, $short_name, $line) + protected function check(File $phpcsFile, $found_name, $full_name, $short_name, $stack_pointer) { + $found_name_normalized = ltrim($found_name, '\\'); + $full_name = ltrim($full_name, '\\'); + + $is_global = ($full_name === $short_name); + $unnecessarily_fully_qualified = ($is_global) + ? ($found_name_normalized !== $found_name && $found_name_normalized === $short_name) + : ($found_name_normalized === $full_name); - if ($found_name === $full_name) + if ($unnecessarily_fully_qualified) { $error = 'Either use statement or full name must be used.'; - $phpcsFile->addError($error, $line, 'FullName'); + $phpcsFile->addError($error, $stack_pointer, 'FullName'); } - if ($found_name === $short_name) + /* + * Check for possible union types (like string|MyType|null) + * and question mark nullable type syntax (like ?MyType) + */ + $types = explode('|', $found_name); + foreach ($types as $type) { - return true; + // Nullable type syntax + $type = (strpos($type, '?') === 0) ? substr($type, 1) : $type; + + if ($short_name === $type) + { + return true; + } } return false; @@ -44,7 +91,7 @@ protected function check($phpcsFile, $found_name, $full_name, $short_name, $line /** * {@inheritdoc} */ - public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) + public function process(File $phpcsFile, $stackPtr) { if ($this->should_ignore_use($phpcsFile, $stackPtr) === true) { @@ -53,29 +100,76 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) $tokens = $phpcsFile->getTokens(); - $class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($stackPtr + 1)); - - $find = array( - T_NS_SEPARATOR, - T_STRING, - T_WHITESPACE, - ); + $class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($stackPtr + 1)); - $class_name_end = $phpcsFile->findNext($find, ($stackPtr + 1), null, true); + // Handle PHPCS v4 T_NAME_QUALIFIED tokens + if (isset($tokens[$class_name_start]) && + (defined('T_NAME_QUALIFIED') && $tokens[$class_name_start]['code'] === T_NAME_QUALIFIED || + defined('T_NAME_FULLY_QUALIFIED') && $tokens[$class_name_start]['code'] === T_NAME_FULLY_QUALIFIED || + defined('T_NAME_RELATIVE') && $tokens[$class_name_start]['code'] === T_NAME_RELATIVE)) + { + $name_full = $tokens[$class_name_start]['content']; + $class_name_end = $class_name_start + 1; + $parts = explode('\\', $name_full); + $name_short = end($parts); + } + else + { + $class_name_end = $phpcsFile->findNext(self::FIND, ($stackPtr + 1), null, true); + $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start)); + $name_short = $tokens[$class_name_end - 1]['content']; + } $aliasing_as_position = $phpcsFile->findNext(T_AS, $class_name_end, null, false, null, true); if ($aliasing_as_position !== false) { $alias_position = $phpcsFile->findNext(T_STRING, $aliasing_as_position, null, false, null, true); - $class_name_short = $tokens[$alias_position]['content']; - $class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1)); + $name_short = $tokens[$alias_position]['content']; + + // Only recalculate name_full if it wasn't a single token (T_NAME_QUALIFIED) + // to avoid calculating it as 0 length string. Prevents incorrectly calculating the + // "full name" of the aliased class (resolving it to an empty string in some cases). + if (!isset($tokens[$class_name_start]) || + ( + (!defined('T_NAME_QUALIFIED') || $tokens[$class_name_start]['code'] !== T_NAME_QUALIFIED) && + (!defined('T_NAME_FULLY_QUALIFIED') || $tokens[$class_name_start]['code'] !== T_NAME_FULLY_QUALIFIED) && + (!defined('T_NAME_RELATIVE') || $tokens[$class_name_start]['code'] !== T_NAME_RELATIVE) + ) + ) + { + $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1)); + } + } + + if ($tokens[$class_name_start]['content'] === 'function' + && $tokens[$class_name_start + 1]['code'] === T_WHITESPACE) + { + $class_name_start += 2; + $name_full = $phpcsFile->getTokensAsString( + $class_name_start, + ($class_name_end - $class_name_start - (int) ($aliasing_as_position !== false)) + ); + $ok = $this->findFunctionUsage($phpcsFile, $stackPtr, $tokens, $name_full, $name_short); } else { - $class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start)); - $class_name_short = $tokens[$class_name_end - 1]['content']; + $ok = $this->findClassUsage($phpcsFile, $stackPtr, $tokens, $name_full, $name_short); } + if (!empty($name_full) && $name_full[0] === '\\') + { + $phpcsFile->addError("There must not be a leading '\\' in use statements.", $stackPtr, 'Malformed'); + } + + if (!$ok) + { + $error = 'There must not be unused USE statements.'; + $phpcsFile->addError($error, $stackPtr, 'Unused'); + } + } + + private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name_full, $class_name_short) + { $ok = false; // Checks in simple statements (new, instanceof and extends) @@ -86,17 +180,21 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) { $old_simple_statement = $simple_statement; - $simple_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($simple_statement + 1)); + $simple_class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($simple_statement + 1)); - if ($simple_class_name_start === false) { + if ($simple_class_name_start === false) + { continue; } - $simple_class_name_end = $phpcsFile->findNext($find, ($simple_statement + 1), null, true); + $simple_class_name_end = $phpcsFile->findNext(self::FIND, ($simple_statement + 1), null, true); $simple_class_name = trim($phpcsFile->getTokensAsString($simple_class_name_start, ($simple_class_name_end - $simple_class_name_start))); - $ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) ? true : $ok; + if (!empty($simple_class_name)) + { + $ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) || $ok; + } } } @@ -106,12 +204,15 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) { $old_paamayim_nekudotayim = $paamayim_nekudotayim; - $paamayim_nekudotayim_class_name_start = $phpcsFile->findPrevious($find, $paamayim_nekudotayim - 1, null, true); + $paamayim_nekudotayim_class_name_start = $phpcsFile->findPrevious(self::FIND, $paamayim_nekudotayim - 1, null, true); $paamayim_nekudotayim_class_name_end = $paamayim_nekudotayim - 1; $paamayim_nekudotayim_class_name = trim($phpcsFile->getTokensAsString($paamayim_nekudotayim_class_name_start + 1, ($paamayim_nekudotayim_class_name_end - $paamayim_nekudotayim_class_name_start))); - $ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) ? true : $ok; + if (!empty($paamayim_nekudotayim_class_name)) + { + $ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) || $ok; + } } // Checks in implements @@ -125,12 +226,15 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) { $old_implemented_class = $implemented_class; - $implements_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($implemented_class - 1)); - $implements_class_name_end = $phpcsFile->findNext($find, ($implemented_class - 1), null, true); + $implements_class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($implemented_class - 1)); + $implements_class_name_end = $phpcsFile->findNext(self::FIND, ($implemented_class - 1), null, true); $implements_class_name = trim($phpcsFile->getTokensAsString($implements_class_name_start, ($implements_class_name_end - $implements_class_name_start))); - $ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) ? true : $ok; + if (!empty($implements_class_name)) + { + $ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) || $ok; + } } } @@ -138,12 +242,12 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) while (($docblock = $phpcsFile->findNext(T_DOC_COMMENT_CLOSE_TAG, ($old_docblock + 1))) !== false) { $old_docblock = $docblock; - $ok = $this->checkDocblock($phpcsFile, $docblock, $tokens, $class_name_full, $class_name_short) ? true : $ok; + $ok = $this->checkDocblock($phpcsFile, $docblock, $tokens, $class_name_full, $class_name_short) || $ok; } // Checks in type hinting $old_function_declaration = $stackPtr; - while (($function_declaration = $phpcsFile->findNext(T_FUNCTION, ($old_function_declaration + 1))) !== false) + while (($function_declaration = $phpcsFile->findNext([T_FUNCTION, T_CLOSURE], ($old_function_declaration + 1))) !== false) { $old_function_declaration = $function_declaration; @@ -151,7 +255,16 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) $params = $phpcsFile->getMethodParameters($function_declaration); foreach ($params as $param) { - $ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) ? true : $ok; + if (!empty($param['type_hint'])) + { + $ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) || $ok; + } + } + + $method_properties = $phpcsFile->getMethodProperties($function_declaration); + if (!empty($method_properties['return_type'])) + { + $ok = $this->check($phpcsFile, $method_properties['return_type'], $class_name_full, $class_name_short, $function_declaration) || $ok; } } @@ -161,31 +274,125 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) { $old_catch = $catch; - $caught_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $catch + 1); - $caught_class_name_end = $phpcsFile->findNext($find, $caught_class_name_start + 1, null, true); + $caught_class_name_start = $phpcsFile->findNext($this->getNameTokens(), $catch + 1); + $caught_class_name_end = $phpcsFile->findNext(self::FIND, $caught_class_name_start + 1, null, true); $caught_class_name = trim($phpcsFile->getTokensAsString($caught_class_name_start, ($caught_class_name_end - $caught_class_name_start))); - $ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) ? true : $ok; + if (!empty($caught_class_name)) + { + $ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) || $ok; + } } - if (!$ok) + $old_use = $stackPtr; + while (($use = $phpcsFile->findNext(T_USE, ($old_use + 1))) !== false) { - $error = 'There must not be unused USE statements.'; - $phpcsFile->addError($error, $stackPtr, 'Unused'); + $old_use = $use; + + // Needs to be inside a class and must not be inside a function scope. + if (!$phpcsFile->hasCondition($use, [T_CLASS, T_TRAIT]) || $phpcsFile->hasCondition($use, T_FUNCTION)) + { + continue; + } + + $next = $phpcsFile->findNext(T_WHITESPACE, ($use + 1), null, true, null, true); + if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS) + { + continue; + } + + $class_name_start = $phpcsFile->findNext($this->getNameTokens(), $use + 1, null, false, null, true); + $class_name_end = $phpcsFile->findNext(self::FIND, $class_name_start + 1, null, true, null, true); + $found_name = trim($phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start))); + + if (!empty($found_name)) + { + $ok = $this->check($phpcsFile, $found_name, $class_name_full, $class_name_short, $use) || $ok; + } } + + return $ok; + } + + private function findFunctionUsage(File $phpcsFile, $stackPtr, $tokens, $name_full, $name_short) + { + $ok = false; + $position = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr + 1); + while ($position !== false) + { + $function_name_end = $position; + $found_start = 1 + $phpcsFile->findPrevious( + [T_NS_SEPARATOR, T_STRING, T_WHITESPACE], + $function_name_end - 1, + null, + true + ); + + $position = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $position + 1); + if ($found_start === null || $found_start === false) + { + continue; + } + + $function_name_start = $found_start; + + // Trim the output. + while ($tokens[$function_name_start]['code'] === T_WHITESPACE && $function_name_start < $function_name_end) + { + ++$function_name_start; + } + + while ($tokens[$function_name_end]['code'] === T_WHITESPACE && $function_name_end > $function_name_start) + { + --$function_name_end; + } + + $function_name_length = $function_name_end - $function_name_start; + + // Filter out control structures, built in type constructors, etc. + if ($function_name_length <= 0) + { + continue; + } + + // This doesn't seem to be valid PHP, where is the opening tag? + if ($found_start === 0) + { + continue; + } + + $previous_token = $found_start - 1; + $filter = [ + T_FUNCTION, // Function declaration + T_OBJECT_OPERATOR, // Method call + T_DOUBLE_COLON, // Static method call + T_NEW, // Constructors + ]; + + // Filter out calls to methods and function declarations. + if (in_array($tokens[$previous_token]['code'], $filter)) + { + continue; + } + + $function_name = $phpcsFile->getTokensAsString($function_name_start, $function_name_length); + $ok = $this->check($phpcsFile, $function_name, $name_full, $name_short, $function_name_start) || $ok; + } + + return $ok; } /** * Check if this use statement is part of the namespace block. * - * @param PHP_CodeSniffer_File $phpcsFile The file being scanned. + * @param File $phpcsFile The file being scanned. * @param int $stackPtr The position of the current token in * the stack passed in $tokens. * * @return bool */ - private function should_ignore_use(PHP_CodeSniffer_File $phpcsFile, $stackPtr) + private function should_ignore_use(File $phpcsFile, $stackPtr) { $tokens = $phpcsFile->getTokens(); @@ -207,7 +414,7 @@ private function should_ignore_use(PHP_CodeSniffer_File $phpcsFile, $stackPtr) } /** - * @param PHP_CodeSniffer_File $phpcsFile + * @param File $phpcsFile * @param int $field * @param array $tokens * @param string $class_name_full @@ -216,7 +423,7 @@ private function should_ignore_use(PHP_CodeSniffer_File $phpcsFile, $stackPtr) * * @return bool */ - private function checkDocblock(PHP_CodeSniffer_File $phpcsFile, $comment_end, $tokens, $class_name_full, $class_name_short) + private function checkDocblock(File $phpcsFile, $comment_end, $tokens, $class_name_full, $class_name_short) { $ok = false; @@ -244,7 +451,7 @@ private function checkDocblock(PHP_CodeSniffer_File $phpcsFile, $comment_end, $t $classes = explode('|', str_replace('[]', '', $classes)); foreach ($classes as $class) { - $ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tokens[$tag + 2]['line']) ? true : $ok; + $ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tag + 2) || $ok; } } diff --git a/build/code_sniffer/ruleset-php-legacy.xml b/build/code_sniffer/ruleset-php-legacy.xml index c740c6080fa..8252cab03b1 100644 --- a/build/code_sniffer/ruleset-php-legacy.xml +++ b/build/code_sniffer/ruleset-php-legacy.xml @@ -17,9 +17,6 @@ - - - @@ -89,4 +86,7 @@ + + + diff --git a/build/code_sniffer/ruleset-php-strict.xml b/build/code_sniffer/ruleset-php-strict.xml index 9e2f0664d8f..8a06b72ba60 100644 --- a/build/code_sniffer/ruleset-php-strict.xml +++ b/build/code_sniffer/ruleset-php-strict.xml @@ -32,7 +32,9 @@ - + + */tests/* + + + + diff --git a/build/compare.sh b/build/compare.sh index df442fd4c79..9d01028aa96 100755 --- a/build/compare.sh +++ b/build/compare.sh @@ -19,9 +19,9 @@ do $command "$1.$ext" - for file in `find phpBB3 -name '.svn' -prune -o -type f -print` + for file in `find phpBB -name '.svn' -prune -o -type f -print` do - orig_file="${file/#phpBB3/$orig_dir}" + orig_file="${file/#phpBB/$orig_dir}" diff_result=`diff $orig_file $file` if [ -n "$diff_result" ] @@ -31,7 +31,7 @@ do fi done - rm -rf phpBB3 + rm -rf phpBB done cd .. diff --git a/build/doctum-all.conf.php b/build/doctum-all.conf.php new file mode 100644 index 00000000000..a6e5663e122 --- /dev/null +++ b/build/doctum-all.conf.php @@ -0,0 +1,21 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +require __DIR__ . '/doctum-checkout.conf.php'; + +$config['versions'] = Doctum\Version\GitVersionCollection::create(__DIR__ . '/../') + ->add('3.3.x') + ->add('master') +; + +return new Doctum\Doctum($iterator, $config); diff --git a/build/doctum-checkout.conf.php b/build/doctum-checkout.conf.php new file mode 100644 index 00000000000..bbcf8f26ba2 --- /dev/null +++ b/build/doctum-checkout.conf.php @@ -0,0 +1,31 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +$iterator = Symfony\Component\Finder\Finder::create() + ->files() + ->name('*.php') + ->in(__DIR__ . '/../phpBB/') + ->notPath('#^cache/#') + ->notPath('#^develop/#') + ->notPath('#^ext/#') + ->notPath('#^vendor/#') + ->notPath('data'); + +// This variable will be used and changed in doctum-all.conf.php +$config = [ + 'title' => 'phpBB API Documentation', + 'build_dir' => __DIR__ . '/api/output/%version%', + 'cache_dir' => __DIR__ . '/api/cache/%version%', +]; + +return new Doctum\Doctum($iterator, $config); diff --git a/build/generate_package_json.php b/build/generate_package_json.php new file mode 100644 index 00000000000..29ad4fd64f8 --- /dev/null +++ b/build/generate_package_json.php @@ -0,0 +1,133 @@ +#!/usr/bin/env php + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +if (version_compare(PHP_VERSION, '7.0-dev', '<')) +{ + die('generate_package_json.php requires at least PHP 7.0.'); +} + +define('IN_PHPBB', true); +include_once('../phpBB/includes/functions.php'); + +$json_data = new \stdClass(); +$json_data->metadata = new stdClass(); + +$json_data->metadata->current_version_date = ''; +$json_data->metadata->current_version = ''; +$json_data->metadata->download_path = ''; +$json_data->metadata->show_update_package = true; +$json_data->metadata->historic = false; + +$json_data->package = []; + +// Open build.xml +$build_xml = simplexml_load_file('build.xml'); +$current_version = (string) $build_xml->xpath('/project/property[@name=\'newversion\']/@value')[0]->value; +$previous_version = (string) $build_xml->xpath('/project/property[@name=\'prevversion\']/@value')[0]->value; +$older_verions = explode(', ', (string) $build_xml->xpath('/project/property[@name=\'olderversions\']/@value')[0]->value); + +// Clean and sort version info +$older_verions[] = $previous_version; +$older_verions = array_filter($older_verions, function($version) { + preg_match(get_preg_expression('semantic_version'), $version, $matches); + return empty($matches['prerelease']) || strpos($matches['prerelease'], 'pl') !== false; +}); +usort($older_verions, function($version_a, $version_b) +{ + return phpbb_version_compare($version_b, $version_a); +}); + +// Set metadata +$json_data->metadata->current_version = $current_version; +$json_data->metadata->current_version_date = date('Y-m-d'); +$json_data->metadata->download_path = 'https://download.phpbb.com/pub/release/' . preg_replace('#([0-9]+\.[0-9]+)(\..+)#', '$1', $current_version) . '/' . $current_version . '/'; + +// Add package, patch files, and changed files +phpbb_add_package_file( + $json_data->package, + 'phpBB ' . $current_version, + 'phpBB-' . $current_version, + 'full', + '' +); +phpbb_add_package_file( + $json_data->package, + 'phpBB ' . $current_version . ' Patch Files', + 'phpBB-' . $current_version . '-patch', + 'update', + 'patch' +); +phpbb_add_package_file( + $json_data->package, + 'phpBB ' . $current_version . ' Changed Files', + 'phpBB-' . $current_version . '-files', + 'update', + 'files' +); + +// Loop through packages and assign to packages array +foreach ($older_verions as $version) +{ + phpbb_add_package_file( + $json_data->package, + 'phpBB ' . $version . ' to ' . $current_version . ' Update Package', + 'phpBB-' . $version . '_to_' . $current_version, + 'update', + 'advanced_update', + $version + ); +} + +echo(json_encode($json_data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n"); + +function phpbb_add_package_file(array &$package_list, $name, $file_name, $type, $subtype, $from = '') +{ + if (!file_exists(__DIR__ . '/new_version/release_files/' . $file_name . '.zip')) + { + trigger_error('File does not exist: ' . __DIR__ . '/new_version/release_files/' . $file_name . '.zip'); + return; + } + + $package_file = new stdClass(); + $package_file->name = $name; + $package_file->filename = $file_name; + $package_file->type = $type; + if (!empty($subtype)) + { + $package_file->subtype = $subtype; + } + if (!empty($from)) + { + $package_file->from = $from; + } + $package_file->files = []; + + foreach (['zip', 'tar.bz2'] as $extension) + { + $file_path = 'new_version/release_files/' . $file_name . '.' . $extension; + $filedata = new stdClass(); + $filedata->filesize = filesize($file_path); + $filedata->checksum = trim(preg_replace('/(^\w+)(.+)/', '$1', file_get_contents($file_path . '.sha256'))); + $filedata->filetype = $extension; + + if (file_exists($file_path . '.sig')) + { + $filedata->signature = trim(file_get_contents($file_path . '.sig')); + } + + $package_file->files[] = $filedata; + } + + $package_list[] = $package_file; +} diff --git a/build/generate_signature.php b/build/generate_signature.php new file mode 100644 index 00000000000..d1b56751199 --- /dev/null +++ b/build/generate_signature.php @@ -0,0 +1,52 @@ +#!/usr/bin/env php + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +if ($_SERVER['argc'] != 3) +{ + echo "Please specify the secret key and filename for which the signature should be created, e.g. generate_signature.php mySecretSecret path/to/file\n"; + exit(1); +} + +$secret_key = base64_decode($_SERVER['argv'][1]); +$file_path = $_SERVER['argv'][2]; + +if (!extension_loaded('sodium')) +{ + die('Required sodium extension not loaded'); +} + +if (!file_exists($file_path)) +{ + die('File does not exist'); +} + +$hash = hash_file('sha384', $file_path, true); +try +{ + $signature = sodium_crypto_sign_detached($hash, $secret_key); +} +catch (SodiumException $e) +{ + $keypair = sodium_crypto_sign_keypair(); + + $secret_key = base64_encode(sodium_crypto_sign_secretkey($keypair)); + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + echo 'Unable to create the signature: ' . $e->getMessage() . "\n"; + echo "Maybe use these keys:\nPublic key: {$public_key}\nSecret key: {$secret_key}\n"; + die(); +} + +$signature = base64_encode($signature); + +file_put_contents($file_path . '.sig', $signature); diff --git a/build/psalm/stubs/apcu.php b/build/psalm/stubs/apcu.php new file mode 100644 index 00000000000..7fee581ff74 --- /dev/null +++ b/build/psalm/stubs/apcu.php @@ -0,0 +1,35 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class APCUIterator implements Iterator +{ + public function current() + { + } + + public function next() + { + } + + public function key() + { + } + + public function valid() + { + } + + public function rewind() + { + } +} diff --git a/build/psalm/stubs/gd.php b/build/psalm/stubs/gd.php new file mode 100644 index 00000000000..2b5b5a2bf78 --- /dev/null +++ b/build/psalm/stubs/gd.php @@ -0,0 +1,15 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** @link https://www.php.net/manual/en/image.constants.php */ +define('IMG_COLOR_STYLED', -2); diff --git a/build/psalm/stubs/ldap.php b/build/psalm/stubs/ldap.php new file mode 100644 index 00000000000..44ed90fdb9f --- /dev/null +++ b/build/psalm/stubs/ldap.php @@ -0,0 +1,16 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** @link https://www.php.net/manual/en/ldap.constants.php */ +define('LDAP_OPT_PROTOCOL_VERSION', 17); +define('LDAP_OPT_REFERRALS', 8); diff --git a/build/psalm/stubs/memcached.php b/build/psalm/stubs/memcached.php new file mode 100644 index 00000000000..9283d877f83 --- /dev/null +++ b/build/psalm/stubs/memcached.php @@ -0,0 +1,20 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** @link https://www.php.net/manual/en/memcached.constants.php */ +class Memcached +{ + public const OPT_COMPRESSION = -1001; + + public const OPT_BINARY_PROTOCOL = 18; +} diff --git a/build/psalm/stubs/oci8.php b/build/psalm/stubs/oci8.php new file mode 100644 index 00000000000..5d05a36fce7 --- /dev/null +++ b/build/psalm/stubs/oci8.php @@ -0,0 +1,19 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** @link https://php.net/manual/en/oci8.constants.php */ +define('OCI_DEFAULT', 0); + +define('OCI_ASSOC', 1); + +define('OCI_RETURN_NULLS', 4); diff --git a/build/psalm/stubs/pgsql.php b/build/psalm/stubs/pgsql.php new file mode 100644 index 00000000000..a00b21e46e5 --- /dev/null +++ b/build/psalm/stubs/pgsql.php @@ -0,0 +1,15 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** @link https://www.php.net/manual/en/pgsql.constants.php */ +define('PGSQL_CONNECT_FORCE_NEW', 2); diff --git a/build/psalm/stubs/redis.php b/build/psalm/stubs/redis.php new file mode 100644 index 00000000000..96e912f707a --- /dev/null +++ b/build/psalm/stubs/redis.php @@ -0,0 +1,19 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** @link https://phpredis.github.io/phpredis/Redis.html */ +class Redis +{ + public const OPT_PREFIX = 2; + public const SERIALIZER_PHP = 1; +} diff --git a/build/psalm/stubs/sqlite3.php b/build/psalm/stubs/sqlite3.php new file mode 100644 index 00000000000..5646c6623ea --- /dev/null +++ b/build/psalm/stubs/sqlite3.php @@ -0,0 +1,33 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class SQLite3 +{ + public function query(string $query) {} +} + +class SQLite3Result +{ + public function fetchArray(int $mode = SQLITE3_BOTH) {} +} + +/** + * @link https://www.php.net/manual/en/sqlite3.constants.php + */ +define('SQLITE3_ASSOC', 1); +define('SQLITE3_NUM', 2); +define('SQLITE3_BOTH', 3); + +define('SQLITE3_OPEN_READONLY', 1); +define('SQLITE3_OPEN_READWRITE', 2); +define('SQLITE3_OPEN_CREATE', 4); diff --git a/build/psalm/stubs/sqlsrv.php b/build/psalm/stubs/sqlsrv.php new file mode 100644 index 00000000000..8e2aaf74265 --- /dev/null +++ b/build/psalm/stubs/sqlsrv.php @@ -0,0 +1,17 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** @link https://www.php.net/manual/en/sqlsrv.constants.php */ +define('SQLSRV_ERR_ERRORS', 0); +define('SQLSRV_FETCH_ASSOC', 2); +define('SQLSRV_CURSOR_STATIC', 'static'); diff --git a/build/psalm_bootstrap.php b/build/psalm_bootstrap.php new file mode 100644 index 00000000000..92099c77f50 --- /dev/null +++ b/build/psalm_bootstrap.php @@ -0,0 +1,55 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +define('IN_PHPBB', true); +define('PHPBB_ENVIRONMENT', 'test'); + +$phpbb_root_path = 'phpBB/'; +$phpEx = 'php'; + +global $table_prefix; +require_once $phpbb_root_path . 'includes/startup.php'; + +$table_prefix = 'phpbb_'; +require_once $phpbb_root_path . 'includes/constants.php'; +require_once $phpbb_root_path . 'phpbb/class_loader.' . $phpEx; +require_once $phpbb_root_path . 'includes/acp/acp_database.' . $phpEx; +require_once $phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_acp.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_admin.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_compatibility.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_compress.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_content.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_display.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_mcp.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_module.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_posting.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_transfer.' . $phpEx; +require_once $phpbb_root_path . 'includes/functions_user.' . $phpEx; +require_once $phpbb_root_path . 'includes/sphinxapi.' . $phpEx; +require_once $phpbb_root_path . 'includes/diff/diff.' . $phpEx; +require_once $phpbb_root_path . 'includes/diff/engine.' . $phpEx; +require_once $phpbb_root_path . 'includes/compatibility_globals.' . $phpEx; + +$phpbb_class_loader = new \phpbb\class_loader('phpbb\\', $phpbb_root_path . 'phpbb/', "php"); +$phpbb_class_loader->register(); + +// Include files that require class loader to be initialized +require_once $phpbb_root_path . 'includes/acp/auth.' . $phpEx; +require_once $phpbb_root_path . 'includes/acp/acp_captcha.' . $phpEx; + +class phpbb_cache_container extends \Symfony\Component\DependencyInjection\Container +{ +} diff --git a/build/sami-all.conf.php b/build/sami-all.conf.php deleted file mode 100644 index 4bf812eb02c..00000000000 --- a/build/sami-all.conf.php +++ /dev/null @@ -1,32 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -require __DIR__ . '/sami-checkout.conf.php'; - -$config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../') - /* - This would be nice, but currently causes various problems that need - debugging. - ->addFromTags('release-3.0.*') - ->add('3.0.x', '3.0-next (olympus)') - ->addFromTags('release-3.1.*') - ->add('3.1.x', '3.1-next (ascraeus)') - ->add('master') - */ - ->add('3.0.x') - ->add('3.1.x') - ->add('3.2.x') - ->add('master') -; - -return new Sami\Sami($iterator, $config); diff --git a/build/sami-checkout.conf.php b/build/sami-checkout.conf.php deleted file mode 100644 index abbf1d257e3..00000000000 --- a/build/sami-checkout.conf.php +++ /dev/null @@ -1,44 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -// Prevent 'Class "acm" does not exist.' exception on removeClass(). -class PhpbbArrayStore extends Sami\Store\ArrayStore -{ - public function removeClass(Sami\Project $project, $name) - { - unset($this->classes[$name]); - } -} - -$iterator = Symfony\Component\Finder\Finder::create() - ->files() - ->name('*.php') - ->in(__DIR__ . '/../phpBB/') - ->notPath('#^cache/#') - ->notPath('#^develop/#') - ->notPath('#^ext/#') - ->notPath('#^vendor/#') - ->notPath('data') -; - -$config = array( - 'theme' => 'enhanced', - 'title' => 'phpBB API Documentation', - 'build_dir' => __DIR__.'/api/output/%version%', - 'cache_dir' => __DIR__.'/api/cache/%version%', - 'default_opened_level' => 2, - // Do not use JsonStore. See https://github.com/fabpot/Sami/issues/79 - 'store' => new PhpbbArrayStore, -); - -return new Sami\Sami($iterator, $config); diff --git a/build/update_stylesheet_querystrings.php b/build/update_stylesheet_querystrings.php new file mode 100644 index 00000000000..e3a3f8de15e --- /dev/null +++ b/build/update_stylesheet_querystrings.php @@ -0,0 +1,54 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +if (php_sapi_name() !== 'cli') +{ + die("This program must be run from the command line.\n"); +} + +if (version_compare(PHP_VERSION, '7.1.3', '<')) +{ + die('update_stylesheet_querystrings.php requires at least PHP 7.1.3'); +} + +// Usage: "$ php build/update_stylesheet_querystrings.php" +$targets = [dirname(dirname(__FILE__)) . '/phpBB/styles/prosilver/theme/stylesheet.css']; + +array_map('patch_glob', $targets); + +function patch_glob($glob): void +{ + array_map('patch_file', glob($glob)); +} + +function patch_file(string $filepath): void +{ + $file = file_get_contents($filepath); + $old = $file; + $new = preg_replace_callback( + '(^@import\\s+url\\([\'"](?\\w++\\.css)\\?\\K(?:hash|v)=[^\'"]++)m', + function ($match) use ($filepath) + { + $path = dirname($filepath) . DIRECTORY_SEPARATOR . $match['basename']; + $hash = sprintf('%08x', crc32(file_get_contents($path))); + + return 'hash=' . $hash; + }, + $old + ); + + if ($new !== $old) + { + file_put_contents($filepath, $new); + } +} diff --git a/build/verify_signature.php b/build/verify_signature.php new file mode 100644 index 00000000000..fd432ed638c --- /dev/null +++ b/build/verify_signature.php @@ -0,0 +1,56 @@ +#!/usr/bin/env php + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +if ($_SERVER['argc'] != 4) +{ + echo "Please specify the public key, filename for which the signature should be check, and the signature file, e.g. verify_signature.php superPublicKey path/to/file path/to/signature\n"; + exit(1); +} + +$public_key = base64_decode($_SERVER['argv'][1]); +$file_path = $_SERVER['argv'][2]; +$signature_path = $_SERVER['argv'][3]; + +if (!extension_loaded('sodium')) +{ + die('Required sodium extension not loaded'); +} + +if (!file_exists($file_path)) +{ + die('File does not exist'); +} + +if (!file_exists($signature_path)) +{ + die('Signature file does not exist'); +} + +$hash = hash_file('sha384', $file_path, true); +$signature = base64_decode(file_get_contents($signature_path)); + +try +{ + if (sodium_crypto_sign_verify_detached($signature, $hash, $public_key)) + { + echo 'Signature is valid!'; + } + else + { + echo 'Signature is not valid!'; + } +} catch (SodiumException $e) +{ + die('Unable to verify the signature: ' . $e->getMessage() . "\n"); +} diff --git a/composer.phar b/composer.phar index 508f9cf274b..5a80d7434b5 100755 Binary files a/composer.phar and b/composer.phar differ diff --git a/doctum.phar b/doctum.phar new file mode 100755 index 00000000000..b20e8de4d51 Binary files /dev/null and b/doctum.phar differ diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 00000000000..0f2f72bf69a --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,67 @@ +import globals from 'globals'; + +// File patterns to ignore +const IGNORED_FILES = [ + 'phpBB/assets/javascript/cropper.js', + 'phpBB/assets/javascript/hermite.js', + 'phpBB/assets/javascript/jquery-cropper.js', + 'phpBB/**/*.min.js', + 'phpBB/vendor/**/*.js', + 'phpBB/vendor-ext/**/*.js', + 'phpBB/phpbb/**/*.js', + 'phpBB/tests/**/*.js', +]; + +// ESLint rule configurations +const FORMATTING_RULES = { + 'quotes': ['error', 'single'], + 'comma-dangle': ['error', 'always-multiline'], + 'block-spacing': 'error', + 'array-bracket-spacing': ['error', 'always'], + 'object-curly-spacing': ['error', 'always'], + 'space-before-function-paren': ['error', 'never'], + 'space-in-parens': 'off', +}; + +const CODE_QUALITY_RULES = { + 'semi': ['error', 'always'], + 'eqeqeq': ['error', 'always'], + 'curly': ['error', 'multi-line'], + 'no-var': 'error', + 'prefer-const': 'error', + 'no-console': 'off', + 'no-unused-vars': ['error', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }], +}; + +const DISABLED_STYLE_RULES = { + 'multiline-comment-style': 'off', + 'computed-property-spacing': 'off', + 'capitalized-comments': 'off', + 'no-lonely-if': 'off', +}; + +const mainConfig = { + files: ['**/*.js', '**/*.js.twig'], + linterOptions: { + reportUnusedDisableDirectives: false, + }, + languageOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + globals: { + ...globals.browser, + ...globals.node, + ...globals.jquery, + }, + }, + rules: { + ...FORMATTING_RULES, + ...CODE_QUALITY_RULES, + ...DISABLED_STYLE_RULES, + }, +}; + +export default [ + { ignores: IGNORED_FILES }, + mainConfig, +]; diff --git a/git-tools/commit-msg-hook-range.sh b/git-tools/commit-msg-hook-range.sh index 91f7577eb53..84f291b2212 100755 --- a/git-tools/commit-msg-hook-range.sh +++ b/git-tools/commit-msg-hook-range.sh @@ -24,7 +24,17 @@ COMMIT_MSG_HOOK_FATAL=$(git config --bool phpbb.hooks.commit-msg.fatal 2> /dev/n git config phpbb.hooks.commit-msg.fatal true EXIT_STATUS=0 -for COMMIT_HASH in $(git rev-list --no-merges "$COMMIT_RANGE") + +COMMIT_HASHES=$(git rev-list --no-merges "$COMMIT_RANGE") + +# If any message have been returned instead of commit hashes list +# send a non-zero exit status upstream. +if ! [[ "$COMMIT_HASHES" =~ ^[0-9a-f]{5,40} ]] +then + EXIT_STATUS=1 +fi + +for COMMIT_HASH in $COMMIT_HASHES do echo "Inspecting commit message of commit $COMMIT_HASH" diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg index 136606252c5..b35d1c89c71 100755 --- a/git-tools/hooks/commit-msg +++ b/git-tools/hooks/commit-msg @@ -1,7 +1,7 @@ #!/bin/sh # -# A hook to check syntax of a phpBB3 commit message, per: -# * +# A hook to check syntax of a phpBB commit message, per: +# * # * # # This is a commit-msg hook. @@ -147,6 +147,15 @@ then quit $ERR_LENGTH; fi +# Check for CR/LF line breaks +if grep -q $'\r$' "$1" +then + complain "The commit message uses CR/LF line breaks, which are not permitted." >&2 + complain >&2 + + quit $ERR_EOF; +fi + lines=$(wc -l "$1" | awk '{ print $1; }'); expecting=header; in_description=0; @@ -215,7 +224,7 @@ do "footer") err=$ERR_FOOTER; # Each ticket is on its own line - echo "$line" | grep -Eq "^PHPBB3-[0-9]+$"; + echo "$line" | grep -Eq "^PHPBB3?-[0-9]+$"; ;; "eof") err=$ERR_EOF; @@ -328,7 +337,7 @@ done # If EOF is expected exit cleanly echo "$expecting" | grep -q "eof" || ( # Unexpected EOF, error - complain "Unexpected EOF encountered" >&2; + complain "Expected to see footer (e.g. PHPBB-12345) or description line, but reached end of file." >&2; quit $ERR_EOF; ) && ( # Do post scan checks @@ -347,7 +356,7 @@ echo "$expecting" | grep -q "eof" || ( # Check the branch ticket is mentioned, doesn't make sense otherwise if [ $ticket -gt 0 ] then - echo "$tickets" | grep -Eq "\bPHPBB3-$ticket\b" || ( + echo "$tickets" | grep -Eq "\bPHPBB3?-$ticket\b" || ( complain "Ticket ID [$ticket] of branch missing from list of tickets:" >&2; complain "$tickets" | sed 's/ /\n/g;s/^/* /g' >&2; quit $ERR_FOOTER; diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit index 06ba15c7fa3..d7071f2c474 100755 --- a/git-tools/hooks/pre-commit +++ b/git-tools/hooks/pre-commit @@ -75,7 +75,7 @@ do if [ $? -ne 0 ] then # Swap back in correct filenames - errors=$(echo "$errors"; echo "$result" | grep ':' | sed -e "s@in - on@in $filename on@g") + errors=$(echo "$errors"; echo "$result" | grep ':' | sed -E "s@in (.+) on line@in $filename on@g") fi done unset IFS diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg index 11d2b6b2f2a..6e5b701fdea 100755 --- a/git-tools/hooks/prepare-commit-msg +++ b/git-tools/hooks/prepare-commit-msg @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # A hook to add [$branch] to the beginning of a commit message # if certain conditions are met. @@ -31,12 +31,25 @@ branch="$(echo "$branch" | sed "s/refs\/heads\///g")" if [ "$2" = "" ] then tail=""; + ticket_id=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\3/gm;t;d' <<< "$branch"); + branch_title=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\1\2\3/gm;t;d' <<< "$branch"); - # Branch is prefixed with 'ticket/', append ticket ID to message - if [ "$branch" != "${branch##ticket/}" ]; + # Fall back to branch name if no ticket ID + if [ -z "$branch_title" ]; then - tail="$(printf "\n\nPHPBB3-${branch##ticket/}")"; + branch_title="$branch"; fi - echo "[$branch] $tail$(cat "$1")" > "$1" + if [ "security/" = "$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\2/gm;t;d' <<< "$branch")" ]; + then + tail="$(printf '\n\nSECURITY-%s' "$ticket_id")"; + else + # Branch is prefixed with 'ticket/', append ticket ID to message + if [ "$branch" != "${branch##ticket/}" ]; + then + tail="$(printf '\n\nPHPBB-%s' "$ticket_id")"; + fi + fi + + echo "[$branch_title] $tail$(cat "$1")" > "$1" fi diff --git a/git-tools/merge.php b/git-tools/merge.php index a9bb0514013..7feda889333 100755 --- a/git-tools/merge.php +++ b/git-tools/merge.php @@ -56,7 +56,7 @@ function show_usage() function work($pull_id, $remote) { // Get some basic data - $pull = get_pull('phpbb', 'phpbb3', $pull_id); + $pull = get_pull('phpbb', 'phpbb', $pull_id); if (!$pull_id) { @@ -79,7 +79,7 @@ function work($pull_id, $remote) run("git checkout develop-olympus"); run("git pull $remote develop-olympus"); - add_remote($pull_user, 'phpbb3'); + add_remote($pull_user, 'phpbb'); run("git fetch $pull_user"); run("git merge --no-ff $pull_user/$pull_branch"); run("phpBB/vendor/bin/phpunit"); @@ -94,7 +94,7 @@ function work($pull_id, $remote) run("git checkout develop"); run("git pull $remote develop"); - add_remote($pull_user, 'phpbb3'); + add_remote($pull_user, 'phpbb'); run("git fetch $pull_user"); run("git merge --no-ff $pull_user/$pull_branch"); run("phpBB/vendor/bin/phpunit"); diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index c2a18225452..00000000000 --- a/gulpfile.js +++ /dev/null @@ -1,71 +0,0 @@ -'use strict'; - -const del = require('del'); -const gulp = require('gulp'); -const autoprefixer = require('gulp-autoprefixer'); -const sass = require('gulp-sass'); -const rename = require('gulp-rename'); -const sourcemaps = require('gulp-sourcemaps'); -const cssnano = require('gulp-cssnano'); -const postcss = require('gulp-postcss'); -const stylefmt = require('gulp-stylefmt'); -const sorting = require('postcss-sorting'); -const atimport = require('postcss-import'); -const torem = require('postcss-pxtorem'); -const sortOrder = require('./.postcss-sorting.json'); -const pkg = require('./package.json'); - -// Config -const build = { - css: './phpBB/styles/prosilver/theme/', -}; - -const AUTOPREFIXER_BROWSERS = [ - '> 1%', - 'last 2 versions' -]; - -gulp.task('css', () => { - const css = gulp - .src(build.css + '*.css') - .pipe(autoprefixer(AUTOPREFIXER_BROWSERS)) - .pipe( - postcss([ - sorting(sortOrder) - ]) - ) - .pipe(stylefmt()) - .pipe(gulp.dest(build.css)); - - return css; -}); - -gulp.task('clean', () => { - del(['dist']); -}); - -gulp.task('minify', () => { - const css = gulp - .src(build.css + '/bidi.css') - .pipe(sourcemaps.init()) - .pipe( - postcss([ - atimport() - ]) - ) - .pipe(cssnano()) - .pipe(rename({ - suffix: '.min', - extname: '.css' - })) - .pipe(sourcemaps.write('./')) - .pipe(gulp.dest(build.css)); - - return css; -}); - -gulp.task('watch', () => { - gulp.watch('phpBB/styles/prosilver/theme/*.css', ['css']); -}); - -gulp.task('default', ['css', 'watch']); diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000000..add3d4534d4 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,4049 @@ +{ + "name": "phpbb", + "version": "4.0.0-dev", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "phpbb", + "version": "4.0.0-dev", + "license": "GPL-2.0", + "devDependencies": { + "eslint": "^9.28.0", + "globals": "^17.0.0", + "stylelint": "^14.7.0", + "stylelint-order": "^5.0.0", + "web-push-testing": "^1.1.1" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", + "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.27.1", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@csstools/selector-specificity": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz", + "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==", + "dev": true, + "license": "CC0-1.0", + "engines": { + "node": "^14 || ^16 || >=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss-selector-parser": "^6.0.10" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz", + "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", + "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/config-array": { + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz", + "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^2.1.7", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/config-helpers": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz", + "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.17.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/core": { + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz", + "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz", + "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^10.0.1", + "globals": "^14.0.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.1", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/js": { + "version": "9.39.2", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz", + "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" + } + }, + "node_modules/@eslint/object-schema": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", + "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz", + "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.17.0", + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.7", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", + "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.4.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/retry": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@types/estree": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", + "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/normalize-package-data": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/parse-json": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", + "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", + "dev": true, + "license": "MIT" + }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/acorn": { + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/arg": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", + "dev": true, + "license": "MIT" + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/body-parser": { + "version": "1.20.4", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz", + "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bytes": "~3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "~1.2.0", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "on-finished": "~2.4.1", + "qs": "~6.14.0", + "raw-body": "~2.5.3", + "type-is": "~1.6.18", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/body-parser/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/body-parser/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/body-parser/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase-keys": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/colord": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", + "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", + "dev": true, + "license": "MIT" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/connected-domain": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/connected-domain/-/connected-domain-1.0.0.tgz", + "integrity": "sha512-lHlohUiJxlpunvDag2Y0pO20bnvarMjnrdciZeuJUqRwrf/5JHNhdpiPIr5GQ8IkqrFj5TDMQwcCjblGo1oeuA==", + "dev": true, + "license": "MIT" + }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-disposition/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", + "dev": true, + "license": "MIT" + }, + "node_modules/cosmiconfig": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", + "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/css-functions-list": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.3.tgz", + "integrity": "sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12 || >=16" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true, + "license": "MIT", + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decamelize-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", + "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", + "dev": true, + "license": "MIT", + "dependencies": { + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decamelize-keys/node_modules/map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "dev": true, + "license": "MIT" + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/error-ex": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", + "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "dev": true, + "license": "MIT" + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "9.39.2", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz", + "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.8.0", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.21.1", + "@eslint/config-helpers": "^0.4.2", + "@eslint/core": "^0.17.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.39.2", + "@eslint/plugin-kit": "^0.4.1", + "@humanfs/node": "^0.16.6", + "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.4.2", + "@types/estree": "^1.0.6", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.6", + "debug": "^4.3.2", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", + "esquery": "^1.5.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^8.0.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } + } + }, + "node_modules/eslint-scope": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.15.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^4.2.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", + "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", + "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "~1.20.3", + "content-disposition": "~0.5.4", + "content-type": "~1.0.4", + "cookie": "~0.7.1", + "cookie-signature": "~1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.3.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.0", + "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "~0.1.12", + "proxy-addr": "~2.0.7", + "qs": "~6.14.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "~0.19.0", + "serve-static": "~1.16.2", + "setprototypeof": "1.2.0", + "statuses": "~2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/express/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "license": "MIT" + }, + "node_modules/express/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", + "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/fastest-levenshtein": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4.9.1" + } + }, + "node_modules/fastq": { + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", + "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/finalhandler": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", + "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "statuses": "~2.0.2", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/finalhandler/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/finalhandler/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "license": "MIT" + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/flatted": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, + "license": "ISC" + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-17.0.0.tgz", + "integrity": "sha512-gv5BeD2EssA793rlFWVPMMCqefTlpusw6/2TbAVMy0FzcG8wKJn4O+NqJ4+XWmmwrayJgw5TzrmWjFgmz1XPqw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globjoin": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", + "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==", + "dev": true, + "license": "MIT" + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hard-rejection": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/html-tags": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz", + "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/http_ece": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.2.1.tgz", + "integrity": "sha512-+tzLoMYgXvicu60sVFoswTiu6BiQ6EX3DORRJQ3W2dNpNWCyZ3tcmRFZZ3jgVyw8ziWUCeUARKCkYDY6JgFx+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + } + }, + "node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-lazy": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", + "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true, + "license": "ISC" + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/jsonwebtoken": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz", + "integrity": "sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==", + "dev": true, + "license": "MIT", + "dependencies": { + "jws": "^4.0.1", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12", + "npm": ">=6" + } + }, + "node_modules/jwa": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz", + "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-equal-constant-time": "^1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz", + "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==", + "dev": true, + "license": "MIT", + "dependencies": { + "jwa": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/known-css-properties": { + "version": "0.26.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz", + "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==", + "dev": true, + "license": "MIT" + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true, + "license": "MIT" + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", + "dev": true, + "license": "MIT" + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/map-obj": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/mathml-tag-names": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", + "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/meow": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", + "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize": "^1.2.0", + "decamelize-keys": "^1.1.0", + "hard-rejection": "^2.1.0", + "minimist-options": "4.1.0", + "normalize-package-data": "^3.0.0", + "read-pkg-up": "^7.0.1", + "redent": "^3.0.0", + "trim-newlines": "^3.0.0", + "type-fest": "^0.18.0", + "yargs-parser": "^20.2.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minimist-options": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", + "dev": true, + "license": "MIT", + "dependencies": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0", + "kind-of": "^6.0.3" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/nanoid": { + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/node-persist": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-2.1.0.tgz", + "integrity": "sha512-NI30KmynAIpKtvl3XaLE/Q/hPUNfh2bFM0U9zgWyIVzBUL/fh1EMk2/rTAqWY6KXrX8jqusVA6avPJ6I2S9B4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-absolute": "^0.2.6", + "mkdirp": "~0.5.1", + "q": "~1.1.1" + } + }, + "node_modules/node-persist/node_modules/is-absolute": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", + "integrity": "sha512-7Kr05z5LkcOpoMvxHN1PC11WbPabdNFmMYYo0eZvWu3BfVS0T03yoqYDczoCBx17xqk2x1XAZrcKiFVL88jxlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-relative": "^0.2.1", + "is-windows": "^0.2.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/node-persist/node_modules/is-relative": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", + "integrity": "sha512-9AMzjRmLqcue629b4ezEVSK6kJsYJlUIhMcygmYORUgwUNJiavHcC3HkaGx0XYpyVKQSOqFbMEZmW42cY87sYw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-unc-path": "^0.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/node-persist/node_modules/is-unc-path": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", + "integrity": "sha512-HhLc5VDMH4pu3oMtIuunz/DFQUIoR561kMME3U3Afhj8b7vH085vkIkemrz1kLXCEIuoMAmO3yVmafWdSbGW8w==", + "dev": true, + "license": "MIT", + "dependencies": { + "unc-path-regex": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/node-persist/node_modules/is-windows": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", + "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/normalize-package-data": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^4.0.1", + "is-core-module": "^2.5.0", + "semver": "^7.3.4", + "validate-npm-package-license": "^3.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-to-regexp": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/postcss": { + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", + "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.11", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/postcss-media-query-parser": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", + "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", + "dev": true, + "license": "MIT" + }, + "node_modules/postcss-resolve-nested-selector": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz", + "integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==", + "dev": true, + "license": "MIT" + }, + "node_modules/postcss-safe-parser": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz", + "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + "peerDependencies": { + "postcss": "^8.3.3" + } + }, + "node_modules/postcss-selector-parser": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", + "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "dev": true, + "license": "MIT", + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/postcss-sorting": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz", + "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "postcss": "^8.3.9" + } + }, + "node_modules/postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dev": true, + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/ps-node": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/ps-node/-/ps-node-0.1.6.tgz", + "integrity": "sha512-w7QJhUTbu70hpDso0YXDRNKCPNuchV8UTUZsAv0m7Qj5g85oHOJfr9drA1EjvK4nQK/bG8P97W4L6PJ3IQLoOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "table-parser": "^0.1.3" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/q": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/q/-/q-1.1.2.tgz", + "integrity": "sha512-ROtylwux7Vkc4C07oKE/ReigUmb33kVoLtcR4SJ1QVqwaZkBEDL3vX4/kwFzIERQ5PfCl0XafbU8u2YUhyGgVA==", + "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.6.0", + "teleport": ">=0.2.0" + } + }, + "node_modules/qs": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", + "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/quick-lru": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz", + "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/raw-body/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true, + "license": "ISC" + }, + "node_modules/read-pkg/node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/read-pkg/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/read-pkg/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/redent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", + "dev": true, + "license": "MIT", + "dependencies": { + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.11", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz", + "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true, + "license": "MIT" + }, + "node_modules/semver": { + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/send": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", + "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.1", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "~2.4.1", + "range-parser": "~1.2.1", + "statuses": "~2.0.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/send/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "license": "MIT" + }, + "node_modules/serve-static": { + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", + "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "~0.19.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true, + "license": "ISC" + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "dev": true, + "license": "CC-BY-3.0" + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.22", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz", + "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-indent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "min-indent": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/style-search": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", + "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==", + "dev": true, + "license": "ISC" + }, + "node_modules/stylelint": { + "version": "14.16.1", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz", + "integrity": "sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@csstools/selector-specificity": "^2.0.2", + "balanced-match": "^2.0.0", + "colord": "^2.9.3", + "cosmiconfig": "^7.1.0", + "css-functions-list": "^3.1.0", + "debug": "^4.3.4", + "fast-glob": "^3.2.12", + "fastest-levenshtein": "^1.0.16", + "file-entry-cache": "^6.0.1", + "global-modules": "^2.0.0", + "globby": "^11.1.0", + "globjoin": "^0.1.4", + "html-tags": "^3.2.0", + "ignore": "^5.2.1", + "import-lazy": "^4.0.0", + "imurmurhash": "^0.1.4", + "is-plain-object": "^5.0.0", + "known-css-properties": "^0.26.0", + "mathml-tag-names": "^2.1.3", + "meow": "^9.0.0", + "micromatch": "^4.0.5", + "normalize-path": "^3.0.0", + "picocolors": "^1.0.0", + "postcss": "^8.4.19", + "postcss-media-query-parser": "^0.2.3", + "postcss-resolve-nested-selector": "^0.1.1", + "postcss-safe-parser": "^6.0.0", + "postcss-selector-parser": "^6.0.11", + "postcss-value-parser": "^4.2.0", + "resolve-from": "^5.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "style-search": "^0.1.0", + "supports-hyperlinks": "^2.3.0", + "svg-tags": "^1.0.0", + "table": "^6.8.1", + "v8-compile-cache": "^2.3.0", + "write-file-atomic": "^4.0.2" + }, + "bin": { + "stylelint": "bin/stylelint.js" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/stylelint" + } + }, + "node_modules/stylelint-order": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz", + "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "postcss": "^8.3.11", + "postcss-sorting": "^7.0.1" + }, + "peerDependencies": { + "stylelint": "^14.0.0" + } + }, + "node_modules/stylelint/node_modules/balanced-match": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", + "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", + "dev": true, + "license": "MIT" + }, + "node_modules/stylelint/node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/stylelint/node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/stylelint/node_modules/global-modules": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", + "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "global-prefix": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/stylelint/node_modules/global-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ini": "^1.3.5", + "kind-of": "^6.0.2", + "which": "^1.3.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/stylelint/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/stylelint/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-hyperlinks": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", + "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/svg-tags": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", + "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==", + "dev": true + }, + "node_modules/table": { + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz", + "integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "ajv": "^8.0.1", + "lodash.truncate": "^4.4.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/table-parser": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/table-parser/-/table-parser-0.1.3.tgz", + "integrity": "sha512-LCYeuvqqoPII3lzzYaXKbC3Forb+d2u4bNwhk/9FlivuGRxPE28YEWAYcujeSlLLDlMfvy29+WPybFJZFiKMYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "connected-domain": "^1.0.0" + } + }, + "node_modules/table/node_modules/ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/table/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, + "license": "MIT" + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/trim-newlines": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/unc-path-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/urlsafe-base64": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz", + "integrity": "sha512-RtuPeMy7c1UrHwproMZN9gN6kiZ0SvJwRaEzwZY0j9MypEkFqyBaKv176jvlPtg58Zh36bOkS0NFABXMHvvGCA==", + "dev": true + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/v8-compile-cache": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz", + "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==", + "dev": true, + "license": "MIT" + }, + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/web-push-testing": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.2.2.tgz", + "integrity": "sha512-UnrbIfg3Vjounhlqo4Ko30ZKXEdytK9r1a2l0Drrj4CjxqLE7v3nzfTX6aTKhtqwrO3i7uFTgvwY6l0Lr4aXMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "arg": "^5.0.1", + "express": "^4.17.2", + "http_ece": "^1.1.0", + "jsonwebtoken": "^9.0.0", + "node-persist": "^2.1.0", + "ps-node": "^0.1.6", + "urlsafe-base64": "^1.0.0" + }, + "bin": { + "web-push-testing": "src/bin/cli.js" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, + "node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/package.json b/package.json index 1053083ed87..7947d041537 100644 --- a/package.json +++ b/package.json @@ -1,52 +1,49 @@ { - "name": "phpbb", - "version": "3.3.0-dev", - "description": "phpBB Forum Software application", - "main": " ", - "directories": { - "doc": "docs" - }, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/phpbb/phpbb.git" - }, - "browserslist": [ - "> 1%", - "last 2 versions" - ], - "keywords": [ - "phpBB", - "phpbb", - "forum", - "php", - "software", - "community" - ], - "author": "", - "license": "GPL-2.0", - "bugs": { - "url": "https://tracker.phpbb.com" - }, - "homepage": "https://www.phpbb.com", - "devDependencies": { - "stylelint": "8.0.0", - "stylelint-order": "0.3.0" - }, - "dependencies": { - "del": "^3.0.0", - "gulp": "^3.9.1", - "gulp-autoprefixer": "^4.0.0", - "gulp-cssnano": "^2.1.2", - "gulp-postcss": "^7.0.0", - "gulp-rename": "^1.2.2", - "gulp-sass": "^3.1.0", - "gulp-sourcemaps": "^2.6.1", - "gulp-stylefmt": "^1.1.0", - "postcss-import": "^11.0.0", - "postcss-pxtorem": "^4.0.1", - "postcss-sorting": "^3.0.2" - } + "name": "phpbb", + "version": "4.0.0-dev", + "description": "phpBB Forum Software application", + "main": " ", + "directories": { + "doc": "docs" + }, + "browserslist": [ + "> 1%", + "not ie 11", + "not samsung 10.1", + "not and_uc 12.12", + "not op_mini all", + "edge >= 18", + "ff >= 72", + "chrome >= 79", + "safari >= 13", + "ios >= 12.4" + ], + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/phpbb/phpbb.git" + }, + "keywords": [ + "phpBB", + "phpbb", + "forum", + "php", + "software", + "community" + ], + "author": "", + "license": "GPL-2.0", + "bugs": { + "url": "https://tracker.phpbb.com" + }, + "homepage": "https://www.phpbb.com", + "devDependencies": { + "eslint": "^9.28.0", + "globals": "^17.0.0", + "stylelint": "^14.7.0", + "stylelint-order": "^5.0.0", + "web-push-testing": "^1.1.1" + } } diff --git a/phpBB/.htaccess b/phpBB/.htaccess index 53bce762ea8..e55375e58be 100644 --- a/phpBB/.htaccess +++ b/phpBB/.htaccess @@ -36,6 +36,13 @@ RewriteRule ^(.*)$ app.php [QSA,L] #Options +FollowSymLinks +# Apache content negotation tries to interpret non-existent paths as files if +# MultiViews is enabled. This will however cause issues with paths containg +# dots, e.g. for the cron tasks + + Options -MultiViews + + # With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from # module mod_authz_host to a new module called mod_access_compat (which may be # disabled) and a new "Require" syntax has been introduced to mod_authz_host. @@ -53,6 +60,14 @@ RewriteRule ^(.*)$ app.php [QSA,L] Order Allow,Deny Deny from All + + Order Allow,Deny + Deny from All + + + Order Allow,Deny + Deny from All + = 2.4> @@ -61,6 +76,12 @@ RewriteRule ^(.*)$ app.php [QSA,L] Require all denied + + Require all denied + + + Require all denied + @@ -73,6 +94,14 @@ RewriteRule ^(.*)$ app.php [QSA,L] Order Allow,Deny Deny from All + + Order Allow,Deny + Deny from All + + + Order Allow,Deny + Deny from All + @@ -81,5 +110,11 @@ RewriteRule ^(.*)$ app.php [QSA,L] Require all denied + + Require all denied + + + Require all denied + diff --git a/phpBB/adm/images/alert_close.png b/phpBB/adm/images/alert_close.png deleted file mode 100644 index 79750a013c5..00000000000 Binary files a/phpBB/adm/images/alert_close.png and /dev/null differ diff --git a/phpBB/adm/images/arrow_down.gif b/phpBB/adm/images/arrow_down.gif deleted file mode 100644 index b7fbf7e2764..00000000000 Binary files a/phpBB/adm/images/arrow_down.gif and /dev/null differ diff --git a/phpBB/adm/images/arrow_left.gif b/phpBB/adm/images/arrow_left.gif deleted file mode 100644 index ac92cb49719..00000000000 Binary files a/phpBB/adm/images/arrow_left.gif and /dev/null differ diff --git a/phpBB/adm/images/arrow_right.gif b/phpBB/adm/images/arrow_right.gif deleted file mode 100644 index 3a080ffdfe2..00000000000 Binary files a/phpBB/adm/images/arrow_right.gif and /dev/null differ diff --git a/phpBB/adm/images/arrow_up.gif b/phpBB/adm/images/arrow_up.gif deleted file mode 100644 index 0ff58721820..00000000000 Binary files a/phpBB/adm/images/arrow_up.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_button.gif b/phpBB/adm/images/bg_button.gif deleted file mode 100644 index 03172ff5c67..00000000000 Binary files a/phpBB/adm/images/bg_button.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash1.gif b/phpBB/adm/images/bg_hash1.gif deleted file mode 100644 index 61163679a80..00000000000 Binary files a/phpBB/adm/images/bg_hash1.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash2.gif b/phpBB/adm/images/bg_hash2.gif deleted file mode 100644 index d31840361c1..00000000000 Binary files a/phpBB/adm/images/bg_hash2.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash3.gif b/phpBB/adm/images/bg_hash3.gif deleted file mode 100644 index 40bc7e1b5c6..00000000000 Binary files a/phpBB/adm/images/bg_hash3.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash4.gif b/phpBB/adm/images/bg_hash4.gif deleted file mode 100644 index 54e7f0019f7..00000000000 Binary files a/phpBB/adm/images/bg_hash4.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_header.gif b/phpBB/adm/images/bg_header.gif deleted file mode 100644 index b95bf3ba959..00000000000 Binary files a/phpBB/adm/images/bg_header.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_header.jpg b/phpBB/adm/images/bg_header.jpg deleted file mode 100644 index 5ecec5360b1..00000000000 Binary files a/phpBB/adm/images/bg_header.jpg and /dev/null differ diff --git a/phpBB/adm/images/bg_tabs_alt1.gif b/phpBB/adm/images/bg_tabs_alt1.gif deleted file mode 100644 index 335a72c7116..00000000000 Binary files a/phpBB/adm/images/bg_tabs_alt1.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_tabs_alt2.gif b/phpBB/adm/images/bg_tabs_alt2.gif deleted file mode 100644 index a2142d5432b..00000000000 Binary files a/phpBB/adm/images/bg_tabs_alt2.gif and /dev/null differ diff --git a/phpBB/adm/images/cellpic3.gif b/phpBB/adm/images/cellpic3.gif deleted file mode 100644 index be46fc6fcc2..00000000000 Binary files a/phpBB/adm/images/cellpic3.gif and /dev/null differ diff --git a/phpBB/adm/images/file_conflict.gif b/phpBB/adm/images/file_conflict.gif deleted file mode 100644 index 4458c4ff230..00000000000 Binary files a/phpBB/adm/images/file_conflict.gif and /dev/null differ diff --git a/phpBB/adm/images/file_modified.gif b/phpBB/adm/images/file_modified.gif deleted file mode 100644 index 17e8f976c37..00000000000 Binary files a/phpBB/adm/images/file_modified.gif and /dev/null differ diff --git a/phpBB/adm/images/file_new.gif b/phpBB/adm/images/file_new.gif deleted file mode 100644 index d0ec75876d8..00000000000 Binary files a/phpBB/adm/images/file_new.gif and /dev/null differ diff --git a/phpBB/adm/images/file_new_conflict.gif b/phpBB/adm/images/file_new_conflict.gif deleted file mode 100644 index 84efde4faa9..00000000000 Binary files a/phpBB/adm/images/file_new_conflict.gif and /dev/null differ diff --git a/phpBB/adm/images/file_not_modified.gif b/phpBB/adm/images/file_not_modified.gif deleted file mode 100644 index 8f9b3d38391..00000000000 Binary files a/phpBB/adm/images/file_not_modified.gif and /dev/null differ diff --git a/phpBB/adm/images/file_up_to_date.gif b/phpBB/adm/images/file_up_to_date.gif deleted file mode 100644 index c3723426462..00000000000 Binary files a/phpBB/adm/images/file_up_to_date.gif and /dev/null differ diff --git a/phpBB/adm/images/gradient2b.gif b/phpBB/adm/images/gradient2b.gif deleted file mode 100644 index a8107659e29..00000000000 Binary files a/phpBB/adm/images/gradient2b.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_delete.gif b/phpBB/adm/images/icon_delete.gif deleted file mode 100644 index 57962d51728..00000000000 Binary files a/phpBB/adm/images/icon_delete.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_delete_disabled.gif b/phpBB/adm/images/icon_delete_disabled.gif deleted file mode 100644 index da55bbbe445..00000000000 Binary files a/phpBB/adm/images/icon_delete_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_down.gif b/phpBB/adm/images/icon_down.gif deleted file mode 100644 index 793db26cde2..00000000000 Binary files a/phpBB/adm/images/icon_down.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_down_disabled.gif b/phpBB/adm/images/icon_down_disabled.gif deleted file mode 100644 index 3ba36975b46..00000000000 Binary files a/phpBB/adm/images/icon_down_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_edit.gif b/phpBB/adm/images/icon_edit.gif deleted file mode 100644 index c95cf98eb9d..00000000000 Binary files a/phpBB/adm/images/icon_edit.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_edit_disabled.gif b/phpBB/adm/images/icon_edit_disabled.gif deleted file mode 100644 index ac96b0e6dca..00000000000 Binary files a/phpBB/adm/images/icon_edit_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder.gif b/phpBB/adm/images/icon_folder.gif deleted file mode 100644 index 845618c1a26..00000000000 Binary files a/phpBB/adm/images/icon_folder.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder_link.gif b/phpBB/adm/images/icon_folder_link.gif deleted file mode 100644 index efeaf0a11f3..00000000000 Binary files a/phpBB/adm/images/icon_folder_link.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder_lock.gif b/phpBB/adm/images/icon_folder_lock.gif deleted file mode 100644 index 7afb092a8f1..00000000000 Binary files a/phpBB/adm/images/icon_folder_lock.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_subfolder.gif b/phpBB/adm/images/icon_subfolder.gif deleted file mode 100644 index 71194865391..00000000000 Binary files a/phpBB/adm/images/icon_subfolder.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_sync.gif b/phpBB/adm/images/icon_sync.gif deleted file mode 100644 index 16223dfd9a4..00000000000 Binary files a/phpBB/adm/images/icon_sync.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_sync_disabled.gif b/phpBB/adm/images/icon_sync_disabled.gif deleted file mode 100644 index 39985045c8b..00000000000 Binary files a/phpBB/adm/images/icon_sync_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_trace.gif b/phpBB/adm/images/icon_trace.gif deleted file mode 100644 index 5c622e9a9dc..00000000000 Binary files a/phpBB/adm/images/icon_trace.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_up.gif b/phpBB/adm/images/icon_up.gif deleted file mode 100644 index 7daa95c07ee..00000000000 Binary files a/phpBB/adm/images/icon_up.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_up_disabled.gif b/phpBB/adm/images/icon_up_disabled.gif deleted file mode 100644 index 2797192574a..00000000000 Binary files a/phpBB/adm/images/icon_up_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/innerbox_bg.gif b/phpBB/adm/images/innerbox_bg.gif deleted file mode 100644 index 460526f0ba7..00000000000 Binary files a/phpBB/adm/images/innerbox_bg.gif and /dev/null differ diff --git a/phpBB/adm/images/loading.gif b/phpBB/adm/images/loading.gif deleted file mode 100644 index e1ed0883e07..00000000000 Binary files a/phpBB/adm/images/loading.gif and /dev/null differ diff --git a/phpBB/adm/images/phpbb_logo.png b/phpBB/adm/images/phpbb_logo.png deleted file mode 100644 index 2d76ef18cbf..00000000000 Binary files a/phpBB/adm/images/phpbb_logo.png and /dev/null differ diff --git a/phpBB/adm/images/phpbb_logo.svg b/phpBB/adm/images/phpbb_logo.svg new file mode 100644 index 00000000000..2a241067f9a --- /dev/null +++ b/phpBB/adm/images/phpbb_logo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index d27f56f28bf..25975e04666 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -15,7 +15,6 @@ */ define('IN_PHPBB', true); define('ADMIN_START', true); -define('NEED_SID', true); // Include files $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; @@ -49,21 +48,28 @@ define('IN_ADMIN', true); // Some oft used variables -$safe_mode = (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false; $file_uploads = (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_uploads')) === 'on') ? true : false; $module_id = $request->variable('i', ''); $mode = $request->variable('mode', ''); // Set custom style for admin area -$template->set_custom_style(array( - array( - 'name' => 'adm', - 'ext_path' => 'adm/style/', - ), -), $phpbb_admin_path . 'style'); - -$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets'); -$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); +/** @var \phpbb\template\base $template */ +$template->set_custom_style( + [ + [ + 'name' => 'adm', + 'ext_path' => 'adm/style/', + ] + ], + [ + $phpbb_admin_path . 'style', + $phpbb_root_path . 'styles/all/imgs/', + $phpbb_root_path . 'styles/all/template/', + ], +); + +$template->assign_var('T_ASSETS_PATH', $phpbb_path_helper->update_web_root_path($phpbb_root_path . 'assets')); +$template->assign_var('T_TEMPLATE_PATH', $phpbb_path_helper->update_web_root_path($phpbb_root_path . 'style')); // Instantiate new module $module = new p_master(); diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 2baca09f5e0..c33d30b1c11 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -29,7 +29,7 @@

{L_UPLOADING_FILES}

:: {upload.FILE_INFO}
- {upload.DENIED}{upload.ERROR_MSG}{L_SUCCESSFULLY_UPLOADED} + {upload.L_DENIED}{upload.ERROR_MSG}{L_SUCCESSFULLY_UPLOADED}

@@ -37,12 +37,6 @@

{L_UPLOADING_FILES}

- -
-

{L_NO_THUMBNAIL_SUPPORT}

-
- -
@@ -55,17 +49,28 @@

{L_UPLOADING_FILES}


{options.TITLE_EXPLAIN}
-
{options.CONTENT}
+
+ {% if options.CONTENT is iterable %} + {{ FormsBuildTemplate(options.CONTENT)}} + {% else %} + {options.CONTENT} + {% endif %} +
+ {% if (options.KEY == 'allow_attachments' and S_EMPTY_POST_GROUPS) or (options.KEY == 'allow_pm_attach' and S_EMPTY_PM_GROUPS) %} +
{{ lang(options.KEY == 'allow_attachments' ? 'NO_EXT_GROUP_ALLOWED_POST' : 'NO_EXT_GROUP_ALLOWED_PM', U_EXTENSION_GROUPS) }}
+ {% endif %}
-
- {L_SUBMIT} -   - +
+ {{ lang('ACP_SUBMIT_CHANGES') }} +

+   + +

@@ -116,7 +121,7 @@

{L_UPLOADING_FILES}

- @@ -60,11 +73,6 @@

{L_TITLE}

-
-

{L_BAN_EXCLUDE_EXPLAIN}
-
-
-
@@ -73,12 +81,14 @@

{L_TITLE}

- -

-   - -

-{S_FORM_TOKEN} +
+
+ {L_ACP_SUBMIT_CHANGES} +

+   + +

+ {S_FORM_TOKEN}
@@ -88,44 +98,41 @@

{L_UNBAN_TITLE}

{L_UNBAN_EXPLAIN}

-
+
- {L_UNBAN_TITLE} + {{ lang('UNBAN_TITLE') }} - +{% if BANNED_SELECT %}
-
-
+
+
+ {{ FormsSelect(BANNED_SELECT) }} +
-
+
-
+
-
+

-   - +   +

- {S_FORM_TOKEN} -
- - - -

{L_NO_BAN_CELL}

- {S_FORM_TOKEN} +{% else %} +

{{ lang('NO_BAN_CELL') }}

+{% endif %} + {{ S_FORM_TOKEN }} - -
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 8c8b8059753..aade2f8aac7 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -14,7 +14,7 @@

{L_ACP_BBCODES}

{L_BBCODE_USAGE} -

{L_BBCODE_USAGE_EXPLAIN}

+

{{ lang('BBCODE_USAGE_EXPLAIN', '', '') }}



{L_BBCODE_USAGE_EXAMPLE}
@@ -31,11 +31,11 @@

{L_ACP_BBCODES}

- {L_BBCODE_HELPLINE} -

{L_BBCODE_HELPLINE_EXPLAIN}

+ {{ lang('BBCODE_HELPLINE') }} +

{{ lang('BBCODE_HELPLINE_EXPLAIN') }}

-
-
+
+
@@ -47,6 +47,17 @@

{L_ACP_BBCODES}

+
+ {{ lang('APPEARANCE') }} +
+

{{ lang('BBCODE_FONT_ICON_EXPLAIN', '', '') }}
+
+ + {{ Icon('font', ' ', '', false, '', {'id':'bbcode_icon_preview'}) }} +
+
+
+
diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index fe3e2500992..ae1525d5862 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -27,7 +27,13 @@

{L_WARNING}


{options.TITLE_EXPLAIN}
-
{options.CONTENT}
+
+ {% if options.CONTENT is iterable %} + {{ FormsBuildTemplate(options.CONTENT)}} + {% else %} + {{ options.CONTENT }} + {% endif %} +
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index b0e61015b6c..8332df7e2b5 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -27,15 +27,21 @@

{L_WARNING}


{L_BOT_STYLE_EXPLAIN}
-
+
+ {{ FormsSelect(S_STYLE_OPTIONS) }} +
-

{L_BOT_LANG_EXPLAIN}
-
+

{L_BOT_LANG_EXPLAIN}
+
+ {{ FormsSelect(LANG_OPTIONS) }} +
-
+
+ {{ FormsSelect(S_ACTIVE_OPTIONS) }} +

{L_BOT_AGENT_EXPLAIN}
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 4353becd2f4..0c9d3bf0afb 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -1,79 +1,85 @@ - +{% include 'overall_header.html' %} -

{L_ACP_VC_SETTINGS}

+

{{ lang('ACP_VC_SETTINGS') }}

-

{L_ACP_VC_SETTINGS_EXPLAIN}

+

{{ lang('ACP_VC_SETTINGS_EXPLAIN') }}

-

{L_ACP_VC_EXT_GET_MORE}

+

{{ lang('ACP_VC_EXT_GET_MORE') }}

- +{% if ERRORS %}
-

{L_WARNING}

-

{ERROR_MSG}

+

{{ lang('WARNING') }}

+

{{ ERRORS|join('
') }}

- +{% endif %} -
+
-{L_GENERAL_OPTIONS} +{{ lang('GENERAL_OPTIONS') }}
-

{L_VISUAL_CONFIRM_REG_EXPLAIN}
-
-
+

{{ lang('VISUAL_CONFIRM_REG_EXPLAIN') }}
+
+ + +
-

{L_REG_LIMIT_EXPLAIN}
-
+

{{ lang('REG_LIMIT_EXPLAIN') }}
+
-

{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}
-
+

{{ lang('MAX_LOGIN_ATTEMPTS_EXPLAIN') }}
+
-

{L_VISUAL_CONFIRM_POST_EXPLAIN}
-
-
+

{{ lang('VISUAL_CONFIRM_POST_EXPLAIN') }}
+
+ + +
-

{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}
-
-
+

{{ lang('VISUAL_CONFIRM_REFRESH_EXPLAIN') }}
+
+ + +
-{L_AVAILABLE_CAPTCHAS} -
-

{L_CAPTCHA_SELECT_EXPLAIN}
-
-
- -
-

{L_CAPTCHA_CONFIGURE_EXPLAIN}
-
-
- +{{ lang('AVAILABLE_CAPTCHAS') }} +
+

{{ lang('CAPTCHA_SELECT_EXPLAIN') }}
+
{{ FormsSelect(CAPTCHA_SELECT | merge({id: 'captcha_select', onchange: "(document.getElementById('acp_captcha')).submit()"})) }}
+
+ {% if S_CAPTCHA_HAS_CONFIG %} +
+

{{ lang('CAPTCHA_CONFIGURE_EXPLAIN') }}
+
+
+ {% endif %}
- +{% if CAPTCHA_PREVIEW_TPL %}
- {L_PREVIEW} - + {{ lang('PREVIEW') }} + {% include CAPTCHA_PREVIEW_TPL %}
- +{% endif %}
- {L_ACP_SUBMIT_CHANGES} + {{ lang('ACP_SUBMIT_CHANGES') }}

-   -   +   +  

- {S_FORM_TOKEN} + {{ S_FORM_TOKEN }}
- +{% include 'overall_footer.html' %} diff --git a/phpBB/adm/style/acp_contact.html b/phpBB/adm/style/acp_contact.html index 828fd4b6594..7aa9d8d6a68 100644 --- a/phpBB/adm/style/acp_contact.html +++ b/phpBB/adm/style/acp_contact.html @@ -1,6 +1,6 @@ -
+ {L_ACP_SUBMIT_CHANGES}

-

@@ -51,8 +54,13 @@

{L_SEND_STATISTICS}

+ {L_ACP_SUBMIT_CHANGES}

- + {% for providers in providers %} + {% for values in providers.values %} + + {% endfor %} + {% endfor %}

diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 5493cbde0a4..9a5179419e1 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -4,7 +4,7 @@ - - + « {L_BACK} diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 7766052c596..80420530285 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -340,9 +340,12 @@

{L_ACL_SET}



- - - {S_FORM_TOKEN} + {L_ACP_SUBMIT_CHANGES} +

+   + + {S_FORM_TOKEN} +



diff --git a/phpBB/adm/style/acp_posting_buttons.html b/phpBB/adm/style/acp_posting_buttons.html index c3c42f8e827..c0c5aacd747 100644 --- a/phpBB/adm/style/acp_posting_buttons.html +++ b/phpBB/adm/style/acp_posting_buttons.html @@ -1,30 +1,9 @@ - @@ -49,10 +28,7 @@ - - - - @@ -65,7 +41,7 @@ - + diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index bd3935b464f..7a0ecce14ea 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -21,8 +21,11 @@

{L_WARNING}

+ {% EVENT acp_profile_options_before %} +
{L_TITLE} + {% EVENT acp_profile_basic_options_before %}

{L_FIELD_TYPE_EXPLAIN}
{FIELD_TYPE}
@@ -43,8 +46,11 @@

{L_WARNING}

+ {% EVENT acp_profile_basic_options_after %}
+ {% EVENT acp_profile_visibility_options_before %} +
{L_VISIBILITY_OPTION}
@@ -87,8 +93,11 @@

{L_WARNING}

+ {% EVENT acp_profile_contact_after %}
+ {% EVENT acp_profile_visibility_options_after %} +
@@ -238,7 +247,7 @@

{L_WARNING}

- + {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 6e8b2e42149..ecd18392500 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -7,7 +7,7 @@

{L_ACP_PRUNE_USERS}

{L_ACP_PRUNE_USERS_EXPLAIN}

- +
{L_CRITERIA}
@@ -66,15 +66,19 @@

{L_ACP_PRUNE_USERS}

+
-

- +

+ {L_ACP_SUBMIT_CHANGES} +

+ -   - - {S_FORM_TOKEN} -

+   + + {S_FORM_TOKEN} +

+ diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index e67c9acd800..aa31db497aa 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -6,7 +6,7 @@ « {L_BACK} - - -

{L_ACP_SEARCH_INDEX}

- - -

{L_CONTINUE_EXPLAIN}

- -
-
- {L_SUBMIT} -   - - {S_FORM_TOKEN} -
-
- - -

{L_ACP_SEARCH_INDEX_EXPLAIN}

- - - - - -
- -
- - {backend.S_HIDDEN_FIELDS} - - {L_INDEX_STATS}{L_COLON} {backend.L_NAME} ({L_ACTIVE}) - - - - - - - - - - - - - - - - - - - - - - -
{backend.L_NAME} ({L_ACTIVE})
{L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}
{backend.data.STATISTIC_1}{L_COLON}{backend.data.VALUE_1}{backend.data.STATISTIC_2}{L_COLON}{backend.data.VALUE_2}
- - - -

- - - - - - - -

- {S_FORM_TOKEN} -
- -
- - - - - - - diff --git a/phpBB/adm/style/acp_search_index.html b/phpBB/adm/style/acp_search_index.html new file mode 100644 index 00000000000..9c2fda674a0 --- /dev/null +++ b/phpBB/adm/style/acp_search_index.html @@ -0,0 +1,66 @@ +{% include 'overall_header.html' %} + + + +

{{ lang('ACP_SEARCH_INDEX') }}

+ +

{{ lang('ACP_SEARCH_INDEX_EXPLAIN') }}

+ +{% for backend in backends %} + + {% if backend.S_STATS is not empty %} + +
+ +
+ + {{ backend.S_HIDDEN_FIELDS }} + + {{ lang('INDEX_STATS') ~ lang('COLON') }} {{ backend.NAME }} {% if backend.S_ACTIVE %}({{ lang('ACTIVE') }}) {% endif %} + + + + + + + + + + + + + + {% for stat in backend.S_STATS | batch(2, '') %} + + {% for key, value in stat %} + {% if value is not empty %} + + + {% else %} + + + {% endif %} + {% endfor %} + + {% endfor %} + +
{{ backend.NAME }} {% if backend.S_ACTIVE %}({{ lang('ACTIVE') }}) {% endif %}
{{ lang('STATISTIC') }}{{ lang('VALUE') }}{{ lang('STATISTIC') }}{{ lang('VALUE') }}
{{ key ~ lang('COLON') }}{{ value }}
+ + {% endif %} + +

+ {% if backend.S_INDEXED %} + + + {% else %} + + + {% endif %} +

+ {{ S_FORM_TOKEN }} +
+ +
+{% endfor %} + +{% include 'overall_footer.html' %} diff --git a/phpBB/adm/style/acp_search_index_inprogress.html b/phpBB/adm/style/acp_search_index_inprogress.html new file mode 100644 index 00000000000..3f8f51f378d --- /dev/null +++ b/phpBB/adm/style/acp_search_index_inprogress.html @@ -0,0 +1,43 @@ +{% include 'overall_header.html' %} + + + +

+ {% if S_ACTION == 'create' %} + {{ lang('CONTINUE_INDEXING') }} + {% else %} + {{ lang('CONTINUE_DELETING_INDEX') }} + {% endif %} +

+ +

+ {% if S_ACTION == 'create' %} + {{ lang('CONTINUE_INDEXING_EXPLAIN') }} + {% else %} + {{ lang('CONTINUE_DELETING_INDEX_EXPLAIN') }} + {% endif %} +

+ +
+
+ {{ lang('CONTINUE_INDEXING') }} + {% if CONTINUE_PROGRESS %} +
+
+
+ {{ CONTINUE_PROGRESS.PERCENTAGE|number_format(2) ~ ' %' }}
+ {{ lang('SEARCH_INDEX_PROGRESS', CONTINUE_PROGRESS.VALUE, CONTINUE_PROGRESS.REMAINING, CONTINUE_PROGRESS.TOTAL) }} +
+ {% endif %} +

+   + +

+ {{ S_FORM_TOKEN }} +
+
+ +{% include 'overall_footer.html' %} diff --git a/phpBB/adm/style/acp_search_index_progress.html b/phpBB/adm/style/acp_search_index_progress.html new file mode 100644 index 00000000000..6c41105bab7 --- /dev/null +++ b/phpBB/adm/style/acp_search_index_progress.html @@ -0,0 +1,23 @@ +{% include 'overall_header.html' %} + + + +
+

{{ INDEXING_TITLE }}

+

+ {{ INDEXING_EXPLAIN }} + {% if INDEXING_PROGRESS %}
{{ INDEXING_PROGRESS }}{% endif %} + {% if INDEXING_RATE %}
{{ INDEXING_RATE }}{% endif %} + {% if INDEXING_PROGRESS_BAR %} +
+
+ {{ INDEXING_PROGRESS_BAR.PERCENTAGE|number_format(2) ~ ' %' }}
+ {{ lang('SEARCH_INDEX_PROGRESS', INDEXING_PROGRESS_BAR.VALUE, INDEXING_PROGRESS_BAR.REMAINING, INDEXING_PROGRESS_BAR.TOTAL) }} + {% endif %} +

+
+ +{% include 'overall_footer.html' %} diff --git a/phpBB/adm/style/acp_search_settings.html b/phpBB/adm/style/acp_search_settings.html new file mode 100644 index 00000000000..fe899ec2076 --- /dev/null +++ b/phpBB/adm/style/acp_search_settings.html @@ -0,0 +1,78 @@ +{% include 'overall_header.html' %} + + + +

{{ lang('ACP_SEARCH_SETTINGS') }}

+ +

{{ lang('ACP_SEARCH_SETTINGS_EXPLAIN') }}

+ + + +{% include 'overall_footer.html' %} diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index 4689a7546dd..f3b93020f8b 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -6,65 +6,115 @@

{{ lang('STORAGE_TITLE') }}

{{ lang('STORAGE_TITLE_EXPLAIN') }}

-
+ + + + + + + + + + + {% for storage in STORAGE_STATS %} + + + + + + + {% endfor %} + +
{{ lang('STORAGE_NAME') }}{{ lang('STORAGE_NUM_FILES') }}{{ lang('STORAGE_SIZE') }}{{ lang('STORAGE_FREE') }}
{{ storage.name }}{{ storage.files }}{{ storage.size }}{{ storage.free_space }}
+ +{% if ERROR_MESSAGES is not empty %} +
+

{{ lang('WARNING') }}

+ {% for ERROR_MESSAGE in ERROR_MESSAGES %} +

{{ ERROR_MESSAGE }}

+ {% endfor %} +
+{% endif %} + {% for storage in STORAGES %}
{{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }}
-

{{ lang('STORAGE_SELECT_DESC') }}
+

{{ lang('STORAGE_SELECT_DESC') }}
- {% for provider in PROVIDERS if provider.is_available %} -
- {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }} - {% for name, options in provider.get_options %} - {% set title = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper %} - {% set description = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper ~ '_EXPLAIN' %} - {% set input_id = storage.get_name ~ '_' ~ provider.get_name ~ '_' ~ name %} - {% set input_type = options['type'] %} - {% set input_name = storage.get_name ~ '[' ~ name ~ ']' %} - {% set input_value = attribute(config, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %} -
-
- - {% if lang_defined(description) %} -
{{ lang(description) }} - {% endif %} -
-
- {% if input_type in ['text', 'password', 'email'] %} - - {% elseif input_type == 'textarea' %} - - {% elseif input_type == 'radio' %} - {% for option_name, option_value in options['options'] %} - {{ lang(option_name) }} - {% endfor %} - {% elseif input_type == 'select' %} - - {% endif %} -
-
- {% endfor %} -
+ + {{ FormsRadioButtons(form_macro | merge({"buttons": buttons})) }} + {% elseif form_macro.tag == 'select' %} + {% set select_options = [] %} + + {% for option in form_macro.options %} + {% set new_option = option | merge({"selected": option.value == input_value}) %} + {% set select_options = select_options | merge([new_option]) %} + {% endfor %} + + {{ FormsSelect(form_macro | merge({"name": input_name, "options": select_options})) }} + {% endif %} + +
+ {% endfor %} +
+ {% endif %} {% endfor %} {% endfor %} +
+
+
+
+ + + +
+
+
+
{{ lang('SUBMIT') }}   diff --git a/phpBB/adm/style/acp_storage_update_inprogress.html b/phpBB/adm/style/acp_storage_update_inprogress.html new file mode 100644 index 00000000000..5f7614cb2c7 --- /dev/null +++ b/phpBB/adm/style/acp_storage_update_inprogress.html @@ -0,0 +1,32 @@ +{% include 'overall_header.html' %} + + + +

{{ lang('STORAGE_TITLE') }}

+ +

{{ lang('STORAGE_TITLE_EXPLAIN') }}

+ + +
+ {{ lang('SUBMIT') }} + + {% if CONTINUE_PROGRESS %} +
+
+
+ {{ CONTINUE_PROGRESS.PERCENTAGE|number_format(2) ~ ' %' }} +
+ {% endif %} + +

+   + +

+ {{ S_FORM_TOKEN }} +
+ + +{% include 'overall_footer.html' %} diff --git a/phpBB/adm/style/acp_storage_update_progress.html b/phpBB/adm/style/acp_storage_update_progress.html new file mode 100644 index 00000000000..17ba67a037f --- /dev/null +++ b/phpBB/adm/style/acp_storage_update_progress.html @@ -0,0 +1,20 @@ +{% include 'overall_header.html' %} + + + +
+

{{ INDEXING_TITLE }}

+

+ {{ INDEXING_EXPLAIN }} + {% if INDEXING_PROGRESS_BAR %} +
+
+ {{ INDEXING_PROGRESS_BAR.PERCENTAGE|number_format(2) ~ ' %' }} + {% endif %} +

+
+ +{% include 'overall_footer.html' %} diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 38bec5a1e4d..b0c16612c62 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -33,7 +33,7 @@

{MESSAGE_TITLE}

{L_EXPLAIN}

- {L_BROWSE_STYLES_DATABASE} + {L_BROWSE_STYLES_DATABASE}
@@ -96,9 +96,10 @@

{MESSAGE_TITLE}

{L_STYLE_NAME} - {L_STYLE_PHPBB_VERSION} - {L_STYLE_USED_BY} - {L_ACTIONS} + {{ lang('STYLE_VERSION') }} + {L_STYLE_PHPBB_VERSION} + {L_STYLE_USED_BY} + {L_ACTIONS} {STYLES_LIST_EXTRA}   @@ -126,10 +127,11 @@

{MESSAGE_TITLE}


{styles_list.COMMENT} - +
{L_STYLE_PATH}{L_COLON} {styles_list.STYLE_PATH_FULL} + {{ styles_list.STYLE_VERSION }} {styles_list.STYLE_PHPBB_VERSION} {styles_list.USERS} @@ -144,9 +146,11 @@

{MESSAGE_TITLE}

{styles_list.EXTRA} - + - + {% if styles_list.STYLE_NAME !== 'prosilver' %} + + {% endif %}   diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 50b6ec9bc93..c500541e63a 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -137,9 +137,13 @@

{L_WARNING}

{group.GROUP_NAME} {L_GROUP_DEFAULT}{L_GROUP_DEFAULT}{L_GROUP_APPROVE}  {group.L_DEMOTE_PROMOTE}  - {L_GROUP_DELETE} + {% if group.U_DELETE %}{{ lang('GROUP_DELETE') }}{% endif %} + + + {{ lang('NO_GROUP') }} + diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 8466985fb3c..3c2556905db 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -5,7 +5,7 @@

{ERROR}


{L_AVATAR_EXPLAIN}
-
{AVATAR}
+
{% include 'avatar.html' with {avatar_data: AVATAR} only %}
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index 506101c3f75..2af669a41fe 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -79,7 +79,7 @@ - -
+
- -{L_RECAPTCHA_NOT_AVAILABLE} - diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html index 67176ebd072..c31cfa7a1b3 100644 --- a/phpBB/adm/style/captcha_recaptcha_acp.html +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -21,6 +21,20 @@

{L_ACP_VC_SETTINGS}

+
+
+ +
{{ lang('RECAPTCHA_V3_DOMAIN_EXPLAIN') }} +
+
+ {% for domain in RECAPTCHA_V2_DOMAINS %} + + {% endfor %} +
+
diff --git a/phpBB/adm/style/captcha_recaptcha_v3.html b/phpBB/adm/style/captcha_recaptcha_v3.html new file mode 100644 index 00000000000..0f2d279fe9c --- /dev/null +++ b/phpBB/adm/style/captcha_recaptcha_v3.html @@ -0,0 +1,15 @@ +{% if S_RECAPTCHA_AVAILABLE %} +
+
 
+
+ + + {{ lang('RECAPTCHA_INVISIBLE') }} + +
+
+{% else %} + {{ lang('RECAPTCHA_NOT_AVAILABLE') }} +{% endif %} diff --git a/phpBB/adm/style/captcha_recaptcha_v3_acp.html b/phpBB/adm/style/captcha_recaptcha_v3_acp.html new file mode 100644 index 00000000000..ef9896a742c --- /dev/null +++ b/phpBB/adm/style/captcha_recaptcha_v3_acp.html @@ -0,0 +1,108 @@ +{% include 'overall_header.html' %} + + + +

{{ lang('ACP_VC_SETTINGS') }}

+

{{ lang('ACP_VC_SETTINGS_EXPLAIN') }}

+ + +
+ {{ lang('GENERAL_OPTIONS') }} + +
+
+ +
{{ lang('RECAPTCHA_V3_PUBLIC_EXPLAIN') }} +
+
+ +
+
+
+
+ +
{{ lang('RECAPTCHA_V3_PRIVATE_EXPLAIN') }} +
+
+ +
+
+ +
+
+ +
{{ lang('RECAPTCHA_V3_DOMAIN_EXPLAIN') }} +
+
+ {% for domain in RECAPTCHA_V3_DOMAINS %} + + {% endfor %} +
+
+
+
+ +
{{ lang('RECAPTCHA_V3_METHOD_EXPLAIN') }} +
+
+ {% for method, available in RECAPTCHA_V3_METHODS %} + + {% endfor %} +
+
+
+ +
+ {{ lang('RECAPTCHA_V3_THRESHOLDS') }} +

{{ lang('RECAPTCHA_V3_THRESHOLDS_EXPLAIN') }}

+ + {% for threshold in thresholds %} +
+
+ + {% if lang_defined(threshold.key|upper ~ '_EXPLAIN') %} +
{{ lang(threshold.key|upper ~ '_EXPLAIN') }} + {% endif %} +
+
+
+ {% endfor %} +
+ +
+ {{ lang('PREVIEW') }} + + {% if PREVIEW %} +
+

{{ lang('WARNING') }}

+

{{ lang('CAPTCHA_PREVIEW_MSG') }}

+
+ {% endif %} + + {% include CAPTCHA_PREVIEW %} +
+ +
+ {{ lang('ACP_SUBMIT_CHANGES') }} + +

+ + + + + + {{ S_FORM_TOKEN }} +

+
+ + +{% include 'overall_footer.html' %} diff --git a/phpBB/adm/style/captcha_turnstile_acp.html b/phpBB/adm/style/captcha_turnstile_acp.html new file mode 100644 index 00000000000..a187e1e41b1 --- /dev/null +++ b/phpBB/adm/style/captcha_turnstile_acp.html @@ -0,0 +1,64 @@ +{% include('overall_header.html') %} + + + +

{{ lang('ACP_VC_SETTINGS') }}

+ +

{{ lang('ACP_VC_SETTINGS_EXPLAIN') }}

+ +
+
+ {{ lang('GENERAL_OPTIONS') }} +
+
+
+ {{ lang('CAPTCHA_TURNSTILE_SITEKEY_EXPLAIN') }} +
+
+
+
+
+
+ {{ lang('CAPTCHA_TURNSTILE_SECRET_EXPLAIN') }} +
+
+
+
+
+ +
{{ lang('CAPTCHA_TURNSTILE_THEME_EXPLAIN') }} +
+
+ {% for theme in CAPTCHA_TURNSTILE_THEMES %} + + {% endfor %} +
+
+
+
+ {{ lang('PREVIEW') }} + {% if PREVIEW %} +
+

{{ lang('WARNING') }}

+

{{ lang('CAPTCHA_PREVIEW_MSG') }}

+
+ {% endif %} + {% include(CAPTCHA_PREVIEW) %} +
+ +
+ {{ lang('ACP_SUBMIT_CHANGES') }} +

+   +   +

+ + + {{ S_FORM_TOKEN }} +
+
+ +{% include('overall_footer.html') %} diff --git a/phpBB/adm/style/captcha_turnstile_acp_demo.html b/phpBB/adm/style/captcha_turnstile_acp_demo.html new file mode 100644 index 00000000000..757d0a4bcb9 --- /dev/null +++ b/phpBB/adm/style/captcha_turnstile_acp_demo.html @@ -0,0 +1,23 @@ +
+
+
+{% INCLUDEJS U_TURNSTILE_SCRIPT %} + diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html index fefa8f6d3fd..4aa47cbf8ac 100644 --- a/phpBB/adm/style/installer_footer.html +++ b/phpBB/adm/style/installer_footer.html @@ -6,12 +6,14 @@
- Powered by phpBB® Forum Software © phpBB Limited + {% if S_COPYRIGHT_HTML %} + {{ CREDIT_LINE }} + {% endif %}
- - - - + + + + {$SCRIPTS} diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html index 704db9e1742..39d86da1797 100644 --- a/phpBB/adm/style/installer_header.html +++ b/phpBB/adm/style/installer_header.html @@ -7,6 +7,7 @@ {META} {PAGE_TITLE} + @@ -19,7 +20,7 @@

{L_INSTALL_PANEL}

- diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html index 53a91f27002..ae77f6b55ec 100644 --- a/phpBB/adm/style/installer_install.html +++ b/phpBB/adm/style/installer_install.html @@ -6,6 +6,9 @@

{TITLE}

{L_SUBMIT} + {% if SHOW_RESTART_BUTTON %} + + {% endif %}
diff --git a/phpBB/adm/style/installer_update_file_status.html b/phpBB/adm/style/installer_update_file_status.html index a27bfa6a44b..b49faf0f414 100644 --- a/phpBB/adm/style/installer_update_file_status.html +++ b/phpBB/adm/style/installer_update_file_status.html @@ -4,7 +4,7 @@

{L_FILES_DELETED}

{L_FILES_DELETED_EXPLAIN}

- {L_STATUS_DELETED} + {{ Icon('font', 'circle-xmark', lang('STATUS_DELETED'), true, '', {'style' : 'color:red;'}) }}
{deleted.DIR_PART}{deleted.FILE_PART}
@@ -20,7 +20,7 @@

{L_FILES_CONFLICT}

{L_FILES_CONFLICT_EXPLAIN}

- {L_STATUS_CONFLICT} + {{ Icon('font', 'circle-exclamation', lang('STATUS_CONFLICT'), true, '', {'style' : 'color:red;'}) }}
{conflict.DIR_PART}{conflict.FILE_PART}
@@ -36,7 +36,7 @@

{L_FILES_MODIFIED}

{L_FILES_MODIFIED_EXPLAIN}

- {L_STATUS_MODIFIED} + {{ Icon('font', 'circle-arrow-left', lang('STATUS_MODIFIED'), true, '', {'style' : 'color:#ffd43b;'}) }}
{modified.DIR_PART}{modified.FILE_PART}
@@ -52,7 +52,7 @@

{L_FILES_NEW}

{L_FILES_NEW_EXPLAIN}

@@ -85,7 +74,7 @@

{L_TITLE}

- {S_HIDDEN_FIELDS}  + {S_HIDDEN_FIELDS} {S_FORM_TOKEN}
@@ -122,7 +111,7 @@

{L_UNBAN_TITLE}

- {S_HIDDEN_FIELDS}  + {S_HIDDEN_FIELDS}
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index a41fea82949..786c09c5317 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -36,9 +36,25 @@

{L_FORUM}{L_COLON} {FORUM_NAME}

  • -
    -
    style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"> - +
    +
    + + {{ Icon('svg', { + 'globe' : topicrow.S_POST_GLOBAL, + 'bullhorn' : topicrow.S_POST_ANNOUNCE, + 'thumbtack' : topicrow.S_POST_STICKY, + 'lock' : topicrow.S_TOPIC_LOCKED, + 'arrow-right-bold' : topicrow.S_TOPIC_MOVED, + 'fire' : topicrow.S_TOPIC_HOT, + 'file-document-outline' : true, + }, '', true, 'c-forum-row-icon') }} + + {% if lang(topicrow.TOPIC_AUTHOR) == S_USERNAME %} + + {% endif%} + {% if topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS %} + + {% endif %}
    [ {L_SELECT_MERGE} ]   @@ -47,52 +63,57 @@

    {L_FORUM}{L_COLON} {FORUM_NAME}

    - {L_TOPIC_UNAPPROVED} + {{ Icon('font', 'circle-question', lang('TOPIC_UNAPPROVED'), true, 'fas c-unapproved-icon o-icon-baseline') }} - {L_TOPIC_DELETED} + {{ Icon('font', 'recycle', lang('TOPIC_DELETED'), true, 'fas c-topic-deleted-icon o-icon-baseline') }} - {L_TOPIC_REPORTED} + {{ Icon('font', 'triangle-exclamation', lang('TOPIC_REPORTED'), true, 'fas c-topic-reported-icon o-icon-baseline') }}  [ {L_DELETE_SHADOW_TOPIC} ]
    - - {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} + {% if topicrow.ATTACH_ICON_IMG %}{{ Icon('font', 'paperclip', '', true) }} {% endif %} + {% EVENT topiclist_row_topic_by_author_before %} + {L_POST_BY_AUTHOR} {% EVENT mcp_forum_topic_author_username_prepend %}{topicrow.TOPIC_AUTHOR_FULL}{% EVENT mcp_forum_topic_author_username_append %} » {topicrow.FIRST_POST_TIME} + {% EVENT topiclist_row_topic_by_author_after %}
    {topicrow.REPLIES} {L_REPLIES}
    -
    {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
    {topicrow.LAST_POST_TIME}
    +
    {L_LAST_POST} {L_POST_BY_AUTHOR} {% EVENT mcp_forum_last_post_author_username_prepend %}{topicrow.LAST_POST_AUTHOR_FULL}{% EVENT mcp_forum_last_post_author_username_append %}
    {topicrow.LAST_POST_TIME}
    checked="checked" />  diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html index f84faeee656..b594fc7bcb1 100644 --- a/phpBB/styles/prosilver/template/mcp_front.html +++ b/phpBB/styles/prosilver/template/mcp_front.html @@ -20,6 +20,7 @@

    {L_LATEST_UNAPPROVED}

    {L_VIEW_DETAILS}
    {L_TOPIC} & {L_FORUM}
    +
    {{ lang('MARK') }}
    • @@ -30,7 +31,7 @@

    {L_LATEST_UNAPPROVED}

    - {unapproved.SUBJECT}
    + {unapproved.SUBJECT} {{ Icon('font', 'paperclip', '', true) }}
    {L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} » {unapproved.POST_TIME}
    @@ -86,12 +87,12 @@

    {L_LATEST_REPORTED}

    - {report.SUBJECT}
    + {report.SUBJECT} {{ Icon('font', 'paperclip', '', true) }}
    {L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} » {report.POST_TIME}
    - {L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE}
    + {L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} {{ report.REPORT_TIME }}
    {L_FORUM}{L_COLON} {report.FORUM_NAME}
    @@ -129,7 +130,7 @@

    {L_LATEST_REPORTED_PMS}

    - {pm_report.PM_SUBJECT}
    + {pm_report.PM_SUBJECT} {{ Icon('font', 'paperclip', '', true) }}
    {L_MESSAGE_BY_AUTHOR} {pm_report.PM_AUTHOR_FULL} » {pm_report.PM_TIME}
    {L_MESSAGE_TO} {pm_report.RECIPIENTS}
    diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html index d8e39f5b995..ee3e2146ac6 100644 --- a/phpBB/styles/prosilver/template/mcp_move.html +++ b/phpBB/styles/prosilver/template/mcp_move.html @@ -43,12 +43,14 @@

    {MESSAGE_TITLE}

    {ADDITIONAL_MSG}

    + {% EVENT mcp_move_destination_forum_before %}
    + {% EVENT mcp_move_destination_forum_after %}
     
    {MESSAGE_TEXT}
    diff --git a/phpBB/styles/prosilver/template/mcp_notes_front.html b/phpBB/styles/prosilver/template/mcp_notes_front.html index ee985a53da3..73634eadefa 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_front.html +++ b/phpBB/styles/prosilver/template/mcp_notes_front.html @@ -19,7 +19,6 @@

    {L_TITLE}

    -   {S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index 6d318dda977..c4682e09754 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -11,13 +11,13 @@

    {USERNAME_FULL}

    -
    {AVATAR_IMG}
    + {% include 'avatar.html' with {'avatar_data': USER_AVATAR} only %}
    {L_RANK}{L_COLON}
    {RANK_TITLE}
    -
     {L_RANK}{L_COLON}
    {RANK_IMG}
    + {% if RANK_IMG %}
    {% if RANK_TITLE %} {% else %}{{ lang('RANK') ~ lang('COLON') }}{% endif %}
    {{ RANK_IMG }}
    {% endif %}
    {L_JOINED}{L_COLON}
    {JOINED}
    {L_TOTAL_POSTS}{L_COLON}
    {POSTS}
    {L_WARNINGS}{L_COLON}
    {WARNINGS}
    @@ -42,7 +42,7 @@

    {L_ADD_FEEDBACK}

    - {S_HIDDEN_FIELDS}  + {S_HIDDEN_FIELDS} {S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 7fa48caf117..45c6088f768 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -14,7 +14,7 @@

    {L_REPORT_DETAILS}

    {L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}

    {L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} « {REPORT_DATE}

    -

    {L_REPORT_CLOSED}

    +

    {{ Icon('font', 'exclamation', '', true, 'fas c-topic-reported-icon') }}{L_REPORT_CLOSED}

    @@ -31,10 +31,12 @@

    {L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}

    + {% EVENT mcp_post_report_buttons_top_before %}   + {% EVENT mcp_post_report_buttons_top_after %} {S_FORM_TOKEN}
    @@ -59,7 +61,7 @@

    {POST_SUBJECT}

  • - {L_EDIT_POST} + {{ Icon('font', 'pencil', lang('EDIT_POST'), true, 'fas c-button-icon') }}
    • @@ -69,13 +71,14 @@

    {POST_SUBJECT}

    {L_SENT_AT}{L_COLON} {POST_DATE}
    {L_PM_FROM}{L_COLON} {POST_AUTHOR_FULL} -
    {L_TO}{L_COLON} {to_recipient.NAME_FULL}{to_recipient.NAME}  -
    {L_BCC}{L_COLON} {bcc_recipient.NAME_FULL}{bcc_recipient.NAME}  +
    {L_TO}{L_COLON} {to_recipient.NAME_FULL} style="color:{to_recipient.COLOUR};">{to_recipient.NAME}  +
    {L_BCC}{L_COLON} {bcc_recipient.NAME_FULL} style="color:{bcc_recipient.COLOUR};">{bcc_recipient.NAME} 

    -

    {MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} » {POST_DATE}

    +

    {{ Icon('font', 'file', MINI_POST, true, 'fas c-topic-icon') }} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} » {POST_DATE}

    + {% if S_CAN_APPROVE %} @@ -99,17 +102,23 @@

    {POST_SUBJECT}

    + {% endif %} - + {% if S_POST_REPORTED and not S_MCP_REPORT %}

    - {L_TOPIC_REPORTED} {L_MESSAGE_REPORTED} + {{ Icon('font', 'exclamation', lang('TOPIC_REPORTED'), true, 'fas c-topic-reported-icon') }} + {{ lang('POST_REPORTED') }}

    - + {% endif %} + + {% EVENT mcp_post_text_before %}
    {POST_PREVIEW}
    + {% EVENT mcp_post_text_after %} +
    {L_ATTACHMENTS}
    @@ -323,21 +332,23 @@

    {L_MCP_POST_REPORTS}

    -
    -

    {L_LOOKUP_ALL}

    -
    + {% if U_LOOKUP_ALL %} +
    +

    {L_LOOKUP_ALL}

    +
    + {% endif %}
    diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 3db3087dc0f..237620bd612 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -8,11 +8,34 @@
    - {CREDIT_LINE} -
    {TRANSLATION_INFO} +

    + {{ CREDIT_LINE }} +

    + +

    + {{ TRANSLATION_INFO }} +

    + -
    {DEBUG_OUTPUT} -
    {L_ACP} + + +

    + {{ DEBUG_OUTPUT }} +

    + + +

    + {{ lang('ACP') }} +

    +
    @@ -29,13 +52,13 @@ @@ -45,27 +68,27 @@

     

    - {RUN_CRON_TASK} + {% if not S_IS_BOT %}{{ RUN_CRON_TASK }}{% endif %}
    - - - + + + - - - +{% if S_ALLOW_CDN %} + +{% endif %} @@ -86,7 +109,7 @@

     

    "message": "{LA_COOKIE_CONSENT_MSG}", "dismiss": "{LA_COOKIE_CONSENT_OK}", "link": "{LA_COOKIE_CONSENT_INFO}", - "href": "{LA_COOKIE_CONSENT_HREF}" + "href": "{UA_PRIVACY}" } }); }); diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index cb1283cab44..cb94e8b11d3 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -4,6 +4,9 @@ + + + {META} <!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --> @@ -24,7 +27,7 @@ @@ -39,7 +42,7 @@ (function(d) { var wf = d.createElement('script'), s = d.scripts[0]; - wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js'; + wf.src = 'https://cdn.jsdelivr.net/npm/webfontloader@1.6.28/webfontloader.min.js'; wf.async = true; s.parentNode.insertBefore(wf, s); })(document); @@ -49,10 +52,6 @@ - - - - @@ -61,12 +60,18 @@ + + {$STYLESHEETS} +{% if NOTIFICATIONS_WEBPUSH_ENABLE %} + {% include 'ucp_notifications_webpush.html' %} +{% endif %} + @@ -75,16 +80,25 @@
    + + - -
    + {% include 'breadcrumbs.html' %} + diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html index 4e7297dafc2..db1251caa37 100644 --- a/phpBB/styles/prosilver/template/pagination.html +++ b/phpBB/styles/prosilver/template/pagination.html @@ -1,7 +1,7 @@
    • - {PAGE_NUMBER} + {{ Icon('font', 'turn-down', PAGE_NUMBER, true, 'fas fa-rotate-270 c-button-icon c-pagination-icon') }}
        @@ -16,13 +16,13 @@ - +
      • {pagination.PAGE_NUMBER}
        • - +
      • {pagination.PAGE_NUMBER}
        • diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html index fc663118c19..9425b7d7695 100644 --- a/phpBB/styles/prosilver/template/plupload.html +++ b/phpBB/styles/prosilver/template/plupload.html @@ -1,5 +1,4 @@ - diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html index 749733982ef..bf103cd3ce2 100644 --- a/phpBB/styles/prosilver/template/posting_attach_body.html +++ b/phpBB/styles/prosilver/template/posting_attach_body.html @@ -2,12 +2,13 @@

        {L_ADD_ATTACHMENT_EXPLAIN}

        + {% if MAX_ATTACHMENT_FILESIZE is not empty %}

        {{ MAX_ATTACHMENT_FILESIZE }}

        {% endif %}
        - +
        @@ -21,6 +22,7 @@
        + {% EVENT posting_attach_body_file_list_before %}
        @@ -33,11 +35,11 @@ - + + {% EVENT posting_attach_body_attach_row_before %} + {% EVENT posting_attach_body_attach_row_prepend %} + {% EVENT posting_attach_body_attach_row_append %} + {% EVENT posting_attach_body_attach_row_after %}
        -   + {% if S_BBCODE_ALLOWED %} {% endif %} @@ -55,16 +57,18 @@
        {attach_row.FILENAME} - + {% EVENT posting_attach_body_attach_row_controls_prepend %} -   + {% if S_BBCODE_ALLOWED and S_INLINE_ATTACHMENT_OPTIONS %} {% endif %} - + {% EVENT posting_attach_body_attach_row_controls_append %} @@ -78,10 +82,13 @@
        + {% EVENT posting_attach_body_file_list_after %}
    diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 14185ed66be..4712cc34a62 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -1,6 +1,5 @@ - + +{% include 'mentions_templates.html' %} + + + -
    +
    data-mention-url="{U_MENTION_URL}" data-mention-names-limit="{S_MENTION_NAMES_LIMIT}" data-topic-id="{S_TOPIC_ID}" data-user-id="{S_USER_ID}"> - - - - @@ -120,8 +98,12 @@ -
    diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 49fff3fb082..eebc96623eb 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -1,16 +1,24 @@

    {ERROR}

    + {% EVENT posting_editor_topic_icons_before %} +
    + {% EVENT posting_editor_topic_icons_prepend %} + + + {% EVENT posting_editor_topic_icons_append %}
    + {% EVENT posting_editor_topic_icons_after %} +
    @@ -57,7 +65,6 @@ {BBCODE_STATUS}
    {IMG_STATUS}
    - {FLASH_STATUS}
    {URL_STATUS}
    {SMILIES_STATUS} @@ -109,7 +116,7 @@
    - -
    + {% if S_SOFTDELETE_ALLOWED || S_DELETE_ALLOWED %} +
    -
    -
    - -
    - +
    + {% if S_SOFTDELETE_ALLOWED %} +
    + {% endif %} + {% if S_DELETE_ALLOWED %} +
    + {% endif %}
    - + {% endif %}
    diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html index 985f92b23d4..3bb57593f4a 100644 --- a/phpBB/styles/prosilver/template/posting_layout.html +++ b/phpBB/styles/prosilver/template/posting_layout.html @@ -38,27 +38,6 @@

    {L_INFORMATION}

    - -
    -
    -
    -

    {L_SELECT_DESTINATION_FORUM}

    -

    {L_UNGLOBALISE_EXPLAIN}

    -
    -
    -
    -
    - -
    -
     
    -
    -
    -
    - -
    -
    - -
    @@ -73,7 +52,7 @@

    {L_POST_A}

    - + diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index 02c7d805582..2569e1583a6 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -1,83 +1,116 @@
    - + {% if not S_SHOW_DRAFTS %} - + {% if S_GROUP_OPTIONS %}
    -
    -
    +
    +
    - - -
    - -
    -
    -
    - - - - {L_FIND_USERNAME} - -
    -
    - -
    -
    -
    - -
    -
    + {% endif %} + {% if S_ALLOW_MASS_PM %} +
    + {% if not S_EDIT_POST %} +
    +
    - + + + {% EVENT posting_pm_header_find_username_before %} + {{ lang('FIND_USERNAME') }} + {% EVENT posting_pm_header_find_username_after %}
    - -
    - -
    + {% endif %} +
    + {% if to_recipient or bcc_recipient %} +
    + {% endif %} +
    + {% if to_recipient %} +
    +
    +
    +
      + {% for recipient in to_recipient %} +
    • + {% if not S_EDIT_POST %} + + {% endif %} + {% if recipient.IS_GROUP %} + {{ recipient.NAME }} + {% else %} + {{ recipient.NAME_FULL }} + {% endif %} +
      • + {% endfor %} +
    +
    +
    + {% endif %} +
    + {% if bcc_recipient %} +
    +
    +
    +
    +
      + {% for recipient in bcc_recipient %} +
    • + {% if not S_EDIT_POST %} + + {% endif %} + {% if recipient.IS_GROUP %} + {{ recipient.NAME }} + {% else %} + {{ recipient.NAME_FULL }} + {% endif %} +
      • + {% endfor %} +
    +
    +
    +
    + {% endif %} + {% else %} +
    -
    -
    - -
    +
    + + {% if not S_EDIT_POST %} +
    {{ lang('FIND_USERNAME') }} + {% endif %} +
    + {% if not S_EDIT_POST %} +
    + +
    + {% endif %} + {% if to_recipient %} +
    +
      + {% for recipient in to_recipient %} +
    • + {% if not S_EDIT_POST %} + + {% endif %} + {% if recipient.IS_GROUP %} + {{ recipient.NAME }} + {% else %} + {{ recipient.NAME_FULL }} + {% endif %} +
      • + {% endfor %} +
    +
    + {% endif %}
    - - -
    -
    -

    {L_FIND_USERNAME}
    - -
    - - -
    -
    - -
    -
    - - - -
    + {% endif %} + {% endif %} +
    diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html index 316fa791e45..9c9b3272015 100644 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ b/phpBB/styles/prosilver/template/posting_pm_layout.html @@ -34,7 +34,7 @@

    {L_TITLE}

    - + diff --git a/phpBB/styles/prosilver/template/posting_poll_body.html b/phpBB/styles/prosilver/template/posting_poll_body.html index ee7100aded5..795649650dd 100644 --- a/phpBB/styles/prosilver/template/posting_poll_body.html +++ b/phpBB/styles/prosilver/template/posting_poll_body.html @@ -15,8 +15,8 @@
    -
    -
    +
    +

    {L_POLL_OPTIONS_EXPLAIN}
    diff --git a/phpBB/styles/prosilver/template/posting_preview.html b/phpBB/styles/prosilver/template/posting_preview.html index aac117c090f..781d0de06b9 100644 --- a/phpBB/styles/prosilver/template/posting_preview.html +++ b/phpBB/styles/prosilver/template/posting_preview.html @@ -31,6 +31,8 @@

    {L_PREVIEW}{L_COLON} {PREVIEW_SUBJECT}

    {PREVIEW_MESSAGE}
    + +
    {L_ATTACHMENTS}
    diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html index 1304046b23b..86151430709 100644 --- a/phpBB/styles/prosilver/template/posting_review.html +++ b/phpBB/styles/prosilver/template/posting_review.html @@ -6,23 +6,24 @@

    {L_POST_REVIEW}

    - {post_review_row.L_IGNORE_POST} + {post_review_row.L_IGNORE_POST}
    + {{ lang('POST_DISPLAY') }}
    -

    {post_review_row.POST_SUBJECT}

    +

    {post_review_row.POST_SUBJECT}

    - {post_review_row.MINI_POST} + {{ Icon('font', 'file', post_review_row.MINI_POST, true, 'fas c-topic-icon') }} - {post_review_row.MINI_POST} + {{ Icon('font', 'file', post_review_row.MINI_POST, true, 'fas c-topic-icon') }} - {L_POST_BY_AUTHOR} {post_review_row.POST_AUTHOR_FULL} » {post_review_row.POST_DATE} + {L_POST_BY_AUTHOR} {post_review_row.POST_AUTHOR_FULL} » {post_review_row.POST_DATE}

    {post_review_row.MESSAGE}
    diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html index 54e82a58bc9..b5794d5afff 100644 --- a/phpBB/styles/prosilver/template/posting_smilies.html +++ b/phpBB/styles/prosilver/template/posting_smilies.html @@ -1,10 +1,8 @@ - diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index 857c6867748..7d602b2ccc9 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -5,42 +5,42 @@

    -
    - {topic_review_row.L_IGNORE_POST} + {topic_review_row.L_IGNORE_POST}
    + {{ lang('POST_DISPLAY') }}
    - {topic_review_row.L_DELETE_POST} + {topic_review_row.L_DELETE_POST}
    + {{ lang('POST_DISPLAY') }}
    -

    {topic_review_row.POST_SUBJECT}

    +

    {topic_review_row.POST_SUBJECT}

    @@ -93,7 +96,7 @@

    {L_SEARCH_OPTIONS}

    - {S_HIDDEN_FIELDS}  + {S_HIDDEN_FIELDS}
    diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 6bc5c72a879..9e8a3c3e9bd 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -10,13 +10,13 @@

    {SEARCH_TITLE}

    - {L_RETURN_TO_TOPIC} + {{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_TOPIC'), false, 'fas c-return-arrow-icon') }}

    - {L_GO_TO_SEARCH_ADV} + {{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('GO_TO_SEARCH_ADV'), false, 'fas c-return-arrow-icon') }}

    @@ -32,10 +32,10 @@

    {SEARCH_TITLE}{SEARCH_TITLE}{SEARCH_TITLE}
  • -
    - style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;" title="{searchresults.TOPIC_FOLDER_IMG_ALT}"> - +
    +
    + {% if searchresults.U_NEWEST_POST and searchresults.S_UNREAD_TOPIC and not S_IS_BOT %} + {% set U_ITEM_LINK = searchresults.U_NEWEST_POST %} + {% elseif searchresults.U_VIEW_TOPIC %} + {% set U_ITEM_LINK = searchresults.U_VIEW_TOPIC %} + {% endif %} + {% if U_ITEM_LINK is defined %} + + {{ Icon('svg', { + 'globe' : searchresults.S_POST_GLOBAL, + 'bullhorn' : searchresults.S_POST_ANNOUNCE, + 'thumbtack' : searchresults.S_POST_STICKY, + 'lock' : searchresults.S_TOPIC_LOCKED, + 'arrow-right-bold' : searchresults.S_TOPIC_MOVED, + 'fire' : searchresults.S_TOPIC_HOT, + 'file-document-outline' : true, + }, '', true, 'c-forum-row-icon') }} + + {% else %} + + {{ Icon('svg', { + 'globe' : searchresults.S_POST_GLOBAL, + 'bullhorn' : searchresults.S_POST_ANNOUNCE, + 'thumbtack' : searchresults.S_POST_STICKY, + 'lock' : searchresults.S_TOPIC_LOCKED, + 'arrow-right-bold' : searchresults.S_TOPIC_MOVED, + 'fire' : searchresults.S_TOPIC_HOT, + 'file-document-outline' : true, + }, '', true, 'c-forum-row-icon') }} + + {% endif %} + {% if lang(searchresults.TOPIC_AUTHOR) == S_USERNAME %} + + {% endif%} + {% if searchresults.TOPIC_ICON_IMG and S_TOPIC_ICONS %} + + {% endif %}
    - - - {L_NEW_POST} - - - {searchresults.TOPIC_TITLE} + {% if searchresults.U_NEWEST_POST and searchresults.S_UNREAD_TOPIC and not S_IS_BOT %} + {{ searchresults.TOPIC_TITLE }} + {% elseif searchresults.U_VIEW_TOPIC %} + {{ searchresults.TOPIC_TITLE }} + {% else %} + {{ searchresults.TOPIC_TITLE }} + {% endif %} - {L_TOPIC_UNAPPROVED} + {{ Icon('font', 'circle-question', lang('TOPIC_UNAPPROVED'), true, 'fas c-unapproved-icon') }} - {L_TOPIC_DELETED} + {{ Icon('font', 'recycle', lang('TOPIC_DELETED'), true, 'fas c-topic-deleted-icon') }} - {L_TOPIC_REPORTED} + {{ Icon('font', 'triangle-exclamation', lang('TOPIC_REPORTED'), true, 'fas c-topic-reported-icon') }}
    @@ -108,21 +145,23 @@

    {SEARCH_TITLE}
    - - - {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » {searchresults.FIRST_POST_TIME} » {L_IN} {searchresults.FORUM_TITLE} + {{ Icon('font', 'chart-bar', '', true) }} + {{ Icon('font', 'paperclip', '', true) }} + {% EVENT topiclist_row_topic_by_author_before %} + {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » » {L_IN} {searchresults.FORUM_TITLE} + {% EVENT topiclist_row_topic_by_author_after %}

    • @@ -181,7 +221,7 @@

    {SEARCH_TITLE}
    -
    {L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}
    +
    {L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}
    {searchresults.POST_DATE}
    {L_FORUM}{L_COLON} {searchresults.FORUM_TITLE}
    {L_TOPIC}{L_COLON} {searchresults.TOPIC_TITLE}
    @@ -192,8 +232,10 @@

    {SEARCH_TITLE}

    @@ -201,7 +243,7 @@

    {searchresults.POST_SUBJECT}

    @@ -220,7 +262,7 @@

    {searchresults.POST_SUBJECT}

    - + @@ -235,7 +277,7 @@

    {searchresults.POST_SUBJECT}

    - +{% EVENT search_results_jumpbox_before %} diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html index a3b7439c4f8..b5f7894581c 100644 --- a/phpBB/styles/prosilver/template/simple_footer.html +++ b/phpBB/styles/prosilver/template/simple_footer.html @@ -1,8 +1,19 @@ - - - - + + + +{% if S_ALLOW_CDN %} + +{% endif %} - {$SCRIPTS} +{% EVENT simple_footer_body_after %} + diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index d7a6e050e96..d0ab4e77b16 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -17,7 +17,7 @@ (function(d) { var wf = d.createElement('script'), s = d.scripts[0]; - wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js'; + wf.src = 'https://cdn.jsdelivr.net/npm/webfontloader@1.6.28/webfontloader.min.js'; wf.async = true; s.parentNode.insertBefore(wf, s); })(document); @@ -27,10 +27,6 @@ - - - - diff --git a/phpBB/styles/prosilver/template/timezone.js b/phpBB/styles/prosilver/template/timezone.js index 44ec1b0979c..5e6c0942cd9 100644 --- a/phpBB/styles/prosilver/template/timezone.js +++ b/phpBB/styles/prosilver/template/timezone.js @@ -1,20 +1,18 @@ /* global phpbb */ (function($) { // Avoid conflicts with other libraries + 'use strict'; -'use strict'; + $('#tz_date').change(() => { + phpbb.timezoneSwitchDate(false); + }); -$('#tz_date').change(function() { - phpbb.timezoneSwitchDate(false); -}); - -$('#tz_select_date_suggest').click(function(){ - phpbb.timezonePreselectSelect(true); -}); - -$(function () { - phpbb.timezoneEnableDateSelection(); - phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') === 'true'); -}); + $('#tz_select_date_suggest').click(() => { + phpbb.timezonePreselectSelect(true); + }); + $(() => { + phpbb.timezoneEnableDateSelection(); + phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') === 'true'); + }); })(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index 01786d5ef43..0c7be8de74c 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -1,28 +1,16 @@
    -
    - -
    + {% if TIMEZONE_OPTIONS %} +
    + {% set tz_date_data = TIMEZONE_OPTIONS | merge({ options: [{ value: "", label: lang('SELECT_CURRENT_TIME') }] | merge(TIMEZONE_OPTIONS.options) }) %} + {{ FormsSelect(tz_date_data | merge({class: 'autowidth tz_select', id: 'tz_date', name: 'tz_date', group_only: true})) }}
    - + {% endif %}
    - + {% set tz_select_data = TIMEZONE_OPTIONS | merge({ options: [{ value: "", label: lang('SELECT_TIMEZONE') }] | merge(TIMEZONE_OPTIONS.options) }) %} + {{ FormsSelect(tz_select_data | merge({class: 'autowidth tz_select', id: 'timezone'})) }} - + {% INCLUDEJS('timezone.js') %}
    diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html index 57f902df622..94d280a31ad 100644 --- a/phpBB/styles/prosilver/template/ucp_agreement.html +++ b/phpBB/styles/prosilver/template/ucp_agreement.html @@ -2,41 +2,38 @@ - - - +{% if LANG_OPTIONS %}

    - + + {{ FormsSelect(LANG_OPTIONS) }} {S_HIDDEN_FIELDS}

    - + +{% endif %}
    -

    {SITENAME} - {L_REGISTRATION}

    +

    {{ SITENAME }} - {{ lang('REGISTRATION') }}

    -

    {L_COPPA_BIRTHDAY}{L_TERMS_OF_USE}

    +
    {% if S_SHOW_COPPA %}

    {{ lang('COPPA_BIRTHDAY') }}

    {% else %}{{ lang('TERMS_OF_USE') }}{% endif %}
    @@ -46,7 +43,8 @@

    {SITENAME} - {L_REGISTRATION}

    - {L_COPPA_NO}  {L_COPPA_YES} + +   @@ -63,10 +61,8 @@

    {SITENAME} - {L_REGISTRATION}

    -

    {SITENAME} - {AGREEMENT_TITLE}

    -

    {AGREEMENT_TEXT}

    -
    -

    {L_BACK}

    +

    {{ SITENAME }} - {{ AGREEMENT_TITLE }}

    +
    {{ AGREEMENT_TEXT }}
    diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html index c13ef0713a7..2e588da8923 100644 --- a/phpBB/styles/prosilver/template/ucp_attachments.html +++ b/phpBB/styles/prosilver/template/ucp_attachments.html @@ -10,7 +10,7 @@

    {L_TITLE}

    {L_ATTACHMENTS_EXPLAIN}

    -
    +
    -
    +
    {S_FORM_TOKEN}
    -  
    diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html deleted file mode 100644 index 8e175623ac9..00000000000 --- a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html +++ /dev/null @@ -1,11 +0,0 @@ -
    -

    {L_LINK_REMOTE_AVATAR_EXPLAIN}
    -
    -
    -
    -

    {L_LINK_REMOTE_SIZE_EXPLAIN}
    -
    - ×  - -
    -
    diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html index 63a734ea7dd..38bb016de26 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html @@ -1,11 +1,69 @@
    -
    +
    - -
    -

    {L_UPLOAD_AVATAR_URL_EXPLAIN}
    -
    -
    - +{% INCLUDECSS T_ASSETS_PATH ~ '/css/cropper.min.css' %} +{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/cropper.min.js' %} +{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/jquery-cropper.js' %} +{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/hermite.js' %} +{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/phpbb-avatars.js' %} + + + +{% apply spaceless %} +
    +
    + + +
    + +
    + + + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    +
    +{% endapply %} diff --git a/phpBB/styles/prosilver/template/ucp_footer.html b/phpBB/styles/prosilver/template/ucp_footer.html index eb07f52e059..e64dd0a4e9e 100644 --- a/phpBB/styles/prosilver/template/ucp_footer.html +++ b/phpBB/styles/prosilver/template/ucp_footer.html @@ -1,6 +1,6 @@
    - + {% EVENT ucp_footer_content_after %}
    diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index 514f12562a8..c593ea94dc2 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -1,6 +1,6 @@ - style="color:#{GROUP_COLOR};">{L_USERGROUPS} :: {GROUP_NAME} + style="color:#{GROUP_COLOUR};">{L_USERGROUPS} :: {GROUP_NAME} @@ -52,19 +52,21 @@

    {L_GROUP_DETAILS}

    {L_GROUP_SETTINGS_SAVE}

    +

    {L_GROUP_COLOR_EXPLAIN}
        [ {L_COLOUR_SWATCH} ] - +
    +
    @@ -74,7 +76,6 @@

    {L_GROUP_SETTINGS_SAVE}

    {S_HIDDEN_FIELDS} -   {S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html index 9ebb404dd9d..95352e68583 100644 --- a/phpBB/styles/prosilver/template/ucp_header.html +++ b/phpBB/styles/prosilver/template/ucp_header.html @@ -69,11 +69,11 @@

    {L_UCP}

    {L_FRIENDS}
    -
    {friends_online.USERNAME_FULL}
    +
    {% EVENT ucp_header_friends_online_username_full_prepend %}{friends_online.USERNAME_FULL}{% EVENT ucp_header_friends_online_username_full_append %}
    -
    {friends_offline.USERNAME_FULL}
    +
    {% EVENT ucp_header_friends_offline_username_full_prepend %}{friends_offline.USERNAME_FULL}{% EVENT ucp_header_friends_offline_username_full_append %}
    @@ -98,4 +98,6 @@

    {L_UCP}

    + {% EVENT ucp_header_content_before %} +
    diff --git a/phpBB/styles/prosilver/template/ucp_login_link.html b/phpBB/styles/prosilver/template/ucp_login_link.html index 10d2d377ec1..fe2d667b4c5 100644 --- a/phpBB/styles/prosilver/template/ucp_login_link.html +++ b/phpBB/styles/prosilver/template/ucp_login_link.html @@ -32,11 +32,11 @@

    {L_LOGIN}

    {LOGIN_ERROR}
    -
    +
    -
    +
    diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html index d14ae234257..6d0fd6933c7 100644 --- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html +++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html @@ -34,46 +34,66 @@

    {L_TITLE}

    -
    - style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;" title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> - +
    +
    + + {{ Icon('svg', { + 'globe' : topicrow.S_POST_GLOBAL, + 'bullhorn' : topicrow.S_POST_ANNOUNCE, + 'thumbtack' : topicrow.S_POST_STICKY, + 'lock' : topicrow.S_TOPIC_LOCKED, + 'arrow-right-bold' : topicrow.S_TOPIC_MOVED, + 'fire' : topicrow.S_TOPIC_HOT, + 'file-document-outline' : true, + }, '', true, 'c-forum-row-icon') }} + + {% if lang(topicrow.TOPIC_AUTHOR) == S_USERNAME %} + + {% endif%} + {% if topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS %} + + {% endif %}
    - - - {NEW_POST} - - {topicrow.TOPIC_TITLE} + {% if topicrow.S_UNREAD_TOPIC %} + {{ topicrow.TOPIC_TITLE }} + {% else %} + {{ topicrow.TOPIC_TITLE }} + {% endif %} - {L_TOPIC_UNAPPROVED} + {{ Icon('font', 'circle-question', lang('TOPIC_UNAPPROVED'), true, 'fas c-unapproved-icon') }} - {L_TOPIC_REPORTED} + {{ Icon('font', 'triangle-exclamation', lang('TOPIC_REPORTED'), true, 'fas c-topic-reported-icon') }}
    + {% EVENT ucp_main_bookmarks_topic_title_after %}
    - + {{ Icon('font', 'paperclip', '', true) }} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME}
    @@ -81,7 +101,7 @@

    {L_TITLE}

    {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} - {VIEW_LATEST_POST} + {{ Icon('font', 'arrow-up-right-from-square', VIEW_LATEST_POST, true, 'fas c-last-post-icon') }}
    {topicrow.LAST_POST_TIME}
    diff --git a/phpBB/styles/prosilver/template/ucp_main_drafts.html b/phpBB/styles/prosilver/template/ucp_main_drafts.html index 25eb5ce2d1a..2cf99b963c5 100644 --- a/phpBB/styles/prosilver/template/ucp_main_drafts.html +++ b/phpBB/styles/prosilver/template/ucp_main_drafts.html @@ -16,7 +16,7 @@

    {L_TITLE}

    - {S_HIDDEN_FIELDS}  + {S_HIDDEN_FIELDS} {S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index 04b568f6237..1276b387385 100644 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ b/phpBB/styles/prosilver/template/ucp_main_front.html @@ -13,36 +13,56 @@

    {L_IMPORTANT_NEWS}

    diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html index 8d7c6728a77..9600f2fa8eb 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html +++ b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html @@ -50,7 +50,7 @@

    {L_TITLE}

    - {S_HIDDEN_FIELDS}  + {S_HIDDEN_FIELDS} {S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/ucp_profile_signature.html b/phpBB/styles/prosilver/template/ucp_profile_signature.html index 41bd3ee2c67..6825598a6f4 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_signature.html +++ b/phpBB/styles/prosilver/template/ucp_profile_signature.html @@ -24,6 +24,7 @@

    {L_SIGNATURE_PREVIEW}

    {L_OPTIONS}

    + {% EVENT ucp_profile_signature_posting_editor_options_prepend %}
    @@ -41,7 +42,6 @@

    {L_OPTIONS}

    {S_HIDDEN_FIELDS} -     {S_FORM_TOKEN} diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 0b9897abf6b..73cfa836dfa 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -1,7 +1,6 @@ - +{% if PROVIDER_TEMPLATE_FILE %} +
    +
    + +

    {{ SITENAME }} - {{ lang('OAUTH_REGISTRATION') }}

    + + {% include PROVIDER_TEMPLATE_FILE %} +
    +
    +{% endif %} +
    @@ -29,35 +38,47 @@

    {SITENAME} - {L_REGISTRATION}


    {L_USERNAME_EXPLAIN}
    -
    -
    -
    -
    -
    +

    {L_PASSWORD_EXPLAIN}
    -
    +
    -
    +
    +
    +
    +
    +
    + {% if LANG_OPTIONS %}
    -
    -
    +
    +
    + {{ FormsSelect(LANG_OPTIONS) }} +
    + + {% endif %} - -
    {L_ITEMS_REQUIRED}
    + {% if PROFILE_FIELDS_REQUIRED %}
    {L_ITEMS_REQUIRED}
    {% endif %}
    @@ -67,7 +88,6 @@

    {SITENAME} - {L_REGISTRATION}

    {profile_fields.FIELD}
    -
    @@ -96,7 +116,6 @@

    {L_COPPA_COMPLIANCE}

    {S_HIDDEN_FIELDS} -   {S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html deleted file mode 100644 index 57d5d5a2604..00000000000 --- a/phpBB/styles/prosilver/template/ucp_remind.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - -
    -
    - -
    -

    {L_SEND_PASSWORD}

    - -
    -
    -
    -
    -
    -
    -

    {L_EMAIL_REMIND}
    -
    -
    -
    -
     
    -
    {S_HIDDEN_FIELDS} 
    -
    - {S_FORM_TOKEN} -
    -
    - -
    -
    - - - diff --git a/phpBB/styles/prosilver/template/ucp_resend.html b/phpBB/styles/prosilver/template/ucp_resend.html index 48827d811bb..5909e0b8505 100644 --- a/phpBB/styles/prosilver/template/ucp_resend.html +++ b/phpBB/styles/prosilver/template/ucp_resend.html @@ -20,7 +20,7 @@

    {L_UCP_RESEND}

     
    -
    {S_HIDDEN_FIELDS}{S_FORM_TOKEN} 
    +
    {S_HIDDEN_FIELDS}{S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/ucp_reset_password.html b/phpBB/styles/prosilver/template/ucp_reset_password.html new file mode 100644 index 00000000000..5a9a0a3ab89 --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_reset_password.html @@ -0,0 +1,49 @@ + + +
    + +
    +
    + +
    +

    {{ lang('RESET_PASSWORD') }}

    + +
    + {% if S_IS_PASSWORD_RESET %} + {% if PASSWORD_RESET_ERRORS %}

    {{ PASSWORD_RESET_ERRORS | join('
    ') }}

    {% endif %} +
    +

    {{ lang('CHANGE_PASSWORD_EXPLAIN') }}
    +
    +
    +
    +
    +
    +
    + {% else %} + {% if USERNAME_REQUIRED %} +

    {{ lang('EMAIL_NOT_UNIQUE') }}

    + {% endif %} +
    +

    {{ lang('EMAIL_REMIND') }}
    +
    +
    + {% if USERNAME_REQUIRED %} +
    +
    +
    +
    + {% endif %} + {% endif %} +
    +
     
    +
    {{ S_HIDDEN_FIELDS }}
    +
    + {{ S_FORM_TOKEN }} +
    +
    + +
    +
    +
    + + diff --git a/phpBB/styles/prosilver/template/ucp_zebra_foes.html b/phpBB/styles/prosilver/template/ucp_zebra_foes.html index efd7a0613d8..0c726ec887e 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_foes.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_foes.html @@ -32,7 +32,7 @@

    {L_TITLE}

    - {S_HIDDEN_FIELDS}  + {S_HIDDEN_FIELDS} {S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/ucp_zebra_friends.html b/phpBB/styles/prosilver/template/ucp_zebra_friends.html index 1478fb9546f..14fb46cbcc3 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_friends.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_friends.html @@ -34,7 +34,7 @@

    {L_TITLE}

    - {S_HIDDEN_FIELDS}  + {S_HIDDEN_FIELDS} {S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 2113c6d7c5f..63750e32186 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -42,9 +42,9 @@

    - {L_BUTTON_FORUM_LOCKED} + {L_BUTTON_FORUM_LOCKED} {{ Icon('font', 'lock', '', true, 'fas c-button-icon') }} - {L_BUTTON_NEW_TOPIC} + {L_BUTTON_NEW_TOPIC} {{ Icon('font', 'pencil', '', true, 'fas c-button-icon') }} @@ -56,10 +56,10 @@

    - - {L_SEARCH_ADV} + + {{ Icon('font', 'gear', lang('SEARCH_ADV'), true, 'fas c-button-icon') }} {S_SEARCH_LOCAL_HIDDEN_FIELDS}

    @@ -101,12 +101,12 @@

    {L_LOGIN_LOGOUT}
    +
    +
    @@ -114,6 +114,7 @@

    {L_LOGIN_LOGOUT}
  • -
    - style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;" title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> - +
    +
    + {% if topicrow.U_NEWEST_POST and topicrow.S_UNREAD_TOPIC and not S_IS_BOT %} + {% set U_ITEM_LINK = topicrow.U_NEWEST_POST %} + {% elseif topicrow.U_VIEW_TOPIC %} + {% set U_ITEM_LINK = topicrow.U_VIEW_TOPIC %} + {% endif %} + {% if U_ITEM_LINK is defined %} + + {{ Icon('svg', { + 'globe' : topicrow.S_POST_GLOBAL, + 'bullhorn' : topicrow.S_POST_ANNOUNCE, + 'thumbtack' : topicrow.S_POST_STICKY, + 'lock' : topicrow.S_TOPIC_LOCKED, + 'arrow-right-bold' : topicrow.S_TOPIC_MOVED, + 'fire' : topicrow.S_TOPIC_HOT, + 'file-document-outline' : true, + }, '', true, 'c-forum-row-icon') }} + + {% else %} + + {{ Icon('svg', { + 'globe' : topicrow.S_POST_GLOBAL, + 'bullhorn' : topicrow.S_POST_ANNOUNCE, + 'thumbtack' : topicrow.S_POST_STICKY, + 'lock' : topicrow.S_TOPIC_LOCKED, + 'arrow-right-bold' : topicrow.S_TOPIC_MOVED, + 'fire' : topicrow.S_TOPIC_HOT, + 'file-document-outline' : true, + }, '', true, 'c-forum-row-icon') }} + + {% endif %} + {% if lang(topicrow.TOPIC_AUTHOR) == S_USERNAME %} + + {% endif%} + {% if topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS %} + + {% endif %}
    - - - {NEW_POST} - - - {topicrow.TOPIC_TITLE}{topicrow.TOPIC_TITLE} + {% if topicrow.U_NEWEST_POST and topicrow.S_UNREAD_TOPIC and not S_IS_BOT %} + {{ topicrow.TOPIC_TITLE }} + {% elseif topicrow.U_VIEW_TOPIC %} + {{ topicrow.TOPIC_TITLE }} + {% else %} + {{ topicrow.TOPIC_TITLE }} + {% endif %} - {L_TOPIC_UNAPPROVED}{L_POSTS_UNAPPROVED} + {{ Icon('font', 'circle-question', '', true, 'fas c-unapproved-icon o-icon-baseline') }}{L_TOPIC_UNAPPROVED}{L_POSTS_UNAPPROVED} - {L_TOPIC_DELETED} + {{ Icon('font', 'recycle', lang('TOPIC_DELETED'), true, 'fas c-topic-deleted-icon o-icon-baseline') }} - {L_TOPIC_REPORTED} + {{ Icon('font', 'triangle-exclamation', lang('TOPIC_REPORTED'), true, 'fas c-topic-reported-icon o-icon-baseline') }}
    @@ -186,7 +223,7 @@

    {L_LOGIN_LOGOUT} @@ -195,24 +232,29 @@

    {L_LOGIN_LOGOUT}
    - - - {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} + {{ Icon('font', 'chart-bar', '', true) }} + {{ Icon('font', 'paperclip', '', true) }} + {% EVENT topiclist_row_topic_by_author_before %} + {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » + {% EVENT topiclist_row_topic_by_author_after %} » {L_IN} {topicrow.FORUM_NAME}
    @@ -223,13 +265,13 @@

    {L_LOGIN_LOGOUT}{topicrow.LAST_POST_AUTHOR_FULL} - {VIEW_LATEST_POST} + {{ Icon('font', 'arrow-up-right-from-square', VIEW_LATEST_POST, true, 'fas c-last-post-icon') }} -
    {topicrow.LAST_POST_TIME} +

    @@ -247,7 +289,7 @@

    {L_LOGIN_LOGOUT}
    - {L_NO_TOPICS} + {{ lang(S_SORT_DAYS ? 'NO_TOPICS_TIME_FRAME' : 'NO_TOPICS') }}
    @@ -266,9 +308,9 @@

    {L_LOGIN_LOGOUT}{L_FORUM_LOCKED}{L_POST_TOPIC}"> - {L_BUTTON_FORUM_LOCKED} + {L_BUTTON_FORUM_LOCKED} {{ Icon('font', 'lock', '', true, 'fas c-button-icon') }} - {L_BUTTON_NEW_TOPIC} + {L_BUTTON_NEW_TOPIC} {{ Icon('font', 'pencil', '', true, 'fas c-button-icon') }} @@ -295,6 +337,8 @@

    {L_LOGIN_LOGOUT} +{% EVENT viewforum_body_online_list_before %} +

    {L_WHO_IS_ONLINE}

    @@ -302,7 +346,7 @@

    {L_WHO_IS_ONLINE}

    - +

    {L_FORUM_PERMISSIONS}

    {rules.RULE}

    diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index dd0ca72502a..acbfb71ba55 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -29,7 +29,7 @@

    {TOTAL_REGISTERED_USERS_ONLINE}

    - {user_row.USERNAME_FULL} {L_IP}{L_COLON} {user_row.USER_IP} » {L_WHOIS} + {user_row.USERNAME_FULL} {L_IP}{L_COLON} {user_row.USER_IP} » {L_WHOIS}
    {user_row.USER_BROWSER} {user_row.FORUM_LOCATION} {user_row.LASTUPDATE} @@ -47,7 +47,22 @@

    {TOTAL_REGISTERED_USERS_ONLINE}

    -

    {L_LEGEND}{L_COLON} {LEGEND}

    +{% if LEGEND|length > 0 %} + {% apply spaceless %} +

    + + {{ lang('LEGEND') ~ lang('COLON') }} + {% for group in LEGEND %} + {% if group.GROUP_URL %} + {{ group.GROUP_NAME }}{% if not loop.last %}, {% endif %} + {% else %} + {{ group.GROUP_NAME }}{% if not loop.last %}, {% endif %} + {% endif %} + {% endfor %} + +

    + {% endapply %} +{% endif %}

    • @@ -77,7 +77,7 @@

    +
    @@ -140,21 +140,22 @@

    {POLL_
    style="display: none;"> -
    +
    - - {postrow.POSTER_AVATAR}{postrow.POSTER_AVATAR} - + {% include 'avatar.html' with { + 'avatar_data': postrow.POSTER_AVATAR, + 'avatar_link': postrow.U_POST_AUTHOR + } only %}
    - {postrow.POST_AUTHOR_FULL}{postrow.POST_AUTHOR_FULL} {L_ONLINE} + {postrow.POST_AUTHOR_FULL}{postrow.POST_AUTHOR_FULL} {{ Icon('font', 'circle', lang('ONLINE'), true, 'fas c-online-icon') }}
    -
    {postrow.RANK_TITLE}
    {postrow.RANK_IMG}
    + {% if postrow.RANK_IMG or postrow.RANK_TITLE %}
    {{ postrow.RANK_TITLE }}{% if postrow.RANK_IMG and postrow.RANK_TITLE %}
    {% endif %}{{ postrow.RANK_IMG }}
    {% endif %}
    {L_POSTS}{L_COLON} {postrow.POSTER_POSTS}
    @@ -180,7 +181,7 @@

    {POLL_ {L_CONTACT}{L_COLON}
    - {postrow.CONTACT_USER} + {{ Icon('font', 'comment-dots', postrow.CONTACT_USER, true, 'far') }}
    @@ -191,8 +192,26 @@

    {POLL_
    - class="last-cell" onclick="popup(this.href, 750, 320); return false;"> - {postrow.contact.NAME} + class="last-cell"> + {% EVENT viewtopic_body_contact_icon_prepend %} + {% if postrow.contact.ID == 'pm' %} + {{ Icon('font', 'message', '', true, 'far contact-icon') }} + {% elseif postrow.contact.ID == 'email' %} + {{ Icon('font', 'at', '', true, 'fas contact-icon') }} + {% elseif postrow.contact.ID == 'phpbb_website' %} + {{ Icon('font', 'earth-americas', '', true, 'fas contact-icon') }} + {% elseif postrow.contact.ID == 'phpbb_facebook' %} + {{ Icon('font', 'square-facebook', '', true, 'fab contact-icon c-facebook-icon') }} + {% elseif postrow.contact.ID == 'phpbb_twitter' %} + {{ Icon('font', 'square-x-twitter', '', true, 'fab contact-icon c-twitter-icon') }} + {% elseif postrow.contact.ID == 'phpbb_skype' %} + {{ Icon('font', 'skype', '', true, 'fab contact-icon c-skype-icon') }} + {% elseif postrow.contact.ID == 'phpbb_youtube' %} + {{ Icon('font', 'youtube', '', true, 'fab contact-icon c-youtube-icon') }} + {% else %} + {{ Icon('svg', contact.ID, '', true, 'contact-icon') }} + {% endif %} + {% EVENT viewtopic_body_contact_icon_append %}
    @@ -211,70 +230,98 @@

    {POLL_
    - {postrow.L_POST_DELETED_MESSAGE}
    - {postrow.L_POST_DISPLAY} + {postrow.L_POST_DELETED_MESSAGE}
    + {{ lang('POST_DISPLAY') }}
    - {postrow.L_IGNORE_POST}
    - {postrow.L_POST_DISPLAY} + {postrow.L_IGNORE_POST}
    + {{ lang('POST_DISPLAY') }}
    style="display: none;"> -

    class="first">{postrow.POST_ICON_IMG_ALT} {postrow.POST_SUBJECT}

    +

    + {% if postrow.POST_ICON_IMG %} + {{ postrow.POST_ICON_IMG_ALT }} + {% endif %} + {{ postrow.POST_SUBJECT }} +

    @@ -282,21 +329,22 @@

    class="first">

    - - {postrow.MINI_POST} - - - {postrow.MINI_POST} - - - {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_DATE} + + {% if postrow.S_UNREAD_POST %} + {{ Icon('font', 'file', postrow.MINI_POST, true, 'fas c-topic-unread-icon') }} + {% else %} + {{ Icon('font', 'file', postrow.MINI_POST, true, 'fas c-topic-icon') }} + {% endif %} + + {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} »

    +

    - + {{ Icon('font', 'circle-question', '', true, 'fas c-unapproved-icon') }} {L_POST_UNAPPROVED_ACTION} @@ -304,6 +352,12 @@

    class="first"> +

    + {{ Icon('font', 'triangle-exclamation', '', true, 'fas c-topic-reported-icon') }} + {L_POST_UNAPPROVED_EXPLAIN} +

    +

    @@ -320,12 +374,16 @@

    class="first">

    - {L_POST_REPORTED} + {{ Icon('font', 'triangle-exclamation', '', true, 'fas c-topic-reported-icon') }}{L_POST_REPORTED}

    + {% EVENT viewtopic_body_postrow_content_before %} +
    {postrow.MESSAGE}
    + +
    @@ -353,7 +411,10 @@

    class="first">


    {postrow.BUMPED_MESSAGE}
    -
    {postrow.SIGNATURE}
    + + {% EVENT viewtopic_body_postrow_signature_before %} + {% if postrow.SIGNATURE %}
    {{ postrow.SIGNATURE }}
    {% endif %} + {% EVENT viewtopic_body_postrow_signature_after %}

    @@ -363,10 +424,6 @@

    class="first">
    - - - {L_BACK_TO_TOP} -
    @@ -389,9 +446,9 @@

    class="first"> - {L_BUTTON_TOPIC_LOCKED} + {L_BUTTON_TOPIC_LOCKED} {{ Icon('font', 'lock', '', true, 'fas c-button-icon') }} - {L_BUTTON_POST_REPLY} + {L_BUTTON_POST_REPLY} {{ Icon('font', 'reply', '', true, 'fas c-button-icon') }} @@ -408,8 +465,8 @@

    class="first">
    - {L_QUICK_MOD} - + {{ Icon('font', 'gavel', lang('QUICK_MOD'), true, 'fas c-button-icon') }} + {{ Icon('font', 'caret-down', '', true, 'fas c-button-icon') }}
    @@ -437,9 +494,17 @@

    class="first">

    +
    + + {{ Icon('font', 'chevron-up', '', false) }} + +
    + +{% EVENT viewtopic_body_online_list_before %} +

    {L_WHO_IS_ONLINE}

    @@ -447,4 +512,6 @@

    {L_WHO_IS_ONLINE}

    +{% EVENT viewtopic_body_online_list_after %} + diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index b504949053a..eb056480d9c 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -8,7 +8,9 @@ {SITENAME} • {PAGE_TITLE} - +{% if S_CONTENT_DIRECTION eq 'rtl' %} + +{% endif %} @@ -38,7 +40,14 @@

    {postrow.POST_SUBJECT}

    {S_TIMEZONE}
    {PAGE_NUMBER}
    -
    Powered by phpBB® Forum Software © phpBB Limited
    https://www.phpbb.com/
    +
    +

    {{ CREDIT_LINE }} +

    + {% if TRANSLATION_INFO %} +

    {{ TRANSLATION_INFO }} +

    + {% endif %} +
    diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index 272a434f6a2..1e665bd4b9b 100644 --- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -1,45 +1,52 @@
    - - + {{ Icon('font', 'wrench', '', true, 'fas c-button-icon') }} + {{ Icon('font', 'caret-down', '', true, 'fas c-button-icon') }}
      - + {% if U_WATCH_TOPIC %}
    • - - {S_WATCH_TOPIC_TITLE} + + {% if S_WATCHING_TOPIC %} + {{ Icon('font', 'bell', '', true, 'far c-watch-icon is-active') }} + {{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon') }} + {% else %} + {{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon is-active') }} + {{ Icon('font', 'bell', '', true, 'far c-watch-icon') }} + {% endif %} + {S_WATCH_TOPIC_TITLE}
      • - + {% endif %}
    • - {S_BOOKMARK_TOPIC} + {{ Icon('font', 'bookmark', S_BOOKMARK_TOPIC, false, 'far') }}
    • - {L_BUMP_TOPIC} + {{ Icon('font', 'turn-up', lang('BUMP_TOPIC'), false) }}
    • - {L_EMAIL_TOPIC} + {{ Icon('font', 'envelope', lang('EMAIL_TOPIC'), false, 'far') }}
    • - {L_PRINT_TOPIC} + {{ Icon('font', 'print', lang('PRINT_TOPIC'), false) }}
      • diff --git a/phpBB/styles/prosilver/theme/base.css b/phpBB/styles/prosilver/theme/base.css index f4daeee1e50..42a1aef5564 100644 --- a/phpBB/styles/prosilver/theme/base.css +++ b/phpBB/styles/prosilver/theme/base.css @@ -21,9 +21,26 @@ * line-heights want to be a multiple of this number in order to maintain * vertical rhythm.) */ +:root { + /* Base font size */ + --ps-font-base: 16px; /* [1] */ + --ps-line-height: 1.5rem; /* [2] */ + + /* Headings */ + --ps-font-h1: 1.5rem; /* 24px */ + --ps-font-h2: 1.5rem; /* 24px */ + --ps-font-h3: 1.25rem; /* 20px */ + --ps-font-h4: 1.125rem; /* 18px */ + + /* Text and Paragraphs */ + --ps-font-normal: 1rem; /* 16px */ + --ps-font-small: 0.875rem; /* 14px */ + --ps-font-tiny: 0.75rem; /* 12px */ +} + html { - font-size: 16px; /* [1] */ - line-height: 1.5; /* [2] */ + font-size: var(--ps-font-base); + line-height: var(--ps-line-height); -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index bcf271b0c82..cad38b96089 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -143,6 +143,12 @@ margin-left: 5px; } +.rtl .notification-block .avatar-placeholder, +.rtl .notification-list .topiclist .notification-item .avatar-placeholder, +.rtl .notification-list .topiclist .notification-item .avatar { + float: right; +} + .rtl .notification-menu .notifications { margin-right: 50px; margin-left: 0; @@ -163,6 +169,12 @@ float: right; } +.rtl .breadcrumbs .crumb:before { + font-weight: bold; + padding: 0 0.5em; + content: "\2039"; +} + /* Table styles ---------------------------------------- */ .rtl table.table1 thead th { @@ -365,6 +377,24 @@ float: left; } +/** +* mentions.css +*/ + +/* Mention block +---------------------------------------- */ + +/* Mention dropdown +---------------------------------------- */ +.rtl .mention-container { /* mention-container */ + text-align: right; +} + +.rtl .mention-media { + margin-right: 0; + margin-left: 16px; +} + /** * content.css */ @@ -488,7 +518,7 @@ .rtl .postbody, .rtl .postbody h3 { - float: right; + float: right !important; } .rtl .has-profile .postbody h3 { @@ -617,8 +647,6 @@ .rtl .postprofile { border-width: 0 1px 0 0; float: left; - - /* text-align: right; */ } .rtl .pm .postprofile { @@ -634,7 +662,7 @@ } .rtl .postprofile .avatar { - float: right; + float: left; } .rtl dl.pmlist dd { diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 77325f3d32f..b0991d054c5 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -4,7 +4,7 @@ .button { font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; - font-size: 13px; + font-size: var(--ps-font-normal); font-weight: 600; line-height: 1.4; text-align: center; @@ -12,7 +12,11 @@ white-space: nowrap; border: 1px solid transparent; border-radius: 4px; - display: inline-block; + display: inline-flex; + justify-content: center; + align-items: center; + box-sizing: border-box; + height: calc(var(--ps-font-normal) * 1.875); padding: 2px 8px; cursor: pointer; touch-action: manipulation; @@ -28,6 +32,20 @@ outline: none; } +.button[disabled], +.button[disabled]:hover, +.button.disabled, +.button.disabled:hover { + background: #eeeeee; + border-color: #aaaaaa; + color: #aaaaaa; + cursor: default; +} + +.button.hidden { + display: none; +} + .caret { border-left: 1px solid; position: relative; @@ -38,6 +56,29 @@ vertical-align: top; } +/** Button groups */ +.button-group { + display: inline-block; +} + +.button-group + .button-group { + margin-left: 8px; +} + +.button-group > .button:first-child { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.button-group > .button:last-child { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +.button-group > .button:not(:first-child):not(:last-child) { + border-radius: 0; +} + /* Posting page styles ---------------------------------------- */ .button-form, @@ -87,13 +128,6 @@ padding: 0; } -.contact-icon { - background-repeat: no-repeat; - display: block; - width: 16px; - height: 16px; -} - .contact-icons a { border-right: 1px dotted; border-bottom: 1px dotted; @@ -144,64 +178,51 @@ margin-right: 10px; } -.post-buttons .button span { - font-size: 0; +.post-buttons-label, +.post-buttons-responsive-menu { + display: none; } /* Responsive buttons in post body */ .post-buttons .dropdown { - top: 18px; + top: calc(var(--ps-font-normal) * 1.875); } .post-buttons .dropdown a { - font-size: 13px; + font-size: var(--ps-font-normal); text-align: right; display: block; + justify-content: start; } .hasjs .postbody .post-buttons { max-width: 40%; } +/* Format buttons +--------------------------------------------- */ +.format-buttons .button { + margin-bottom: 3px; +} + /* Browser-specific tweaks */ button::-moz-focus-inner { border: 0; padding: 0; } -/* Deprecated as of version 3.2 -------------------------------------------------- */ -.small-icon { - background-image: none; - background-repeat: no-repeat; - background-position: 0 50%; -} - -.dropdown .small-icon { - background-position: 5px 50%; - padding: 5px; -} - -.small-icon > a { - padding: 0 0 0 18px; -} - - -/* stylelint-disable selector-no-qualifying-type */ -ul.linklist.bulletin > li.small-icon:before { +/* UCP: Avatar cropper */ +.avatar-cropper-buttons { + text-align: center; display: none; } -/* stylelint-enable selector-no-qualifying-type */ -.dropdown .small-icon > a { - display: block; -} - -.rtl .small-icon { - background-position: 100% 50%; +.avatar-cropper-buttons > .button-group { + margin: 4px; } -.rtl .small-icon > a { - padding-right: 19px; - padding-left: 0; +/* Notification buttons +--------------------------------------------- */ +.notification-subscribe-toggle:disabled { + opacity: 0.7; } diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 2788295b680..711963f54ff 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -83,6 +83,15 @@ th a:hover { color: #9e9e9e; } +.to-top-button { + background-color: #0f4d8a; + opacity: 0.7; +} + +.to-top-button a { + color: #e6f7ff; +} + /* arrow links */ .arrow-left:hover, .arrow-right:hover { @@ -90,22 +99,19 @@ th a:hover { } /* round cornered boxes and backgrounds */ -.headerbar { - color: #ffffff; +.headerbar, +.headerbar h1 { + color: #eaf8ff; } .headerbar, .forumbg { - background-color: #13a4ec; - background-image: -webkit-gradient(linear, left top, left bottom, from(#80d5ff), color-stop(0.1%, #0077b3), color-stop(30%, #13a4ec), to(#13a4ec)); - background-image: linear-gradient(to bottom, #80d5ff 0%, #0077b3 0.1%, #13a4ec 30%, #13a4ec 100%); + background-color: #4688ce; background-repeat: repeat-x; } .forabg { - background-color: #0077b3; - background-image: -webkit-gradient(linear, left top, left bottom, from(#80d5ff), color-stop(0.1%, #13a4ec), color-stop(30%, #0077b3), to(#0077b3)); - background-image: linear-gradient(to bottom, #80d5ff 0%, #13a4ec 0.1%, #0077b3 30%, #0077b3 100%); + background-color: #4688ce; background-repeat: repeat-x; } @@ -113,6 +119,18 @@ th a:hover { background-color: #c9dee8; } +.headerbar .navbar a { + color: #eaf8ff; +} + +.headerbar .navbar .dropdown a { + color: #0f4d8a; +} + +.header-profile { + text-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.5); +} + .panel { background-color: #f0f3f5; color: #29303d; @@ -122,6 +140,7 @@ th a:hover { color: #000000; } +.post h3 a.first-unread, .post:target h3 a { color: #000000; } @@ -196,54 +215,115 @@ dl.details dd { } /* icon styles */ -.icon.icon-blue, -a:hover .icon.icon-blue { +.icon.icon-blue, /* DEPRECATED 4.0 */ +a:hover .icon.icon-blue, /* DEPRECATED 4.0 */ +.read, +.c-unapproved-icon { color: #0059b3; } -.icon.online { +.icon.online, /* DEPRECATED 4.0 */ +.c-online-icon { color: #85de39; } -.icon.icon-green, -a:hover .icon.icon-green { +.icon.icon-green, /* DEPRECATED 4.0 */ +a:hover .icon.icon-green, /* DEPRECATED 4.0 */ +.c-topic-deleted-icon, +.c-approved-icon { color: #4db355; } -.icon.icon-red, -a:hover .icon.icon-red { +.icon.icon-red, /* DEPRECATED 4.0 */ +a:hover .icon.icon-red, /* DEPRECATED 4.0 */ +.c-topic-reported-icon, +.c-topic-unread-icon, +.c-warning-icon { color: #d41142; } -.icon.icon-orange, -a:hover .icon.icon-orange { +.icon.icon-orange, /* DEPRECATED 4.0 */ +a:hover .icon.icon-orange, /* DEPRECATED 4.0 */ +.c-forum-feed-icon { color: #ff9500; } -.icon.icon-bluegray, +.icon.icon-bluegray, /* DEPRECATED 4.0 */ a:hover .icon.icon-bluegray { color: #47536b; } -.icon.icon-gray, -a:hover .icon.icon-gray { +.icon.icon-gray, /* DEPRECATED 4.0 */ +a:hover .icon.icon-gray, /* DEPRECATED 4.0 */ +.c-top-icon { color: #757575; } -.icon.icon-lightgray, -a:hover .icon.icon-lightgray { +.icon.icon-lightgray, /* DEPRECATED 4.0 */ +a:hover .icon.icon-lightgray, /* DEPRECATED 4.0 */ +.c-last-post-icon, +.c-topic-icon, +.c-pagination-icon { color: #9e9e9e; } -.icon.icon-black, -a:hover .icon.icon-black { +.icon.icon-black, /* DEPRECATED 4.0 */ +a:hover .icon.icon-black, /* DEPRECATED 4.0 */ +.c-return-arrow-icon { color: #212121; } -.alert_close .icon:before { +.button:hover .c-pagination-icon { + color: #ffffff; +} + +.alert_close .icon:before, /* DEPRECATED 4.0 */ +.alert_close .o-icon:before { background-color: #ffffff; } +.row-item-link { + background-color: #0059b3; +} + +.row-item-link.unread { + background-color: #d41142; +} + +.c-forum-row-icon, +.c-forum-row-icon:hover { + color: #ffffff; +} + +/* brand icon colors */ +.c-facebook-icon { + color: #3b5998; +} + +.c-twitter-icon { + color: #000000; +} + +.c-skype-icon { + color: #00aff0; +} + +.c-youtube-icon { + color: #ff0000; +} + +.c-colorless-icon { + color: inherit; +} + +.push-subscribe-toggle-icon.toggle-on { + color: #0059b3; +} + +.push-subscribe-toggle-icon.toggle-off { + color: #9e9e9e; +} + /* jumpbox */ .jumpbox .dropdown li { border-top-color: #dedede; @@ -314,11 +394,44 @@ p.post-notice { background-image: none; } +/* colours and backgrounds for mentions.css */ + +/* mention dropdown */ +.mention-container { /* mention-container */ + background-color: #ffffff; + box-shadow: + 0 3px 1px -2px rgba(0, 0, 0, 0.2), + 0 2px 2px 0 rgba(0, 0, 0, 0.14), + 0 1px 5px 0 rgba(0, 0, 0, 0.12); +} + +.mention-media { + color: #757575; +} + +.mention-item { + border-bottom-color: #dddddd; + color: #212121; +} + +.mention-item:hover, +.mention-item.is-active { + background-color: #eeeeee; + color: #2d80d2; +} + +.mention-item:hover .mention-media-avatar, +.mention-item.is-active .mention-media-avatar { + color: #2d80d2; +} + +.mention-rank { + color: #757575; +} + /* colours and backgrounds for content.css */ ul.forums { - background-color: #edf4f7; - background-image: -webkit-gradient(linear, left top, left bottom, from(#b8d3e0), to(#edf4f7)); - background-image: linear-gradient(to bottom, #b8d3e0 0%, #edf4f7 100%); + background-color: #d2e4ec; } ul.topiclist > li { @@ -344,7 +457,7 @@ li.row strong { } li.row:hover { - background-color: #fffbcc; + background-color: #cde9f5; } li.row:hover dd { @@ -609,7 +722,8 @@ dd.profile-warnings { } .button .icon, -.button-secondary { +.button-secondary, +.c-button-icon { color: #9e9e9e; } @@ -638,7 +752,8 @@ dd.profile-warnings { .button-secondary:focus, .button-secondary:hover, .button:focus .icon, -.button:hover .icon { +.button:hover .icon, +.button:hover .c-button-icon { color: #0077b3; } @@ -683,6 +798,7 @@ dd.profile-warnings { .pagination li a:hover, .pagination li a:hover .icon, +.pagination li a:hover .o-icon, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger { background: #2d80d2; @@ -703,77 +819,17 @@ dd.profile-warnings { box-shadow: 0 0 10px #0077b3; } +.search-results li:hover, +.search-results li.active { + background-color: #cfe1f6; +} + /* icon images */ -.site_logo { background-image: url("./images/site_logo.gif"); } -.contact-icon { background-image: url("./images/icons_contact.png"); } - -/* profile icons */ -.pm-icon { background-position: 0 0; } -.email-icon { background-position: -21px 0; } -.jabber-icon { background-position: -80px 0; } -.phpbb_icq-icon { background-position: -61px 0; } -.phpbb_wlm-icon { background-position: -182px 0; } -.phpbb_aol-icon { background-position: -244px 0; } -.phpbb_website-icon { background-position: -40px 0; } -.phpbb_youtube-icon { background-position: -98px 0; } -.phpbb_facebook-icon { background-position: -119px 0; } -.phpbb_googleplus-icon { background-position: -140px 0; } -.phpbb_skype-icon { background-position: -161px 0; } -.phpbb_twitter-icon { background-position: -203px 0; } -.phpbb_yahoo-icon { background-position: -224px 0; } - -/* forum icons & topic icons */ -.global_read { background-image: url("./images/announce_read.gif"); } -.global_read_mine { background-image: url("./images/announce_read_mine.gif"); } -.global_read_locked { background-image: url("./images/announce_read_locked.gif"); } -.global_read_locked_mine { background-image: url("./images/announce_read_locked_mine.gif"); } -.global_unread { background-image: url("./images/announce_unread.gif"); } -.global_unread_mine { background-image: url("./images/announce_unread_mine.gif"); } -.global_unread_locked { background-image: url("./images/announce_unread_locked.gif"); } -.global_unread_locked_mine { background-image: url("./images/announce_unread_locked_mine.gif"); } - -.announce_read { background-image: url("./images/announce_read.gif"); } -.announce_read_mine { background-image: url("./images/announce_read_mine.gif"); } -.announce_read_locked { background-image: url("./images/announce_read_locked.gif"); } -.announce_read_locked_mine { background-image: url("./images/announce_read_locked_mine.gif"); } -.announce_unread { background-image: url("./images/announce_unread.gif"); } -.announce_unread_mine { background-image: url("./images/announce_unread_mine.gif"); } -.announce_unread_locked { background-image: url("./images/announce_unread_locked.gif"); } -.announce_unread_locked_mine { background-image: url("./images/announce_unread_locked_mine.gif"); } - -.forum_link { background-image: url("./images/forum_link.gif"); } -.forum_read { background-image: url("./images/forum_read.gif"); } -.forum_read_locked { background-image: url("./images/forum_read_locked.gif"); } -.forum_read_subforum { background-image: url("./images/forum_read_subforum.gif"); } -.forum_unread { background-image: url("./images/forum_unread.gif"); } -.forum_unread_locked { background-image: url("./images/forum_unread_locked.gif"); } -.forum_unread_subforum { background-image: url("./images/forum_unread_subforum.gif"); } - -.sticky_read { background-image: url("./images/sticky_read.gif"); } -.sticky_read_mine { background-image: url("./images/sticky_read_mine.gif"); } -.sticky_read_locked { background-image: url("./images/sticky_read_locked.gif"); } -.sticky_read_locked_mine { background-image: url("./images/sticky_read_locked_mine.gif"); } -.sticky_unread { background-image: url("./images/sticky_unread.gif"); } -.sticky_unread_mine { background-image: url("./images/sticky_unread_mine.gif"); } -.sticky_unread_locked { background-image: url("./images/sticky_unread_locked.gif"); } -.sticky_unread_locked_mine { background-image: url("./images/sticky_unread_locked_mine.gif"); } - -.pm_read, -.topic_read { background-image: url("./images/topic_read.gif"); } -.topic_moved { background-image: url("./images/topic_moved.gif"); } -.topic_read_mine { background-image: url("./images/topic_read_mine.gif"); } -.topic_read_hot { background-image: url("./images/topic_read_hot.gif"); } -.topic_read_hot_mine { background-image: url("./images/topic_read_hot_mine.gif"); } -.topic_read_locked { background-image: url("./images/topic_read_locked.gif"); } -.topic_read_locked_mine { background-image: url("./images/topic_read_locked_mine.gif"); } - -.pm_unread, -.topic_unread { background-image: url("./images/topic_unread.gif"); } -.topic_unread_mine { background-image: url("./images/topic_unread_mine.gif"); } -.topic_unread_hot { background-image: url("./images/topic_unread_hot.gif"); } -.topic_unread_hot_mine { background-image: url("./images/topic_unread_hot_mine.gif"); } -.topic_unread_locked { background-image: url("./images/topic_unread_locked.gif"); } -.topic_unread_locked_mine { background-image: url("./images/topic_unread_locked_mine.gif"); } +.site_logo { background-image: url("./images/site_logo.svg"); } + +.c-hero-logo-img g { + fill: #eaf8ff; +} /* colours and backgrounds for cp.css */ @@ -826,11 +882,7 @@ ul.cplist { .tabs .activetab > a, .tabs .activetab > a:hover { background-color: #c9dee8; - background-image: -webkit-gradient(linear, left top, left bottom, from(#e6f7ff), to(#c9dee8)); - background-image: linear-gradient(to bottom, #e6f7ff 0%, #c9dee8 100%); border-color: #c9dee8; - -webkit-box-shadow: 0 1px 1px #e6f7ff inset; - box-shadow: 0 1px 1px #e6f7ff inset; color: #212121; } @@ -849,9 +901,7 @@ ul.cplist { /* link styles for the sub-section links */ .navigation a { - background: #c0d3dd; - background-image: -webkit-gradient(linear, left top, right top, color-stop(50%, #aab9c0), to(#c0d3dd)); - background-image: linear-gradient(to right, #aab9c0 50%, #c0d3dd 100%); + background: #b5c6cf; color: #212121; } @@ -941,6 +991,18 @@ dl.mini dt { background-color: #ededed; } +/* avatar placeholder colours */ +.avatar-color-default { background-color: hsl(207, 15%, 80%); } +.avatar-color-0 { background-color: #d32f2f; } +.avatar-color-1 { background-color: #c2185b; } +.avatar-color-2 { background-color: #7b1fa2; } +.avatar-color-3 { background-color: #512da8; } +.avatar-color-4 { background-color: #303f9f; } + +.avatar-initials { + color: #ffffff; +} + /* colours and backgrounds for forms.css */ /* general form styles */ @@ -1076,6 +1138,7 @@ input.disabled { .dropdown-extended .dropdown-extended-item { border-top-color: #bdbdbd; + color: #47536b; } .dropdown-extended .dropdown-extended-item:hover { @@ -1151,3 +1214,11 @@ input.disabled { background-color: #d41142; color: #ffffff; } + +.dropdown-extended .webpush-subscribe { + color: #536482; +} + +.notification-subscribe-toggle { + color: #47536b; +} diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index f5c6f848099..2d5dd2601af 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -5,26 +5,24 @@ /* stylelint-disable selector-no-qualifying-type */ html { - font-size: 100%; - /* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */ height: 101%; } body { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 16px; + font-size: var(--ps-font-normal); line-height: normal; word-wrap: break-word; margin: 0; - padding: 12px 0; + padding: 0 0 12px; -webkit-print-color-adjust: exact; } h1 { /* Forum name */ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 20px; + font-size: var(--ps-font-h1); font-weight: bold; margin-top: 15px; margin-right: 200px; @@ -33,7 +31,7 @@ h1 { h2 { /* Forum header titles */ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 20px; + font-size: var(--ps-font-h2); font-weight: normal; margin: 0.8em 0 0.2em; } @@ -45,7 +43,7 @@ h2.solo { h3 { /* Sub-headers (also used as post headers, but defined later) */ font-family: Arial, Helvetica, sans-serif; - font-size: 12px; + font-size: var(--ps-font-normal); font-weight: bold; text-transform: uppercase; border-bottom: 1px solid transparent; @@ -57,13 +55,13 @@ h3 { h4 { /* Forum and topic list titles */ font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 13px; + font-size: var(--ps-font-h4); } p { - font-size: 11px; - line-height: 14px; - margin-bottom: 16px; + font-size: var(--ps-font-small); + line-height: calc(var(--ps-line-height) * 0.75); + margin-bottom: calc(var(--ps-line-height) / 1.2); } img { @@ -151,17 +149,18 @@ a:hover { /* Main blocks ---------------------------------------- */ .wrap { - border: 1px solid transparent; - border-radius: 8px; - min-width: 625px; + border: solid transparent; + border-width: 0 1px 1px; + border-radius: 0 0 8px 8px; + min-width: 320px; max-width: 1152px; margin: 0 auto; - padding: 15px; + padding: 0 15px 15px; } .page-body { clear: both; - margin: 4px 0; + margin: 0.4rem 0; } .page-footer { @@ -172,37 +171,38 @@ a:hover { margin-top: 20px; } -.logo { - float: left; - width: auto; - padding: 10px 13px 0 10px; +.c-hero { + display: inline-flex; + flex: 1; + flex-direction: row; + align-self: auto; + padding: 12px; } -.logo:hover { - text-decoration: none; +.c-hero-logo { + width: 150px; + padding-right: 16px; } -.site_logo { - display: inline-block; +.c-hero-logo-img { width: 149px; height: 52px; + margin-top: 0; } -/* Site description and logo */ -.site-description { - float: left; - width: 65%; -} - -.site-description h1 { - margin-right: 0; +.c-hero-heading { + flex: 1; + align-self: auto; + margin: 0; } /* Round cornered boxes and backgrounds ---------------------------------------- */ .headerbar { - border-radius: 7px; - margin-bottom: 4px; + border-radius: 0 0 7px 7px; + display: flex; + flex-direction: column; + margin-bottom: 0.5rem; padding: 5px; } @@ -211,23 +211,28 @@ a:hover { padding: 3px 10px; } +.headerbar .navbar { + background: none; + padding: calc(var(--ps-line-height) * 0.25) 5px calc(var(--ps-line-height) * 0.5); +} + .forabg { border-radius: 7px; clear: both; - margin-bottom: 4px; + margin-bottom: 0.5rem; padding: 5px; } .forumbg { border-radius: 7px; clear: both; - margin-bottom: 4px; + margin-bottom: 0.5rem; padding: 5px; } .panel { border-radius: 7px; - margin-bottom: 4px; + margin-bottom: calc(var(--ps-font-base) * 0.5); padding: 5px 10px; } @@ -261,8 +266,8 @@ ul.linklist { } ul.linklist > li { - font-size: 11px; - line-height: 24px; + font-size: var(--ps-font-small); + line-height: calc(var(--ps-line-height) * 1.25); float: left; width: auto; margin-right: 7px; @@ -279,6 +284,17 @@ a.rightside { margin-left: 7px; } +ul.linklist li a:hover, +ul.linklist li a:focus, +ul.linklist li a:active { + text-decoration: none; +} + +ul.linklist li a:hover span, +ul.linklist li a:focus span { + text-decoration: underline; +} + ul.navlinks { border-top: 1px solid transparent; } @@ -302,6 +318,10 @@ ul.linklist li.responsive-menu { margin: 0 5px 0 0; } +.nav-footer .responsive-menu { + display: none; +} + .hasjs ul.linklist.leftside, .hasjs ul.linklist.rightside { max-width: 48%; @@ -328,6 +348,10 @@ ul.linklist .dropdown-up .dropdown { bottom: 18px; } +ul.nav-breadcrumbs { + margin: calc(var(--ps-line-height) * 0.75) 0; +} + /* Bulletin icons for list items ---------------------------------------- */ ul.linklist.bulletin > li:before { @@ -362,20 +386,18 @@ a.header-avatar:hover { text-decoration: none; } -a.header-avatar img { +a.header-avatar img, +a.header-avatar .avatar-placeholder { vertical-align: middle; width: auto; max-height: 20px; margin-bottom: 2px; } -a.header-avatar span:after { - font: normal normal normal 14px/1 FontAwesome; - vertical-align: top; - display: inline-block; - padding-top: 2px; - padding-left: 6px; - content: "\f0dd"; +a.header-avatar .avatar-placeholder { + font-size: var(--ps-font-tiny); + display: inline-flex; + width: 20px; } /* Dropdown menu @@ -400,7 +422,7 @@ a.header-avatar span:after { border: 1px solid transparent; border-radius: 5px; position: absolute; - z-index: 2; + z-index: 201; top: 1.2em; left: 0; display: none; @@ -431,12 +453,12 @@ a.header-avatar span:after { } .dropdown-button-control .dropdown { - top: 24px; + top: calc(var(--ps-line-height) * 1.25); } .dropdown-button-control.dropdown-up .dropdown { top: auto; - bottom: 24px; + bottom: calc(var(--ps-line-height) * 1.25); } .dropdown .pointer, @@ -460,7 +482,7 @@ a.header-avatar span:after { } .dropdown .pointer { - z-index: 3; + z-index: 301; top: -1px; right: auto; left: 10px; @@ -492,7 +514,7 @@ a.header-avatar span:after { border: 1px solid transparent; border-radius: 5px; position: relative; - z-index: 2; + z-index: 201; overflow: hidden; overflow-y: auto; max-height: 300px; @@ -504,6 +526,17 @@ a.header-avatar span:after { padding: 5px; } +.dropdown-contents a:hover, +.dropdown-contents a:active, +.dropdown-contents a:focus { + text-decoration: none; +} + +.dropdown-contents a:hover span, +.dropdown-contents a:focus span { + text-decoration: underline; +} + .jumpbox { margin: 5px 0; } @@ -542,11 +575,11 @@ a.header-avatar span:after { } .dropdown li { - font-size: 11px !important; + font-size: var(--ps-font-small) !important; line-height: normal !important; text-align: left; white-space: nowrap; - border-top: 1px dotted transparent; + border-top: 1px solid transparent; display: list-item; float: none !important; margin: 0; @@ -601,13 +634,13 @@ a.header-avatar span:after { .breadcrumbs .crumb { font-weight: bold; word-wrap: normal; - float: left; + display: inline-block; } .breadcrumbs .crumb:before { font-weight: bold; - padding: 0 0.5em; - content: "\2039"; + padding: 0 0.1em; + content: "\203A"; } .breadcrumbs .crumb:first-child:before { @@ -664,9 +697,9 @@ table.table1 { } table.table1 thead th { - font-size: 10px; + font-size: var(--ps-font-tiny); font-weight: normal; - line-height: 13px; + line-height: calc(var(--ps-line-height) / 1.5); text-transform: uppercase; padding: 0 0 4px 3px; } @@ -680,7 +713,7 @@ table.table1 tbody tr { } table.table1 td { - font-size: 11px; + font-size: var(--ps-font-small); } table.table1 tbody td { @@ -800,6 +833,10 @@ table.info tbody th { max-width: 100%; } +.avatar-rank-container { + max-width: 20%; +} + .left-box.profile-details { width: 80%; } @@ -813,7 +850,7 @@ table.info tbody th { dl.details { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; + font-size: var(--ps-font-small); } dl.details dt { @@ -853,12 +890,6 @@ fieldset.fields1 dd.recipients { margin-left: 11px; } -fieldset.fields1 ul.recipients input.button2 { - font-size: 12px; - margin-right: 0; - padding: 0; -} - fieldset.fields1 dl.pmlist > dt { width: auto !important; } @@ -870,7 +901,7 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Action-bars (container for post/reply buttons, pagination, etc.) ---------------------------------------- */ .action-bar { - font-size: 11px; + font-size: var(--ps-font-small); margin: 4px 0; } @@ -926,7 +957,7 @@ fieldset.fields1 dl.pmlist dd.recipients { .pagination li.active span { font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; - font-size: 13px; + font-size: var(--ps-font-normal); font-weight: normal; line-height: 1.4; text-align: center; @@ -946,12 +977,11 @@ fieldset.fields1 dl.pmlist dd.recipients { } .pagination li.page-jump a { - padding: 0 8px; + padding: 2px; } .pagination li.page-jump a i { - font-size: 21px; - line-height: 21px; + font-size: var(--ps-font-h3); } .pagination .arrow a { @@ -971,8 +1001,10 @@ fieldset.fields1 dl.pmlist dd.recipients { .row .pagination li a, .row .pagination li span { - font-size: 9px; + font-size: var(--ps-font-tiny); border-radius: 2px; + width: calc(var(--ps-font-tiny) + 6px); + height: calc(var(--ps-font-normal) + 6px); padding: 1px 3px; } @@ -981,7 +1013,7 @@ fieldset.fields1 dl.pmlist dd.recipients { .phpbb_alert { border: 1px solid transparent; position: fixed; - z-index: 50; + z-index: 601; top: 150px; right: 0; left: 0; @@ -993,8 +1025,8 @@ fieldset.fields1 dl.pmlist dd.recipients { .phpbb_alert .alert_close { float: right; - margin-top: -8px; - margin-right: -36px; + margin-top: 0; + margin-right: -22px; } .phpbb_alert p { @@ -1013,19 +1045,19 @@ fieldset.fields1 dl.pmlist dd.recipients { .phpbb_alert div.alert_text > select, .phpbb_alert div.alert_text > textarea, .phpbb_alert div.alert_text > input { - font-size: 11px; + font-size: var(--ps-font-small); } .darkenwrapper { position: relative; - z-index: 44; + z-index: 401; display: none; } .darken { opacity: 0.5; position: fixed; - z-index: 45; + z-index: 501; top: 0; left: 0; width: 100%; @@ -1034,7 +1066,7 @@ fieldset.fields1 dl.pmlist dd.recipients { .loading_indicator { position: fixed; - z-index: 51; + z-index: 701; top: 50%; left: 50%; display: none; @@ -1128,9 +1160,15 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Miscellaneous styles ---------------------------------------- */ .copyright { - font-size: 10px; + font-size: var(--ps-font-tiny); text-align: center; - padding: 5px; + padding: 10px; +} + +.footer-row { + font-size: var(--ps-font-tiny); + line-height: 1.8; + margin: 0; } .small { @@ -1146,12 +1184,12 @@ fieldset.fields1 dl.pmlist dd.recipients { } .error { - font-size: 10px; + font-size: 12px; font-weight: bold; } div.rules { - font-size: 11px; + font-size: var(--ps-font-h4); border-radius: 7px; margin: 10px 0; padding: 5px 10px; @@ -1205,14 +1243,9 @@ ul.linklist:after, content: ""; } -/* stylelint-disable declaration-property-unit-whitelist */ .emoji { - width: 1em; - min-width: 18px; - height: 1em; - min-height: 18px; + font-size: 17px; } -/* stylelint-enable declaration-property-unit-whitelist */ .smilies { vertical-align: text-bottom; @@ -1229,11 +1262,11 @@ ul.linklist:after, } .member-search strong { - font-size: 11px; + font-size: var(--ps-font-small); } .dropdown-extended { - z-index: 1; + z-index: 201; display: none; } @@ -1305,7 +1338,7 @@ ul.linklist:after, } .dropdown-extended .footer { - font-size: 12px; + font-size: var(--ps-font-normal); text-align: center; } @@ -1325,6 +1358,15 @@ ul.linklist:after, display: block; } +.dropdown-extended .webpush-subscribe { + white-space: nowrap; + display: flex; + flex-wrap: nowrap; + justify-content: space-between; + padding: 5px 10px; + gap: 20px; +} + .notification-avatar, .notification-menu .notification-list .notification-item .avatar, .notification-menu .notification-list .notification-item .gravatar { @@ -1349,7 +1391,7 @@ ul.linklist:after, } .notification-time { - font-size: 10px; + font-size: var(--ps-font-tiny); text-align: right; margin: 0; } @@ -1365,7 +1407,7 @@ ul.linklist:after, .notifications-title { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 13px !important; + font-size: var(--ps-font-normal) !important; } .notifications-title strong { @@ -1373,7 +1415,7 @@ ul.linklist:after, } .notifications-time { - font-size: 10px !important; + font-size: 12px !important; } .notification-text { @@ -1381,16 +1423,16 @@ ul.linklist:after, } .badge { - font-size: 10px; + font-size: var(--ps-font-tiny); line-height: 1; text-align: center; white-space: nowrap; border-radius: 10px; opacity: 0.8; position: relative; - top: 3px; + top: 5px; float: right; - margin-left: 3px; + margin-left: 5px; padding: 4px 6px; } @@ -1421,6 +1463,10 @@ ul.linklist:after, width: 50px; } +.dropdown .clone.hidden { + display: none; +} + .dropdown .clone.hidden + li.separator { display: none; } diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 98a4a36c085..e98fcb4c849 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -5,6 +5,11 @@ /* stylelint-disable selector-max-compound-selectors */ /* stylelint-disable selector-no-qualifying-type */ +ul.forums, +ul.topics { + border-radius: 4px; +} + ul.topiclist { display: block; margin: 0; @@ -32,7 +37,7 @@ ul.topiclist dd { } ul.topiclist dt { - font-size: 11px; + font-size: var(--ps-font-small); width: 100%; margin-right: -440px; } @@ -50,6 +55,7 @@ ul.topiclist.two-columns dt { } ul.topiclist dt .list-inner { + line-height: calc(var(--ps-line-height) / 1.2); margin-right: 440px; padding-right: 5px; padding-left: 5px; @@ -104,11 +110,29 @@ ul.topiclist dfn { display: block; } +.forum-image img { + max-width: 100%; +} + li.row { border-top: 1px solid transparent; border-bottom: 1px solid transparent; } +li.row:first-child { + border-top: 0; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + padding-top: 1px; +} + +li.row:last-child { + border-bottom: 0; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; + margin-bottom: 1px; +} + li.row strong { font-weight: normal; } @@ -116,8 +140,8 @@ li.row strong { li.header dt, li.header dd { font-family: Arial, Helvetica, sans-serif; - font-size: 10px; - line-height: 10px; + font-size: var(--ps-font-tiny); + line-height: 1.6; text-transform: uppercase; border-left-width: 0; margin: 2px 0 4px; @@ -169,7 +193,7 @@ dl.row-item dt { } dl.row-item dt .list-inner { - padding-left: 52px; /* Space for folder icon */ + padding-left: 54px; /* Space for folder icon */ } dl.row-item dt, @@ -177,30 +201,14 @@ dl.row-item dd { min-height: 35px; } -dl.row-item dt a { - display: inline; -} - -/* topic row icon links */ -dl a.row-item-link { - position: absolute; - top: 50%; - left: 0; - display: block; - width: 30px; - height: 30px; - margin-top: -15px; - margin-left: 9px; - padding: 0; -} - +/* topic row links */ dd.posts, dd.topics, dd.views, dd.extra, dd.mark { - font-size: 12px; - line-height: 26px; + font-size: var(--ps-font-normal); + line-height: 2; text-align: center; width: 80px; } @@ -228,16 +236,16 @@ dd.redirect, dd.moderation, dd.time, dd.info { - font-size: 11px; + font-size: var(--ps-font-small); width: 250px; } dd.redirect { - line-height: 26px; + line-height: calc(var(--ps-line-height) / 0.75); } dd.time { - line-height: 22px; + line-height: calc(var(--ps-line-height) * 1.1); } dd.lastpost > span, @@ -249,14 +257,18 @@ dd.moderation > span { padding-left: 5px; } +dd.lastpost > span { + line-height: calc(var(--ps-line-height) / 1.2); +} + dd.extra, dd.mark { - line-height: 24px; + line-height: var(--ps-line-height); } dd.option { - font-size: 11px; - line-height: 22px; + font-size: var(--ps-font-small); + line-height: 1.75; text-align: center; width: 125px; } @@ -264,7 +276,7 @@ dd.option { /* Post body styles ---------------------------------------- */ .postbody { - line-height: 16px; + line-height: var(--ps-line-height); position: relative; float: left; width: 76%; @@ -272,18 +284,18 @@ dd.option { } .postbody .ignore { - font-size: 11px; + font-size: var(--ps-font-small); } .postbody h3.first { /* The first post on the page uses this */ - font-size: 17px; + font-size: var(--ps-font-h3); } .postbody h3 { font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 15px; - line-height: 19px; + font-size: var(--ps-font-h4); + line-height: calc(var(--ps-font-h4) + 4px); text-transform: none; border: none; @@ -305,7 +317,7 @@ dd.option { } .postbody .content { - font-size: 13px; + font-size: var(--ps-font-normal); overflow-x: auto; } @@ -362,17 +374,17 @@ dd.option { ---------------------------------------- */ .content { font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 10px; - line-height: 14px; + font-size: var(--ps-font-normal); + line-height: var(--ps-line-height); clear: both; overflow: hidden; - min-height: 30px; + min-height: calc(var(--ps-line-height) * 1.5); padding-bottom: 1px; } .content h2, .panel h2 { - font-size: 16px; + font-size: var(--ps-font-h3); font-weight: normal; border-bottom: 1px solid transparent; margin-top: 8px; @@ -385,21 +397,32 @@ dd.option { } .panel p { - font-size: 12px; - line-height: 16px; - margin-bottom: 12px; + font-size: var(--ps-font-normal); + line-height: 1.25; + margin-bottom: var(--ps-font-normal); } .content p { font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; } +.agreement { + font-size: var(--ps-font-normal); + line-height: 1.25; + margin-bottom: var(--ps-font-small); +} + +.agreement-text { + line-height: calc(var(--ps-font-normal) * 1.25); + margin-bottom: var(--ps-font-small); +} + dl.faq { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; - line-height: 15px; - margin-top: 11px; - margin-bottom: 22px; + font-size: var(--ps-font-small); + line-height: 1.4; + margin-top: var(--ps-font-small); + margin-bottom: calc(var(--ps-font-small) * 2); } dl.faq dt { @@ -407,8 +430,8 @@ dl.faq dt { } .content dl.faq { - font-size: 12px; - margin-bottom: 6px; + font-size: var(--ps-font-normal); + margin-bottom: calc(var(--ps-font-normal) / 2); } .content li { @@ -427,22 +450,22 @@ dl.faq dt { /* Post author */ p.author { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 10px; - line-height: 12px; + font-size: var(--ps-font-tiny); + line-height: 1.2; clear: both; - margin-bottom: 8px; + margin-bottom: calc(var(--ps-font-tiny) / 1.2); padding: 0 0 5px; } /* Post signature */ .signature { - font-size: 11px; - line-height: 16px; + font-size: var(--ps-font-small); + line-height: 1.4; border-top: 1px solid transparent; clear: left; overflow: hidden; width: 100%; - margin-top: 16px; + margin: calc(var(--ps-font-small) * 1.4) 0; padding-top: 2px; } @@ -470,17 +493,18 @@ dd .signature { /* Post noticies */ .notice { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 10px; - line-height: 13px; + font-size: var(--ps-font-tiny); + line-height: 1.3; border-top: 1px dashed transparent; clear: left; width: auto; - margin-top: 15px; + margin-top: calc(var(--ps-font-tiny) * 1.3 + 2px); padding-top: 2px; } /* Jump to post link for now */ ul.searchresults { + font-size: var(--ps-font-normal); text-align: right; clear: both; list-style: none; @@ -515,7 +539,7 @@ blockquote cite:before, padding-right: 5px; } -blockquote cite > div { +blockquote cite > span { font-weight: normal; float: right; } @@ -527,20 +551,20 @@ blockquote cite > div { /* Code block */ .codebox { - font-size: 13px; + font-size: var(--ps-font-normal); word-wrap: normal; border: 1px solid transparent; - margin: 13px 0 16px; + margin: var(--ps-font-normal) 0 calc(var(--ps-font-normal) + 2px); } .codebox p { - font-size: 10px !important; + font-size: var(--ps-font-tiny) !important; font-weight: bold; text-transform: uppercase; border-bottom: 1px solid transparent; display: block; margin-bottom: 0; - padding: 3px; + padding: calc(var(--ps-font-tiny) / 3); } blockquote .codebox { @@ -560,7 +584,7 @@ blockquote .codebox { /* Attachments ---------------------------------------- */ .attachbox { - font-size: 13px; + font-size: var(--ps-font-normal); border: 1px dashed transparent; float: left; clear: left; @@ -581,6 +605,7 @@ blockquote .codebox { border-top: 1px solid transparent; clear: left; overflow-x: auto; + overflow-y: hidden; margin-top: 4px; padding-top: 4px; } @@ -608,8 +633,6 @@ blockquote .codebox { .attach-image img { border: 1px solid transparent; - - /* cursor: move; */ cursor: default; } @@ -662,6 +685,18 @@ dl.thumbnail dt a:hover img { border: 1px solid transparent; } +.c-file-comment { + font-style: italic; +} + +.c-file-audio-controls { + max-width: 100%; +} + +.c-file-video-controls { + max-width: 100%; +} + /* Post poll styles ---------------------------------------- */ fieldset.polls { @@ -680,7 +715,7 @@ fieldset.polls dl.voted { } fieldset.polls dt { - font-size: 11px; + font-size: var(--ps-font-small); text-align: left; border-right: none; display: block; @@ -691,7 +726,7 @@ fieldset.polls dt { } fieldset.polls dd { - font-size: 11px; + font-size: var(--ps-font-small); border-left: none; float: left; width: 10%; @@ -726,7 +761,7 @@ fieldset.polls dd div { } .vote-submitted { - font-size: 12px; + font-size: var(--ps-font-normal); font-weight: bold; text-align: center; } @@ -734,6 +769,7 @@ fieldset.polls dd div { /* Poster profile block ---------------------------------------- */ .postprofile { + line-height: calc(var(--ps-font-small) * 1.5); border: 1px solid transparent; border-width: 0 0 0 1px; float: right; @@ -744,8 +780,8 @@ fieldset.polls dd div { .postprofile dd, .postprofile dt { - font-size: 10px; - line-height: 12px; + font-size: var(--ps-font-small); + line-height: 1.6; margin-left: 8px; } @@ -764,8 +800,12 @@ fieldset.polls dd div { margin-bottom: 10px; } +.profile-rank img { + max-width: 160px; +} + /* Post-profile avatars */ -.postprofile .has-avatar .avatar-container { +.postprofile .avatar-container { overflow: hidden; margin-bottom: 3px; } @@ -782,6 +822,37 @@ fieldset.polls dd div { height: auto !important; } +.avatar-placeholder { + font-size: 36px; + font-weight: bold; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + width: 80px; + height: 80px; +} + +.avatar-initials { + line-height: 1; +} + +.avatar-initials .o-icon { + font-size: 36px; + vertical-align: baseline !important; + width: auto; + height: auto; +} + +.notification-block .avatar-placeholder, +.notification-list .topiclist .notification-item .avatar, +.notification-list .topiclist .notification-item .avatar-placeholder { + font-size: 22px; + float: left; + width: 50px; + height: 50px; +} + .postprofile .profile-posts a { font-weight: normal; } @@ -812,6 +883,10 @@ dd.profile-contact { } /* Profile used on view-profile */ +.profile-avatar { + text-align: center; +} + .profile-avatar img { max-width: 100%; } @@ -903,3 +978,10 @@ table.fixed-width-table { /* stylelint-enable selector-max-compound-selectors */ /* stylelint-enable selector-no-qualifying-type */ + +/* Memberlist +---------------------------------------- */ +.group-description ol, +.group-description ul { + list-style-position: inside; +} diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 11ca6dd10c1..02581046676 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -24,12 +24,12 @@ } .panel-container .panel p { - font-size: 11px; + font-size: var(--ps-font-small); } .panel-container .panel ol { - font-size: 11px; - margin-left: 22px; + font-size: var(--ps-font-small); + margin-left: calc(var(--ps-font-small) * 2); } .panel-container .panel li.row { @@ -80,7 +80,7 @@ ul.cplist { } .panel-container .postbody p.author { - font-size: 11px; + font-size: var(--ps-font-small); } .cp-main .buttons { @@ -118,9 +118,9 @@ ul.cplist { .tabs .tab, .minitabs .tab { - font-size: 10px; + font-size: var(--ps-font-tiny); font-weight: bold; - line-height: 14px; + line-height: 1.4; display: block; float: left; } @@ -144,7 +144,7 @@ ul.cplist { .tabs .tab > a { border: 1px solid transparent; border-radius: 4px 4px 0 0; - margin: 1px 1px 0 0; + margin: 1px 1px -1px 0; } .tabs .activetab > a { @@ -180,12 +180,12 @@ ul.cplist { } .responsive-tab > a.responsive-tab-link { - font-size: 16px; - line-height: 14px; + font-size: var(--ps-font-h3); + line-height: 0.875; text-decoration: none; position: relative; display: block; - width: 16px; + width: var(--ps-font-h3); } .responsive-tab .responsive-tab-link:before { @@ -201,7 +201,7 @@ ul.cplist { .tabs .dropdown, .minitabs .dropdown { - font-size: 11px; + font-size: var(--ps-font-small); font-weight: normal; top: 20px; margin-right: -2px; @@ -248,8 +248,10 @@ ul.cplist { /* Link styles for the sub-section links */ .navigation a { - font-size: 10px; + font-size: var(--ps-font-tiny); text-decoration: none; + border: 1px solid transparent; + border-radius: 4px 0 0 4px; display: block; margin: 1px 0; padding: 5px; @@ -269,12 +271,12 @@ ul.cplist { /* Friends list */ .cp-mini { - font-size: 10px; + font-size: var(--ps-font-tiny); border-radius: 7px; overflow-y: auto; max-height: 200px; - margin: 10px 15px 10px 5px; - padding: 5px 10px; + margin: var(--ps-font-tiny) 15px var(--ps-font-tiny) 5px; + padding: 5px var(--ps-font-tiny); } dl.mini dt { @@ -315,12 +317,16 @@ ol.def-rules li { padding: 0 3px; } +/* DEPRECATED 3.2.6 .pmlist li.pm_message_reported_colour, .pm_message_reported_colour { border-right-color: transparent; border-left-color: transparent; } +*/ +.pmlist li.pm_message_reported_colour, +.pm_message_reported_colour, .pmlist li.pm_marked_colour, .pm_marked_colour, .pmlist li.pm_replied_colour, @@ -353,8 +359,21 @@ ol.def-rules li { padding: 5px; } -.cplist .topictitle { - line-height: 30px; +.c-cropper-avatar-box { + min-height: 240px; + max-height: 400px; +} + +p.notification-title, +p.notification-forum, +p.notification-reason, +p.notification-time { + line-height: 14px; + margin-bottom: 4px; +} + +p.notification-time { + margin-bottom: 0; } /* stylelint-enable selector-max-compound-selectors */ diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 1257c2c56de..25ecb496d8a 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -9,13 +9,13 @@ ---------------------------------------- */ fieldset { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; + font-size: var(--ps-font-small); border-width: 0; } input { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; + font-size: var(--ps-font-small); font-weight: normal; vertical-align: middle; padding: 0 3px; @@ -23,7 +23,7 @@ input { select { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; + font-size: var(--ps-font-small); font-weight: normal; vertical-align: middle; border: 1px solid transparent; @@ -36,18 +36,18 @@ select:focus { } option { - padding-right: 11px; + padding-right: var(--ps-font-small); } select optgroup option { font-family: Verdana, Helvetica, Arial, sans-serif; - padding-right: 11px; + padding-right: var(--ps-font-small); } textarea { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; - line-height: 18px; + font-size: var(--ps-font-small); + line-height: 1.5; width: 60%; padding: 2px; } @@ -184,7 +184,7 @@ fieldset.display-options a { } .dropdown fieldset.display-options { - font-size: 11px; + font-size: var(--ps-font-small); margin: 0; padding: 0; } @@ -203,10 +203,10 @@ fieldset.display-options a { /* Display actions for ucp and mcp pages */ fieldset.display-actions { - line-height: 22px; + line-height: 2; text-align: right; white-space: nowrap; - padding-right: 11px; + padding-right: var(--ps-font-small); } fieldset.display-actions label { @@ -216,7 +216,7 @@ fieldset.display-actions label { /* Not used anywhere */ fieldset.sort-options { - line-height: 22px; + line-height: 2; } /* MCP forum selection */ @@ -252,6 +252,7 @@ fieldset.submit-buttons input { .format-buttons input, .format-buttons select { vertical-align: middle; + margin-bottom: 3px; } /* Main message box */ @@ -261,9 +262,12 @@ fieldset.submit-buttons input { .message-box textarea { font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 13px; + font-size: var(--ps-font-normal); outline: 3px dashed transparent; outline-offset: -4px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; width: 450px; min-width: 100%; max-width: 100%; @@ -344,7 +348,8 @@ input[type="button"], input[type="submit"], input[type="reset"], input[type="checkbox"], -input[type="radio"] { +input[type="radio"], +.search-results li { cursor: pointer; } @@ -364,7 +369,7 @@ input.disabled { float: left; -webkit-box-sizing: border-box; box-sizing: border-box; - height: 24px; + height: calc(var(--ps-line-height) * 1.25); padding: 3px; } @@ -372,10 +377,8 @@ input.disabled { --------------------------------------------- */ .search-header { border-radius: 4px; - display: block; float: right; - margin-top: 30px; - margin-right: 5px; + margin: 16px; } .search-header .inputbox { diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css index 0d6a3a52f71..153a7558816 100644 --- a/phpBB/styles/prosilver/theme/icons.css +++ b/phpBB/styles/prosilver/theme/icons.css @@ -5,100 +5,145 @@ /* Global module setup ---------------------------------------- */ -/* Renamed version of .fa class for agnostic usage of icon fonts. - * Just change the name of the font after the 14/1 to the name of - * the font you wish to use. - */ -.icon, -.button .icon, -blockquote cite:before, -.uncited:before { - font-family: FontAwesome; - font-size: 14px; - font-weight: normal; +/* Globaly fix svg colors */ +svg { + fill: currentColor; +} + +.o-icon { + vertical-align: middle !important; + width: var(--ps-font-h4); + height: var(--ps-font-h4); +} + +.o-icon-src-mdi, +.o-icon-src-ic { + width: calc(var(--ps-font-h4) + 4px); /* icon + 2 * 2px padding */ + height: calc(var(--ps-font-h4) + 4px); /* icon + 2 * 2px padding */ +} + +.o-icon-src-fa { + padding: 2px; +} + +.o-icon-font { + font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands"; + font-size: var(--ps-font-h4); font-style: normal; font-variant: normal; + -webkit-font-smoothing: antialiased; line-height: 1; + vertical-align: baseline; display: inline-block; - /* stylelint-disable order/declaration-block-properties-specified-order */ + /* stylelint-disable order/properties-order */ -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - /* stylelint-enable order/declaration-block-properties-specified-order */ + /* stylelint-enable order/properties-order */ + padding: 2px; text-rendering: auto; /* optimizelegibility throws things off #1094 */ } -.icon:before { - padding-right: 2px; +.o-icon-baseline { + vertical-align: baseline !important; } -.button .icon:before { - padding-right: 0; +.format-buttons .fa-fw { + width: 125%; } -/* Icon size classes - Default size is 14px, use these for small variations */ - -.icon.icon-xl { - font-size: 20px; +.o-icon + span, +span + .o-icon { + padding-left: 4px; } -.icon.icon-lg { - font-size: 16px; -} - -.icon.icon-md { - font-size: 10px; +blockquote cite:before, +.uncited:before { + font-size: calc(var(--ps-font-normal) * 2.5); + vertical-align: bottom; + display: inline-block; + margin-top: 8px; + margin-bottom: -8px; + content: "\201C"; } -.icon.icon-sm { - font-size: 8px; +.rtl blockquote cite:before, +.rtl .uncited:before { + content: "\201D"; } -/* icon modifiers */ -.icon-tiny { - font-size: 16px; - vertical-align: text-bottom; - width: 12px; - -webkit-transform: scale(0.65, 0.75); - transform: scale(0.65, 0.75); +.c-forum-row-icon, +.c-notification-check-icon { + font-size: var(--ps-font-h1); + width: var(--ps-font-h1); + height: var(--ps-font-h1); + margin-top: 0; } -.arrow-right .icon { - float: right; +.row-item-link { + border-radius: 50%; + position: absolute; + top: 50%; + left: 0; + display: inline-flex; + justify-content: center; + align-items: center; + width: calc(var(--ps-font-normal) * 2.25); + height: calc(var(--ps-font-normal) * 2.25); + margin-top: -17px; + margin-left: 9px; +} + +.row-item-link-mine { + background-color: #b353c6; + border: 2px solid #ffffff; + border-radius: 50%; + position: absolute; + z-index: 101; + top: 50%; + left: 32px; + display: block; + float: left; + width: 8px; + height: 8px; + margin-top: -17px; } -.arrow-left:hover .icon { - margin-right: 5px; - margin-left: -5px; +.row-item-sub { + position: absolute; + z-index: 101; + bottom: 3px; + left: 4px; + display: block; + float: left; + width: 16px; + height: 16px; } -.arrow-left .icon { - float: left; +.alert_close .o-icon { + width: 18px; + height: 18px; } -.arrow-right:hover .icon { - margin-right: -5px; - margin-left: 5px; +.push-subscribe-toggle-icon { + width: 20px; + height: 20px; + cursor: pointer; } -.post-buttons .dropdown-contents .icon { - float: right; - margin-left: 5px; +/* Contact icons +---------------------------------------- */ +.contact-icon { + background-repeat: no-repeat; + display: inline-block; } -.alert_close .icon:before { - border-radius: 50%; - display: block; - width: 11px; - height: 12px; - padding: 0; +.c-button-icon { + margin-top: 0; } -blockquote cite:before, -.uncited:before { - content: "\f10d"; /* Font Awesome quote-left */ +.c-watch-icon { + display: none !important; } -.rtl blockquote cite:before, -.rtl .uncited:before { - content: "\f10e"; /* Font Awesome quote-right */ +.c-watch-icon.is-active { + display: inline !important; } diff --git a/phpBB/styles/prosilver/theme/images/announce_read.gif b/phpBB/styles/prosilver/theme/images/announce_read.gif deleted file mode 100644 index a3b3d7b234a..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/announce_read.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/announce_read_locked.gif b/phpBB/styles/prosilver/theme/images/announce_read_locked.gif deleted file mode 100644 index 0a6cf643416..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/announce_read_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif deleted file mode 100644 index 56af0ab0717..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/announce_read_mine.gif b/phpBB/styles/prosilver/theme/images/announce_read_mine.gif deleted file mode 100644 index c333e3b1248..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/announce_read_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/announce_unread.gif b/phpBB/styles/prosilver/theme/images/announce_unread.gif deleted file mode 100644 index 9f75cc3e53f..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/announce_unread.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif b/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif deleted file mode 100644 index 4ad85bb684e..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif deleted file mode 100644 index 30db89439ef..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif b/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif deleted file mode 100644 index 3a2cbcac107..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/bg_header.gif b/phpBB/styles/prosilver/theme/images/bg_header.gif deleted file mode 100644 index 351de9f46ac..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/bg_header.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/bg_list.gif b/phpBB/styles/prosilver/theme/images/bg_list.gif deleted file mode 100644 index 89f8963fde5..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/bg_list.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/forum_link.gif b/phpBB/styles/prosilver/theme/images/forum_link.gif deleted file mode 100644 index 09f8dfa75a6..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/forum_link.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/forum_read.gif b/phpBB/styles/prosilver/theme/images/forum_read.gif deleted file mode 100644 index 891fa20c078..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/forum_read.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/forum_read_locked.gif b/phpBB/styles/prosilver/theme/images/forum_read_locked.gif deleted file mode 100644 index 23482406382..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/forum_read_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif b/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif deleted file mode 100644 index 5b4d30f7ec8..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/forum_unread.gif b/phpBB/styles/prosilver/theme/images/forum_unread.gif deleted file mode 100644 index e925da82bd0..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/forum_unread.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif b/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif deleted file mode 100644 index 5ff59b7421a..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif b/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif deleted file mode 100644 index 7d6ddb93bee..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_download.gif b/phpBB/styles/prosilver/theme/images/icon_download.gif deleted file mode 100644 index 70cd61caf2d..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_download.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_offline.gif b/phpBB/styles/prosilver/theme/images/icon_offline.gif deleted file mode 100644 index 5dc4212e9fb..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_offline.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_online.gif b/phpBB/styles/prosilver/theme/images/icon_online.gif deleted file mode 100644 index d0d202dde55..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_online.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_rate_bad.gif b/phpBB/styles/prosilver/theme/images/icon_rate_bad.gif deleted file mode 100644 index 79018894087..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_rate_bad.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_rate_good.gif b/phpBB/styles/prosilver/theme/images/icon_rate_good.gif deleted file mode 100644 index 6d23034d71c..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_rate_good.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icons_contact.png b/phpBB/styles/prosilver/theme/images/icons_contact.png deleted file mode 100644 index f84abd36a5f..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/icons_contact.png and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/quote.gif b/phpBB/styles/prosilver/theme/images/quote.gif deleted file mode 100644 index d1992273e6d..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/quote.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/quote_rtl.gif b/phpBB/styles/prosilver/theme/images/quote_rtl.gif deleted file mode 100644 index ac719cf280f..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/quote_rtl.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/site_logo.gif b/phpBB/styles/prosilver/theme/images/site_logo.gif deleted file mode 100644 index 2517fbedd69..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/site_logo.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/site_logo.svg b/phpBB/styles/prosilver/theme/images/site_logo.svg new file mode 100644 index 00000000000..4ce89034174 --- /dev/null +++ b/phpBB/styles/prosilver/theme/images/site_logo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/phpBB/styles/prosilver/theme/images/sticky_read.gif b/phpBB/styles/prosilver/theme/images/sticky_read.gif deleted file mode 100644 index e8142ddb201..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/sticky_read.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif b/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif deleted file mode 100644 index fcd8b85e0b1..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif deleted file mode 100644 index 0a8dc2a6c1d..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif deleted file mode 100644 index 37c4ed01f6f..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread.gif b/phpBB/styles/prosilver/theme/images/sticky_unread.gif deleted file mode 100644 index 88a212d7c0d..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/sticky_unread.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif deleted file mode 100644 index 0241da2ab54..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif deleted file mode 100644 index 8d69b447b24..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif deleted file mode 100644 index 65291020537..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_moved.gif b/phpBB/styles/prosilver/theme/images/topic_moved.gif deleted file mode 100644 index 8e9c1f41f6f..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_moved.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_read.gif b/phpBB/styles/prosilver/theme/images/topic_read.gif deleted file mode 100644 index 5ed739ee9be..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_read.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_read_hot.gif b/phpBB/styles/prosilver/theme/images/topic_read_hot.gif deleted file mode 100644 index 81a42d0a67c..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_read_hot.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif deleted file mode 100644 index b98808cadf2..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_read_locked.gif b/phpBB/styles/prosilver/theme/images/topic_read_locked.gif deleted file mode 100644 index 61bb1effa2b..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_read_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif deleted file mode 100644 index dbe901919a0..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_read_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_mine.gif deleted file mode 100644 index 8fb165c46c2..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_read_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_unread.gif b/phpBB/styles/prosilver/theme/images/topic_unread.gif deleted file mode 100644 index 43ea76b4de4..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_unread.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif b/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif deleted file mode 100644 index a45bc4bc19e..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif deleted file mode 100644 index dc673266be2..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif b/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif deleted file mode 100644 index 68dd3422d7f..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif deleted file mode 100644 index 4f5a36efe95..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif deleted file mode 100644 index 24e9817ce12..00000000000 Binary files a/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index 3a8407e2a64..11cffbf73b2 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -41,7 +41,7 @@ th a:hover { background-position: center center; border-radius: 3px 0 0 3px; position: absolute; - z-index: 2; + z-index: 301; top: 50%; right: 0; display: none; @@ -66,10 +66,10 @@ th a:hover { /* Links for forum/topic lists */ a.forumtitle, -a.topictitle { +a.topictitle, +span.topictitle { font-family: "Trebuchet MS", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: bold; + font-size: var(--ps-font-normal); text-decoration: none; } @@ -81,6 +81,10 @@ a.topictitle { display: inline; } +a.unread { + font-weight: bold; +} + a.topictitle:hover { text-decoration: underline; } @@ -98,10 +102,12 @@ a.lastsubject:hover { text-decoration: none; } +.row-item .forumtitle:hover, .row-item .topictitle:hover, +.row-item .lastsubject:hover, .row-item .subforum:hover, -.row-item .username:hover, -.row-item .username-coloured:hover { +.row-item a.username:hover, +.row-item a.username-coloured:hover { text-decoration: underline; } @@ -134,6 +140,10 @@ a.lastsubject:hover { text-decoration: underline; } +.postprofile a.avatar:hover { + text-decoration: none; +} + /* Profile searchresults */ .search .postprofile a { font-weight: normal; @@ -145,9 +155,24 @@ a.lastsubject:hover { } .top { - font-size: 12px; + font-size: var(--ps-font-small); text-decoration: none; - margin-top: 10px; + margin-top: calc(var(--ps-font-small) - 2px); +} + +.to-top-button { + border-radius: 50%; + position: fixed; + right: var(--ps-line-height); + bottom: var(--ps-line-height); + display: none; + block-size: calc(var(--ps-line-height) * 2); + inline-size: calc(var(--ps-line-height) * 2); +} + +.to-top-button .o-icon { + font-size: calc(var(--ps-font-normal) * 2); + padding: calc(var(--ps-font-normal) / 2); } /* Back to top of page */ @@ -158,7 +183,6 @@ a.lastsubject:hover { .back2top .top { float: right; margin-top: 0; - margin-right: -10px; } /* Arrow links */ diff --git a/phpBB/styles/prosilver/theme/mentions.css b/phpBB/styles/prosilver/theme/mentions.css new file mode 100644 index 00000000000..a12ad8178c7 --- /dev/null +++ b/phpBB/styles/prosilver/theme/mentions.css @@ -0,0 +1,83 @@ +/* -------------------------------------------------------------- /* + $Mentions +/* -------------------------------------------------------------- */ + +/* stylelint-disable selector-max-compound-selectors */ +/* stylelint-disable selector-no-qualifying-type */ + +/* Mention block +---------------------------------------- */ +.mention { + font-weight: bold; +} + +/* Mention dropdown +---------------------------------------- */ +.mention-container { + text-align: left; + border-radius: 2px; + position: absolute; + z-index: 999; + overflow: auto; /* placed here for list to scroll with arrow key press */ + max-height: 200px; + transition: all 0.2s ease; +} + +.mention-list { + margin: 0; + padding: 0; + list-style-type: none; +} + +.mention-media { + display: inline-flex; + flex-shrink: 0; + justify-content: center; + align-items: center; + margin-right: 8px; + margin-left: 0; +} + +.mention-media-avatar { + width: 40px; + height: 40px; +} + +.mention-item { + font-size: 16px; + font-weight: 400; + line-height: 1.5; + letter-spacing: 0.04em; + border-bottom: 1px solid transparent; + position: relative; + display: flex; + overflow: hidden; + justify-content: flex-start; + align-items: center; + padding: 8px; + cursor: pointer; +} + +.mention-item:hover { + text-decoration: none; +} + +.mention-name, +.mention-rank { + display: block; +} + +.mention-name { + line-height: 1.25; + margin-right: 20px; /* needed to account for scrollbar bug on Firefox for Windows */ +} + +.mention-rank { + font-size: 14px; + font-weight: 400; + line-height: 1.2871; + letter-spacing: 0.04em; +} + +/* stylelint-enable selector-max-compound-selectors */ +/* stylelint-enable selector-no-qualifying-type */ diff --git a/phpBB/styles/prosilver/theme/plupload.css b/phpBB/styles/prosilver/theme/plupload.css index bddb5da834d..118d63d397a 100644 --- a/phpBB/styles/prosilver/theme/plupload.css +++ b/phpBB/styles/prosilver/theme/plupload.css @@ -7,6 +7,10 @@ margin-bottom: 10px; } +.attach-row-tpl { + display: none; +} + .file-list td { vertical-align: middle; } @@ -49,7 +53,7 @@ position: relative; display: block; height: 2px; - margin: 4px -10px -6px -10px; + margin: 4px -10px -6px; } .file-progress { diff --git a/phpBB/styles/prosilver/theme/print.css b/phpBB/styles/prosilver/theme/print.css index a846ed34de3..90dcca34c44 100644 --- a/phpBB/styles/prosilver/theme/print.css +++ b/phpBB/styles/prosilver/theme/print.css @@ -220,13 +220,13 @@ code { display: block; } display: none; } -/* stylelint-disable declaration-property-unit-whitelist */ +/* stylelint-disable declaration-property-unit-allowed-list */ .emoji { width: 1em; min-width: 18px; height: 1em; min-height: 18px; } -/* stylelint-enable declaration-property-unit-whitelist */ +/* stylelint-enable declaration-property-unit-allowed-list */ /* stylelint-enable selector-max-compound-selectors */ diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 07cdd1cff95..a5f2ff207a7 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -18,6 +18,10 @@ .dropdown-extended .dropdown-contents { width: auto; } + + .dropdown-extended .dropdown-contents .webpush-subscribe .notification-subscribe-toggle > span { + display: none; + } } @media (max-width: 430px) { @@ -28,18 +32,6 @@ .section-viewtopic .search-box .inputbox { width: 57px; } - - .action-bar .search-box .inputbox ::-moz-placeholder { - content: "Search..."; - } - - .action-bar .search-box .inputbox :-ms-input-placeholder { - content: "Search..."; - } - - .action-bar .search-box .inputbox ::-webkit-input-placeholder { - content: "Search..."; - } } @media (max-width: 500px) { @@ -114,6 +106,10 @@ display: none; } + .nav-main .rightside a span { + display: none; + } + .rtl dl.details dt, .rtl dl.details dd { text-align: right; @@ -156,7 +152,7 @@ } } -@media (max-width: 700px) { +@media (max-width: 750px) { .responsive-hide { display: none !important; } @@ -186,8 +182,7 @@ .wrap { border: none; border-radius: 0; - min-width: 290px; - margin: 0; + box-sizing: border-box; padding: 0 5px; } @@ -205,7 +200,7 @@ } .cp-main .forabg, - .cp-main .forumdb, + .cp-main .forumbg, .cp-main .post, .cp-main .panel { border-radius: 7px; @@ -332,7 +327,6 @@ vertical-align: bottom; text-overflow: ellipsis; overflow: hidden; - max-width: 100px; } /* Pagination @@ -498,9 +492,14 @@ .column2, .left-box.profile-details { float: none; + clear: both; width: auto; } + .avatar-rank-container { + max-width: 100%; + } + /* Polls ---------------------------------------------------------------- */ fieldset.polls dt { @@ -541,8 +540,7 @@ overflow: hidden; width: auto; min-height: 40px; - margin: 0; - margin-bottom: 5px; + margin: 0 0 5px; padding-bottom: 5px; } @@ -576,14 +574,59 @@ max-height: 32px; } + .postprofile .avatar-placeholder { + font-size: 1rem; + width: 32px; + height: 32px; + } + .has-profile .postbody h3 { margin-right: 0 !important; margin-left: 0 !important; } + .nav-footer.linklist .in-menu, + .nav-main.linklist .in-menu { + display: none !important; + } + + /* post-buttons */ + .has-profile .post-buttons { - top: 15px; - right: 30px; + margin: 5px; + } + + .post-buttons > li > a { + display: none; + } + + .nav-footer.linklist .responsive-menu, + .nav-footer.linklist .responsive-menu .in-menu, + .nav-main.linklist .responsive-menu .in-menu, + .post-buttons-responsive-menu, + .post-button-responsive, + .post-buttons-responsive-menu .post-buttons-label { + display: block !important; + } + + .post-buttons-responsive-menu .dropdown-contents .button { + font-weight: normal; + line-height: inherit; + background: none; + border: none; + box-shadow: none; + color: #0f4d8a; + display: flex; + } + + .post-buttons-responsive-menu .dropdown-contents .button:hover { + text-decoration: underline; + color: #d41142; + } + + .post-buttons-responsive-menu .dropdown-contents .c-button-icon { + color: inherit; + padding-right: 5px; } /* Misc stuff @@ -730,21 +773,21 @@ } } -@media (min-width: 700px) { +@media (min-width: 701px) { .postbody { - width: 70%; + width: calc(100% - 200px - 1px - 16px); } -} -@media (min-width: 850px) { - .postbody { - width: 76%; + .postprofile { + width: 200px; } -} -@media (max-width: 850px) { - .postprofile { - width: 28%; + .nav-main.linklist .in-menu { + display: block !important; + } + + .nav-main.linklist .responsive-menu .in-menu { + display: none !important; } } @@ -824,7 +867,7 @@ } } -@media (max-width: 1220px) { +@media (min-width: 751px) and (max-width: 1200px) { .wrap { margin: 0 12px; } diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index 0da29846db6..27853ad399d 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -1,22 +1,23 @@ -/* phpBB3 Style Sheet +/* phpBB Style Sheet -------------------------------------------------------------- - Style name: prosilver (the default phpBB 3.2.x style) + Style name: prosilver (the default phpBB style) Based on style: Original author: Tom Beddard ( http://www.subblue.com/ ) Modified by: phpBB Limited ( https://www.phpbb.com/ ) -------------------------------------------------------------- */ -@import url("normalize.css?v=3.3"); -@import url("base.css?v=3.3"); -@import url("utilities.css?v=3.3"); -@import url("common.css?v=3.3"); -@import url("links.css?v=3.3"); -@import url("content.css?v=3.3"); -@import url("buttons.css?v=3.3"); -@import url("cp.css?v=3.3"); -@import url("forms.css?v=3.3"); -@import url("icons.css?v=3.3"); -@import url("colours.css?v=3.3"); -@import url("responsive.css?v=3.3"); -@import url("tweaks.css?v=3.3"); +@import url("normalize.css?hash=e6c08715"); +@import url("base.css?hash=e4336923"); +@import url("utilities.css?hash=b95e1ad4"); +@import url("icons.css?hash=cf9a9308"); +@import url("common.css?hash=b2c7c02b"); +@import url("buttons.css?hash=be0468e7"); +@import url("links.css?hash=ecc09d7a"); +@import url("mentions.css?hash=308fbc69"); +@import url("content.css?hash=46dafcea"); +@import url("cp.css?hash=9ed1a111"); +@import url("forms.css?hash=e6a667ba"); +@import url("colours.css?hash=f1c629cc"); +@import url("responsive.css?hash=c6136396"); +@import url("bidi.css?hash=c1b99d9a"); diff --git a/phpBB/styles/prosilver/theme/svg/logo.svg b/phpBB/styles/prosilver/theme/svg/logo.svg new file mode 100644 index 00000000000..cb83d3792e0 --- /dev/null +++ b/phpBB/styles/prosilver/theme/svg/logo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 03b123d7ef4..d549674df9b 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -30,6 +30,12 @@ define('IN_LOGIN', true); } +if ($mode === 'delete_cookies') +{ + define('SKIP_CHECK_BAN', true); + define('SKIP_CHECK_DISABLED', true); +} + // Start session management $user->session_begin(); $auth->acl($user->data); @@ -41,6 +47,9 @@ $module = new p_master(); $default = false; +/** @var \phpbb\controller\helper $controller_helper */ +$controller_helper = $phpbb_container->get('controller.helper'); + // Basic "global" modes switch ($mode) { @@ -48,7 +57,7 @@ $module->load('ucp', 'activate'); $module->display($user->lang['UCP_ACTIVATE']); - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); break; case 'resend_act': @@ -57,14 +66,13 @@ break; case 'sendpassword': - $module->load('ucp', 'remind'); - $module->display($user->lang['UCP_REMIND']); + redirect($controller_helper->route('phpbb_ucp_forgot_password_controller')); break; case 'register': if ($user->data['is_registered'] || isset($_REQUEST['not_agreed'])) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } $module->load('ucp', 'register'); @@ -78,7 +86,7 @@ case 'login': if ($user->data['is_registered']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } login_box($request->variable('redirect', "index.$phpEx")); @@ -87,7 +95,7 @@ case 'login_link': if ($user->data['is_registered']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } $module->load('ucp', 'login_link'); @@ -95,19 +103,19 @@ break; case 'logout': - if ($user->data['user_id'] != ANONYMOUS && $request->is_set('sid') && $request->variable('sid', '') === $user->session_id) + if ($user->data['user_id'] != ANONYMOUS && check_link_hash($request->variable('hash', ''), 'ucp_logout')) { $user->session_kill(); } else if ($user->data['user_id'] != ANONYMOUS) { - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + meta_refresh(3, $controller_helper->route('phpbb_index_controller')); - $message = $user->lang['LOGOUT_FAILED'] . '

      ' . sprintf($user->lang['RETURN_INDEX'], '', ' '); + $message = $user->lang['LOGOUT_FAILED'] . '

      ' . sprintf($user->lang['RETURN_INDEX'], '', ' '); trigger_error($message); } - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); break; case 'terms': @@ -120,7 +128,7 @@ { if ($user->data['is_registered']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } login_box(); @@ -138,7 +146,7 @@ 'AGREEMENT_TITLE' => $user->lang[$title], 'AGREEMENT_TEXT' => sprintf($user->lang[$message], $config['sitename'], generate_board_url()), 'U_BACK' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), - 'L_BACK' => $user->lang['BACK_TO_LOGIN'], + 'L_BACK' => $user->lang['BACK_TO_PREV'], )); page_footer(); @@ -146,72 +154,11 @@ break; case 'delete_cookies': - - // Delete Cookies with dynamic names (do NOT delete poll cookies) - if (confirm_box(true)) - { - $set_time = time() - 31536000; - - foreach ($request->variable_names(\phpbb\request\request_interface::COOKIE) as $cookie_name) - { - $cookie_data = $request->variable($cookie_name, '', true, \phpbb\request\request_interface::COOKIE); - - // Only delete board cookies, no other ones... - if (strpos($cookie_name, $config['cookie_name'] . '_') !== 0) - { - continue; - } - - $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); - - /** - * Event to save custom cookies from deletion - * - * @event core.ucp_delete_cookies - * @var string cookie_name Cookie name to checking - * @var bool retain_cookie Do we retain our cookie or not, true if retain - * @since 3.1.3-RC1 - */ - $retain_cookie = false; - $vars = array('cookie_name', 'retain_cookie'); - extract($phpbb_dispatcher->trigger_event('core.ucp_delete_cookies', compact($vars))); - if ($retain_cookie) - { - continue; - } - - // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ - if (strpos($cookie_name, 'poll_') !== 0) - { - $user->set_cookie($cookie_name, '', $set_time); - } - } - - $user->set_cookie('track', '', $set_time); - $user->set_cookie('u', '', $set_time); - $user->set_cookie('k', '', $set_time); - $user->set_cookie('sid', '', $set_time); - - // We destroy the session here, the user will be logged out nevertheless - $user->session_kill(); - $user->session_begin(); - - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - - $message = $user->lang['COOKIES_DELETED'] . '

      ' . sprintf($user->lang['RETURN_INDEX'], '', ''); - trigger_error($message); - } - else - { - confirm_box(false, 'DELETE_COOKIES', ''); - } - - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - + // Redirect to controller + redirect($controller_helper->route('phpbb_ucp_delete_cookies_controller')); break; case 'switch_perm': - $user_id = $request->variable('u', 0); $sql = 'SELECT * @@ -223,7 +170,7 @@ if (!$auth->acl_get('a_switchperm') || !$user_row || $user_id == $user->data['user_id'] || !check_link_hash($request->variable('hash', ''), 'switchperm')) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } include($phpbb_root_path . 'includes/acp/auth.' . $phpEx); @@ -231,12 +178,12 @@ $auth_admin = new auth_admin(); if (!$auth_admin->ghost_permissions($user_id, $user->data['user_id'])) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ACL_TRANSFER_PERMISSIONS', false, array($user_row['username'])); - $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

      ' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

      ' . sprintf($user->lang['RETURN_INDEX'], '', ''); /** * Event to run code after permissions are switched @@ -255,10 +202,9 @@ break; case 'restore_perm': - if (!$user->data['user_perm_from'] || !$auth->acl_get('a_switchperm')) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } $auth->acl_cache($user->data); @@ -272,7 +218,7 @@ $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ACL_RESTORE_PERMISSIONS', false, array($username)); - $message = $user->lang['PERMISSIONS_RESTORED'] . '

      ' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = $user->lang['PERMISSIONS_RESTORED'] . '

      ' . sprintf($user->lang['RETURN_INDEX'], '', ''); /** * Event to run code after permissions are restored @@ -305,7 +251,7 @@ { if ($user->data['is_bot']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } if ($id == 'pm' && $mode == 'view' && isset($_GET['p'])) @@ -350,6 +296,20 @@ 'ORDER_BY' => 'u.username_clean ASC', ); + /** + * Event to modify the SQL query before listing of friends + * + * @event core.ucp_modify_friends_sql + * @var array sql_ary SQL query array for listing of friends + * + * @since 3.2.10-RC1 + * @since 3.3.1-RC1 + */ + $vars = [ + 'sql_ary', + ]; + extract($phpbb_dispatcher->trigger_event('core.ucp_modify_friends_sql', compact($vars))); + $sql = $db->sql_build_query('SELECT_DISTINCT', $sql_ary); $result = $db->sql_query($sql); @@ -357,14 +317,33 @@ { $which = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || $auth->acl_get('u_viewonline'))) ? 'online' : 'offline'; - $template->assign_block_vars("friends_{$which}", array( + $tpl_ary = [ 'USER_ID' => $row['user_id'], - 'U_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), 'USER_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), - 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'])) - ); + 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) + ]; + + /** + * Event to modify the template before listing of friends + * + * @event core.ucp_modify_friends_template_vars + * @var array row friend user row + * @var array tpl_ary friend template array + * @var string which friend is 'online' or 'offline' + * + * @since 3.2.10-RC1 + * @since 3.3.1-RC1 + */ + $vars = [ + 'row', + 'tpl_ary', + 'which', + ]; + extract($phpbb_dispatcher->trigger_event('core.ucp_modify_friends_template_vars', compact($vars))); + + $template->assign_block_vars("friends_{$which}", $tpl_ary); } $db->sql_freeresult($result); } @@ -388,8 +367,8 @@ extract($phpbb_dispatcher->trigger_event('core.ucp_display_module_before', compact($vars))); $template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $user->lang('UCP'), - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}ucp.$phpEx"), + 'BREADCRUMB_NAME' => $user->lang('UCP'), + 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}ucp.$phpEx"), )); // Select the active module diff --git a/phpBB/phpbb/db/migration/data/v310/.htaccess b/phpBB/vendor-ext/.htaccess similarity index 76% rename from phpBB/phpbb/db/migration/data/v310/.htaccess rename to phpBB/vendor-ext/.htaccess index 44242b5418f..92e78ba1a7f 100644 --- a/phpBB/phpbb/db/migration/data/v310/.htaccess +++ b/phpBB/vendor-ext/.htaccess @@ -1,33 +1,25 @@ # With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from # module mod_authz_host to a new module called mod_access_compat (which may be -# disabled) and a new "Require" syntax has been introduced to mod_authz_host. +# disabled) and a new "Require" syntax has been introduced to mod_authz_core. # We could just conditionally provide both versions, but unfortunately Apache # does not explicitly tell us its version if the module mod_version is not # available. In this case, we check for the availability of module # mod_authz_core (which should be on 2.4 or higher only) as a best guess. - - Order Allow,Deny - Deny from All - + Order Allow,Deny + Deny from All = 2.4> - - Require all denied - + Require all denied - - Order Allow,Deny - Deny from All - + Order Allow,Deny + Deny from All - - Require all denied - + Require all denied diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 04a39e83d53..94f967be7b6 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -47,27 +47,45 @@ trigger_error('NO_FORUM'); } -$sql_from = FORUMS_TABLE . ' f'; +$sql_ary = [ + 'SELECT' => 'f.*', + 'FROM' => [ + FORUMS_TABLE => 'f', + ], + 'WHERE' => 'f.forum_id = ' . $forum_id, +]; + $lastread_select = ''; // Grab appropriate forum data if ($config['load_db_lastread'] && $user->data['is_registered']) { - $sql_from .= ' LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . ' - AND ft.forum_id = f.forum_id)'; - $lastread_select .= ', ft.mark_time'; + $sql_ary['LEFT_JOIN'][] = [ + 'FROM' => [FORUMS_TRACK_TABLE => 'ft'], + 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id', + ]; + $sql_ary['SELECT'] .= ', ft.mark_time'; } if ($user->data['is_registered']) { - $sql_from .= ' LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'] . ')'; - $lastread_select .= ', fw.notify_status'; + $sql_ary['LEFT_JOIN'][] = [ + 'FROM' => [FORUMS_WATCH_TABLE => 'fw'], + 'ON' => 'fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'], + ]; + $sql_ary['SELECT'] .= ', fw.notify_status'; } -$sql = "SELECT f.* $lastread_select - FROM $sql_from - WHERE f.forum_id = $forum_id"; -$result = $db->sql_query($sql); +/** + * You can use this event to modify the sql that selects the forum on the viewforum page. + * + * @event core.viewforum_modify_sql + * @var array sql_ary The SQL array to get the data for a forum + * @since 3.3.14-RC1 + */ +$vars = ['sql_ary']; +extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_sql', compact($vars))); +$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary)); $forum_data = $db->sql_fetchrow($result); $db->sql_freeresult($result); @@ -222,7 +240,7 @@ $data = array( 'NO_UNREAD_POSTS' => $user->lang['NO_UNREAD_POSTS'], 'UNREAD_POSTS' => $user->lang['UNREAD_POSTS'], - 'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . "&f=$forum_id&mark=topics&mark_time=" . time()) : '', + 'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . "&f=$forum_id&mark=topics&mark_time=" . time(), false) : '', 'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TEXT' => $user->lang['TOPICS_MARKED'] ); @@ -244,8 +262,8 @@ if ($task->is_ready()) { - $url = $task->get_url(); - $template->assign_var('RUN_CRON_TASK', 'cron'); + $cron_task_tag = $task->get_html_tag(); + $template->assign_var('RUN_CRON_TASK', $cron_task_tag); } else { @@ -255,8 +273,8 @@ if ($task->is_ready()) { - $url = $task->get_url(); - $template->assign_var('RUN_CRON_TASK', 'cron'); + $cron_task_tag = $task->get_html_tag(); + $template->assign_var('RUN_CRON_TASK', $cron_task_tag); } } } @@ -285,6 +303,20 @@ $sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']); $sort_by_sql = array('a' => 't.topic_first_poster_name', 't' => array('t.topic_last_post_time', 't.topic_last_post_id'), 'r' => (($auth->acl_get('m_approve', $forum_id)) ? 't.topic_posts_approved + t.topic_posts_unapproved + t.topic_posts_softdeleted' : 't.topic_posts_approved'), 's' => 'LOWER(t.topic_title)', 'v' => 't.topic_views'); +/** + * Modify the topic ordering if needed + * + * @event core.viewforum_modify_topic_ordering + * @var array sort_by_text Topic ordering options + * @var array sort_by_sql Topic orderings options SQL equivalent + * @since 3.2.5-RC1 + */ +$vars = array( + 'sort_by_text', + 'sort_by_sql', +); +extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_topic_ordering', compact($vars))); + $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param, $default_sort_days, $default_sort_key, $default_sort_dir); @@ -352,7 +384,18 @@ // Display active topics? $s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false; -$s_search_hidden_fields = array('fid' => array($forum_id)); +// Send the forum id... and maybe some other fields, depending on permissions +$s_search_hidden_fields = [ + 'fid' => [$forum_id], +]; + +if ($auth->acl_get('f_list_topics', $forum_id) && !$auth->acl_get('f_read', $forum_id)) +{ + // If the user has list access but not read access, then force the search to only be a topic title search + $s_search_hidden_fields['sr'] = 'topics'; + $s_search_hidden_fields['sf'] = 'titleonly'; +} + if ($_SID) { $s_search_hidden_fields['sid'] = $_SID; @@ -414,11 +457,12 @@ 'S_IS_LOCKED' => ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false, 'S_VIEWFORUM' => true, - 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&mode=forum_view", true, $user->session_id) : '', + 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&mode=forum_view") : '', 'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&f=' . $forum_id) : '', 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($start == 0) ? '' : "&start=$start")), 'U_CANONICAL' => generate_board_url() . '/' . append_sid("viewforum.$phpEx", "f=$forum_id" . (($start) ? "&start=$start" : ''), true, ''), 'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . "&f=$forum_id&mark=topics&mark_time=" . time()) : '', + 'U_SEARCH_FORUM' => append_sid("{$phpbb_root_path}search.$phpEx", 'fid%5B%5D=' . $forum_id), )); // Grab icons @@ -506,7 +550,7 @@ 'WHERE' => '(t.forum_id = ' . $forum_id . ' AND t.topic_type = ' . POST_ANNOUNCE . ') OR - (' . $db->sql_in_set('t.forum_id', $g_forum_ary) . ' + (' . $db->sql_in_set('t.forum_id', $g_forum_ary, false, true) . ' AND t.topic_type = ' . POST_GLOBAL . ')', 'ORDER_BY' => 't.topic_time DESC', @@ -598,6 +642,18 @@ $sql_start = $start; } +/** + * Modify the topics sort ordering if needed + * + * @event core.viewforum_modify_sort_direction + * @var string direction Topics sort order + * @since 3.2.5-RC1 + */ +$vars = array( + 'direction', +); +extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_sort_direction', compact($vars))); + if (is_array($sort_by_sql[$sort_key])) { $sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction; @@ -684,10 +740,29 @@ 'SELECT' => $sql_array['SELECT'], 'FROM' => $sql_array['FROM'], 'LEFT_JOIN' => $sql_array['LEFT_JOIN'], - 'WHERE' => $db->sql_in_set('t.topic_id', $topic_list), ); + /** + * Event to modify the SQL query before obtaining topics/stickies + * + * @event core.viewforum_modify_topic_list_sql + * @var int forum_id The forum ID + * @var array forum_data Data about the forum + * @var array topic_list Topic ids array + * @var array sql_array SQL query array for obtaining topics/stickies + * + * @since 3.2.10-RC1 + * @since 3.3.1-RC1 + */ + $vars = [ + 'forum_id', + 'forum_data', + 'topic_list', + 'sql_array', + ]; + extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_topic_list_sql', compact($vars))); + // If store_reverse, then first obtain topics, then stickies, else the other way around... // Funnily enough you typically save one query if going from the last page to the middle (store_reverse) because // the number of stickies are not known @@ -873,6 +948,11 @@ // Replies $replies = $phpbb_content_visibility->get_count('topic_posts', $row, $topic_forum_id) - 1; + // Correction for case of unapproved topic visible to poster + if ($replies < 0) + { + $replies = 0; + } if ($row['topic_status'] == ITEM_MOVED) { @@ -889,15 +969,15 @@ topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type); // Generate all the URIs ... - $view_topic_url_params = 'f=' . $row['forum_id'] . '&t=' . $topic_id; + $view_topic_url_params = 't=' . $topic_id; $view_topic_url = $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params) : false; $topic_unapproved = (($row['topic_visibility'] == ITEM_UNAPPROVED || $row['topic_visibility'] == ITEM_REAPPROVE) && $auth->acl_get('m_approve', $row['forum_id'])); $posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_posts_unapproved'] && $auth->acl_get('m_approve', $row['forum_id'])); $topic_deleted = $row['topic_visibility'] == ITEM_DELETED; - $u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$topic_id", true, $user->session_id) : ''; - $u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=deleted_topics&t=' . $topic_id, true, $user->session_id) : $u_mcp_queue; + $u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$topic_id") : ''; + $u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=deleted_topics&t=' . $topic_id) : $u_mcp_queue; // Send vars to template $topic_row = array( @@ -907,9 +987,12 @@ 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'TOPIC_AUTHOR_FULL' => get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'FIRST_POST_TIME' => $user->format_date($row['topic_time']), + 'FIRST_POST_TIME_RFC3339' => gmdate(DATE_RFC3339, $row['topic_time']), 'LAST_POST_SUBJECT' => censor_text($row['topic_last_post_subject']), 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), + 'LAST_POST_TIME_RFC3339' => gmdate(DATE_RFC3339, $row['topic_last_post_time']), 'LAST_VIEW_TIME' => $user->format_date($row['topic_last_view_time']), + 'LAST_VIEW_TIME_RFC3339' => gmdate(DATE_RFC3339, $row['topic_last_view_time']), 'LAST_POST_AUTHOR' => get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), 'LAST_POST_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), 'LAST_POST_AUTHOR_FULL' => get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), @@ -931,26 +1014,27 @@ 'UNAPPROVED_IMG' => ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '', 'S_TOPIC_TYPE' => $row['topic_type'], - 'S_USER_POSTED' => (isset($row['topic_posted']) && $row['topic_posted']) ? true : false, + 'S_USER_POSTED' => isset($row['topic_posted']) && $row['topic_posted'], 'S_UNREAD_TOPIC' => $unread_topic, - 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_get('m_report', $row['forum_id'])) ? true : false, + 'S_TOPIC_REPORTED' => !empty($row['topic_reported']) && $auth->acl_get('m_report', $row['forum_id']), 'S_TOPIC_UNAPPROVED' => $topic_unapproved, 'S_POSTS_UNAPPROVED' => $posts_unapproved, 'S_TOPIC_DELETED' => $topic_deleted, - 'S_HAS_POLL' => ($row['poll_start']) ? true : false, - 'S_POST_ANNOUNCE' => ($row['topic_type'] == POST_ANNOUNCE) ? true : false, - 'S_POST_GLOBAL' => ($row['topic_type'] == POST_GLOBAL) ? true : false, - 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false, - 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false, - 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false, + 'S_HAS_POLL' => (bool) $row['poll_start'], + 'S_POST_ANNOUNCE' => $row['topic_type'] == POST_ANNOUNCE, + 'S_POST_GLOBAL' => $row['topic_type'] == POST_GLOBAL, + 'S_POST_STICKY' => $row['topic_type'] == POST_STICKY, + 'S_TOPIC_LOCKED' => $row['topic_status'] == ITEM_LOCKED, + 'S_TOPIC_MOVED' => $row['topic_status'] == ITEM_MOVED, + 'S_TOPIC_HOT' => $config['hot_threshold'] && ($replies + 1) >= $config['hot_threshold'] && $row['topic_status'] != ITEM_LOCKED, 'U_NEWEST_POST' => $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&view=unread') . '#unread' : false, - 'U_LAST_POST' => $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'] : false, + 'U_LAST_POST' => $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'] : false, 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), 'U_TOPIC_AUTHOR' => get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'U_VIEW_TOPIC' => $view_topic_url, 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']), - 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=reports&f=' . $row['forum_id'] . '&t=' . $topic_id, true, $user->session_id), + 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=reports&t=' . $topic_id), 'U_MCP_QUEUE' => $u_mcp_queue, 'S_TOPIC_TYPE_SWITCH' => ($s_type_switch == $s_type_switch_test) ? -1 : $s_type_switch_test, @@ -973,7 +1057,7 @@ $template->assign_block_vars('topicrow', $topic_row); - $pagination->generate_template_pagination($view_topic_url, 'topicrow.pagination', 'start', $replies + 1, $config['posts_per_page'], 1, true, true); + $pagination->generate_template_pagination($topic_row['U_VIEW_TOPIC'], 'topicrow.pagination', 'start', (int) $topic_row['REPLIES'] + 1, $config['posts_per_page'], 1, true, true); $s_type_switch = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0; diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index f1d4527c191..de237e9e612 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -11,6 +11,8 @@ * */ +use Symfony\Component\HttpFoundation\RedirectResponse; + /** * @ignore */ @@ -25,498 +27,38 @@ $user->setup('memberlist'); // Get and set some variables -$mode = $request->variable('mode', ''); -$session_id = $request->variable('s', ''); -$start = $request->variable('start', 0); -$sort_key = $request->variable('sk', 'b'); -$sort_dir = $request->variable('sd', 'd'); -$show_guests = ($config['load_online_guests']) ? $request->variable('sg', 0) : 0; - -// Can this user view profiles/memberlist? -if (!$auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) -{ - if ($user->data['user_id'] != ANONYMOUS) - { - send_status_line(403, 'Forbidden'); - trigger_error('NO_VIEW_USERS'); - } - - login_box('', $user->lang['LOGIN_EXPLAIN_VIEWONLINE']); -} - -/* @var $pagination \phpbb\pagination */ -$pagination = $phpbb_container->get('pagination'); - -/* @var $viewonline_helper \phpbb\viewonline_helper */ -$viewonline_helper = $phpbb_container->get('viewonline_helper'); +$mode = $request->variable('mode', null); +$session_id = $request->variable('s', null); +$start = $request->variable('start', null); +$sort_key = $request->variable('sk', null); +$sort_dir = $request->variable('sd', null); +$show_guests = ($config['load_online_guests']) ? $request->variable('sg', null) : null; -$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_JOINED'], 'c' => $user->lang['SORT_LOCATION']); -$sort_key_sql = array('a' => 'u.username_clean', 'b' => 's.session_time', 'c' => 's.session_page'); - -// Sorting and order -if (!isset($sort_key_text[$sort_key])) -{ - $sort_key = 'b'; -} - -$order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'); - -// Whois requested -if ($mode == 'whois' && $auth->acl_get('a_') && $session_id) -{ - if (!function_exists('user_get_id_name')) - { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - } - - $sql = 'SELECT u.user_id, u.username, u.user_type, s.session_ip - FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . " s - WHERE s.session_id = '" . $db->sql_escape($session_id) . "' - AND u.user_id = s.session_user_id"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $template->assign_var('WHOIS', user_ipwhois($row['session_ip'])); - } - $db->sql_freeresult($result); - - // Output the page - page_header($user->lang['WHO_IS_ONLINE']); - - $template->set_filenames(array( - 'body' => 'viewonline_whois.html') - ); - make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); - - page_footer(); -} - -$user->update_session_infos(); - -// Forum info -$sql_ary = array( - 'SELECT' => 'f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id', - 'FROM' => array( - FORUMS_TABLE => 'f', - ), - 'ORDER_BY' => 'f.left_id ASC', -); - -/** -* Modify the forum data SQL query for getting additional fields if needed -* -* @event core.viewonline_modify_forum_data_sql -* @var array sql_ary The SQL array -* @since 3.1.5-RC1 -*/ -$vars = array('sql_ary'); -extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_forum_data_sql', compact($vars))); - -$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary), 600); -unset($sql_ary); - -$forum_data = array(); -while ($row = $db->sql_fetchrow($result)) -{ - $forum_data[$row['forum_id']] = $row; -} -$db->sql_freeresult($result); - -$guest_counter = 0; - -// Get number of online guests (if we do not display them) -if (!$show_guests) -{ - switch ($db->get_sql_layer()) - { - case 'sqlite3': - $sql = 'SELECT COUNT(session_ip) as num_guests - FROM ( - SELECT DISTINCT session_ip - FROM ' . SESSIONS_TABLE . ' - WHERE session_user_id = ' . ANONYMOUS . ' - AND session_time >= ' . (time() - ($config['load_online_time'] * 60)) . - ')'; - break; - - default: - $sql = 'SELECT COUNT(DISTINCT session_ip) as num_guests - FROM ' . SESSIONS_TABLE . ' - WHERE session_user_id = ' . ANONYMOUS . ' - AND session_time >= ' . (time() - ($config['load_online_time'] * 60)); - break; - } - $result = $db->sql_query($sql); - $guest_counter = (int) $db->sql_fetchfield('num_guests'); - $db->sql_freeresult($result); -} - -// Get user list -$sql_ary = array( - 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_type, u.user_colour, s.session_id, s.session_time, s.session_page, s.session_ip, s.session_browser, s.session_viewonline, s.session_forum_id', - 'FROM' => array( - USERS_TABLE => 'u', - SESSIONS_TABLE => 's', - ), - 'WHERE' => 'u.user_id = s.session_user_id - AND s.session_time >= ' . (time() - ($config['load_online_time'] * 60)) . - ((!$show_guests) ? ' AND s.session_user_id <> ' . ANONYMOUS : ''), - 'ORDER_BY' => $order_by, -); - -/** -* Modify the SQL query for getting the user data to display viewonline list -* -* @event core.viewonline_modify_sql -* @var array sql_ary The SQL array -* @var bool show_guests Do we display guests in the list -* @var int guest_counter Number of guests displayed -* @var array forum_data Array with forum data -* @since 3.1.0-a1 -* @changed 3.1.0-a2 Added vars guest_counter and forum_data -*/ -$vars = array('sql_ary', 'show_guests', 'guest_counter', 'forum_data'); -extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_sql', compact($vars))); - -$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary)); - -$prev_id = $prev_ip = $user_list = array(); -$logged_visible_online = $logged_hidden_online = $counter = 0; /** @var \phpbb\controller\helper $controller_helper */ $controller_helper = $phpbb_container->get('controller.helper'); -/** @var \phpbb\group\helper $group_helper */ -$group_helper = $phpbb_container->get('group_helper'); - -while ($row = $db->sql_fetchrow($result)) +if ($mode == 'whois') { - if ($row['user_id'] != ANONYMOUS && !isset($prev_id[$row['user_id']])) - { - $view_online = $s_user_hidden = false; - $user_colour = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : ''; - - $username_full = ($row['user_type'] != USER_IGNORE) ? get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) : '' . $row['username'] . ''; - - if (!$row['session_viewonline']) - { - $view_online = ($auth->acl_get('u_viewonline') || $row['user_id'] === $user->data['user_id']) ? true : false; - $logged_hidden_online++; - - $username_full = '' . $username_full . ''; - $s_user_hidden = true; - } - else - { - $view_online = true; - $logged_visible_online++; - } - - $prev_id[$row['user_id']] = 1; - - if ($view_online) - { - $counter++; - } - - if (!$view_online || $counter > $start + $config['topics_per_page'] || $counter <= $start) - { - continue; - } - } - else if ($show_guests && $row['user_id'] == ANONYMOUS && !isset($prev_ip[$row['session_ip']])) - { - $prev_ip[$row['session_ip']] = 1; - $guest_counter++; - $counter++; - - if ($counter > $start + $config['topics_per_page'] || $counter <= $start) - { - continue; - } - - $s_user_hidden = false; - $username_full = get_username_string('full', $row['user_id'], $user->lang['GUEST']); - } - else - { - continue; - } - - $on_page = $viewonline_helper->get_user_page($row['session_page']); - - switch ($on_page[1]) - { - case 'index': - $location = $user->lang['INDEX']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case $phpbb_adm_relative_path . 'index': - $location = $user->lang['ACP']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'posting': - case 'viewforum': - case 'viewtopic': - $forum_id = $row['session_forum_id']; - - if ($forum_id && $auth->acl_get('f_list', $forum_id)) - { - $location = ''; - $location_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id); - - if ($forum_data[$forum_id]['forum_type'] == FORUM_LINK) - { - $location = sprintf($user->lang['READING_LINK'], $forum_data[$forum_id]['forum_name']); - break; - } - - switch ($on_page[1]) - { - case 'posting': - preg_match('#mode=([a-z]+)#', $row['session_page'], $on_page); - $posting_mode = (!empty($on_page[1])) ? $on_page[1] : ''; - - switch ($posting_mode) - { - case 'reply': - case 'quote': - $location = sprintf($user->lang['REPLYING_MESSAGE'], $forum_data[$forum_id]['forum_name']); - break; - - default: - $location = sprintf($user->lang['POSTING_MESSAGE'], $forum_data[$forum_id]['forum_name']); - break; - } - break; - - case 'viewtopic': - $location = sprintf($user->lang['READING_TOPIC'], $forum_data[$forum_id]['forum_name']); - break; - - case 'viewforum': - $location = sprintf($user->lang['READING_FORUM'], $forum_data[$forum_id]['forum_name']); - break; - } - } - else - { - $location = $user->lang['INDEX']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - } - break; - - case 'search': - $location = $user->lang['SEARCHING_FORUMS']; - $location_url = append_sid("{$phpbb_root_path}search.$phpEx"); - break; - - case 'viewonline': - $location = $user->lang['VIEWING_ONLINE']; - $location_url = append_sid("{$phpbb_root_path}viewonline.$phpEx"); - break; - - case 'memberlist': - $location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx"); - - if (strpos($row['session_page'], 'mode=viewprofile') !== false) - { - $location = $user->lang['VIEWING_MEMBER_PROFILE']; - } - else if (strpos($row['session_page'], 'mode=contactadmin') !== false) - { - $location = $user->lang['VIEWING_CONTACT_ADMIN']; - $location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin'); - } - else - { - $location = $user->lang['VIEWING_MEMBERS']; - } - break; - - case 'mcp': - $location = $user->lang['VIEWING_MCP']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'ucp': - $location = $user->lang['VIEWING_UCP']; - - // Grab some common modules - $url_params = array( - 'mode=register' => 'VIEWING_REGISTER', - 'i=pm&mode=compose' => 'POSTING_PRIVATE_MESSAGE', - 'i=pm&' => 'VIEWING_PRIVATE_MESSAGES', - 'i=profile&' => 'CHANGING_PROFILE', - 'i=prefs&' => 'CHANGING_PREFERENCES', - ); - - foreach ($url_params as $param => $lang) - { - if (strpos($row['session_page'], $param) !== false) - { - $location = $user->lang[$lang]; - break; - } - } - - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'download/file': - $location = $user->lang['DOWNLOADING_FILE']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'report': - $location = $user->lang['REPORTING_POST']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - default: - $location = $user->lang['INDEX']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - - if ($row['session_page'] === 'app.' . $phpEx . '/help/faq' || - $row['session_page'] === 'app.' . $phpEx . '/help/bbcode') - { - $location = $user->lang['VIEWING_FAQ']; - $location_url = $controller_helper->route('phpbb_help_faq_controller'); - } - break; - } - - /** - * Overwrite the location's name and URL, which are displayed in the list - * - * @event core.viewonline_overwrite_location - * @var array on_page File name and query string - * @var array row Array with the users sql row - * @var string location Page name to displayed in the list - * @var string location_url Page url to displayed in the list - * @var array forum_data Array with forum data - * @since 3.1.0-a1 - * @changed 3.1.0-a2 Added var forum_data - */ - $vars = array('on_page', 'row', 'location', 'location_url', 'forum_data'); - extract($phpbb_dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars))); - - $template_row = array( - 'USERNAME' => $row['username'], - 'USERNAME_COLOUR' => $row['user_colour'], - 'USERNAME_FULL' => $username_full, - 'LASTUPDATE' => $user->format_date($row['session_time']), - 'FORUM_LOCATION' => $location, - 'USER_IP' => ($auth->acl_get('a_')) ? (($mode == 'lookup' && $session_id == $row['session_id']) ? gethostbyaddr($row['session_ip']) : $row['session_ip']) : '', - 'USER_BROWSER' => ($auth->acl_get('a_user')) ? $row['session_browser'] : '', - - 'U_USER_PROFILE' => ($row['user_type'] != USER_IGNORE) ? get_username_string('profile', $row['user_id'], '') : '', - 'U_USER_IP' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=lookup' . (($mode != 'lookup' || $row['session_id'] != $session_id) ? '&s=' . $row['session_id'] : '') . "&sg=$show_guests&start=$start&sk=$sort_key&sd=$sort_dir"), - 'U_WHOIS' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=whois&s=' . $row['session_id']), - 'U_FORUM_LOCATION' => $location_url, - - 'S_USER_HIDDEN' => $s_user_hidden, - 'S_GUEST' => ($row['user_id'] == ANONYMOUS) ? true : false, - 'S_USER_TYPE' => $row['user_type'], + $response = new RedirectResponse( + $controller_helper->route('phpbb_members_online_whois', array( + 's' => $session_id, + ), false), + 301 ); - - /** - * Modify viewonline template data before it is displayed in the list - * - * @event core.viewonline_modify_user_row - * @var array on_page File name and query string - * @var array row Array with the users sql row - * @var array forum_data Array with forum data - * @var array template_row Array with template variables for the user row - * @since 3.1.0-RC4 - */ - $vars = array('on_page', 'row', 'forum_data', 'template_row'); - extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_user_row', compact($vars))); - - $template->assign_block_vars('user_row', $template_row); -} -$db->sql_freeresult($result); -unset($prev_id, $prev_ip); - -$order_legend = ($config['legend_sort_groupname']) ? 'group_name' : 'group_legend'; -// Grab group details for legend display -if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) -{ - $sql = 'SELECT group_id, group_name, group_colour, group_type, group_legend - FROM ' . GROUPS_TABLE . ' - WHERE group_legend > 0 - ORDER BY ' . $order_legend . ' ASC'; } else { - $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type, g.group_legend - FROM ' . GROUPS_TABLE . ' g - LEFT JOIN ' . USER_GROUP_TABLE . ' ug - ON ( - g.group_id = ug.group_id - AND ug.user_id = ' . $user->data['user_id'] . ' - AND ug.user_pending = 0 - ) - WHERE g.group_legend > 0 - AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ') - ORDER BY g.' . $order_legend . ' ASC'; -} -$result = $db->sql_query($sql); - -$legend = ''; -while ($row = $db->sql_fetchrow($result)) -{ - if ($row['group_name'] == 'BOTS') - { - $legend .= (($legend != '') ? ', ' : '') . '' . $user->lang['G_BOTS'] . ''; - } - else - { - $legend .= (($legend != '') ? ', ' : '') . '' . $group_helper->get_name($row['group_name']) . ''; - } + $response = new RedirectResponse( + $controller_helper->route('phpbb_members_online', array( + 'mode' => $mode, + 's' => $session_id, + 'start' => $start, + 'sk' => $sort_key, + 'sd' => $sort_dir, + 'sg' => $show_guests, + ), false), + 301 + ); } -$db->sql_freeresult($result); - -// Refreshing the page every 60 seconds... -meta_refresh(60, append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&sk=$sort_key&sd=$sort_dir&start=$start")); - -$start = $pagination->validate_start($start, $config['topics_per_page'], $counter); -$base_url = append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&sk=$sort_key&sd=$sort_dir"); -$pagination->generate_template_pagination($base_url, 'pagination', 'start', $counter, $config['topics_per_page'], $start); - -$template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $user->lang('WHO_IS_ONLINE'), - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewonline.$phpEx"), -)); - -// Send data to template -$template->assign_vars(array( - 'TOTAL_REGISTERED_USERS_ONLINE' => $user->lang('REG_USERS_ONLINE', (int) $logged_visible_online, $user->lang('HIDDEN_USERS_ONLINE', (int) $logged_hidden_online)), - 'TOTAL_GUEST_USERS_ONLINE' => $user->lang('GUEST_USERS_ONLINE', (int) $guest_counter), - 'LEGEND' => $legend, - - 'U_SORT_USERNAME' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)), - 'U_SORT_UPDATED' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=b&sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)), - 'U_SORT_LOCATION' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=c&sd=' . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)), - - 'U_SWITCH_GUEST_DISPLAY' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sg=' . ((int) !$show_guests)), - 'L_SWITCH_GUEST_DISPLAY' => ($show_guests) ? $user->lang['HIDE_GUESTS'] : $user->lang['DISPLAY_GUESTS'], - 'S_SWITCH_GUEST_DISPLAY' => ($config['load_online_guests']) ? true : false, - 'S_VIEWONLINE' => true, -)); - -// We do not need to load the who is online box here. ;) -$config['load_online'] = false; - -// Output the page -page_header($user->lang['WHO_IS_ONLINE']); - -$template->set_filenames(array( - 'body' => 'viewonline_body.html') -); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); - -page_footer(); +$response->send(); diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 3c25c3b0372..31812042922 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -27,7 +27,7 @@ $auth->acl($user->data); // Initial var setup -$forum_id = $request->variable('f', 0); +$forum_id = 0; $topic_id = $request->variable('t', 0); $post_id = $request->variable('p', 0); $voted_id = $request->variable('vote_id', array('' => 0)); @@ -69,7 +69,8 @@ // Find topic id if user requested a newer or older topic if ($view && !$post_id) { - if (!$forum_id) + + if ($view == 'unread') { $sql = 'SELECT forum_id FROM ' . TOPICS_TABLE . " @@ -82,10 +83,7 @@ { trigger_error('NO_TOPIC'); } - } - if ($view == 'unread') - { // Get topic tracking info $topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id); $topic_last_read = (isset($topic_tracking_info[$topic_id])) ? $topic_tracking_info[$topic_id] : 0; @@ -142,12 +140,13 @@ } else { + $forum_id = $row['forum_id']; $sql = 'SELECT topic_id, forum_id FROM ' . TOPICS_TABLE . ' - WHERE forum_id = ' . $row['forum_id'] . " + WHERE forum_id = ' . $forum_id . " AND topic_moved_id = 0 AND topic_last_post_time $sql_condition {$row['topic_last_post_time']} - AND " . $phpbb_content_visibility->get_visibility_sql('topic', $row['forum_id']) . " + AND " . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id) . " ORDER BY topic_last_post_time $sql_ordering, topic_last_post_id $sql_ordering"; $result = $db->sql_query_limit($sql, 1); $row = $db->sql_fetchrow($result); @@ -255,7 +254,7 @@ // If post_id was submitted, we try at least to display the topic as a last resort... if ($post_id && $topic_id) { - redirect(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($forum_id) ? "&f=$forum_id" : ''))); + redirect(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id")); } trigger_error('NO_TOPIC'); @@ -263,6 +262,20 @@ $forum_id = (int) $topic_data['forum_id']; +/** + * Modify the forum ID to handle the correct display of viewtopic if needed + * + * @event core.viewtopic_modify_forum_id + * @var string forum_id forum ID + * @var array topic_data array of topic's data + * @since 3.2.5-RC1 + */ +$vars = array( + 'forum_id', + 'topic_data', +); +extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_forum_id', compact($vars))); + // If the request is missing the f parameter, the forum id in the user session data is 0 at the moment. // Let's fix that now so that the user can't hide from the forum's Who Is Online list. $user->page['forum'] = $forum_id; @@ -282,7 +295,7 @@ // If post_id was submitted, we try at least to display the topic as a last resort... if ($topic_id) { - redirect(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($forum_id) ? "&f=$forum_id" : ''))); + redirect(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id")); } trigger_error('NO_TOPIC'); @@ -342,6 +355,12 @@ // Setup look and feel $user->setup('viewtopic', $topic_data['forum_style']); +if ($view == 'print' && !$auth->acl_get('f_print', $forum_id)) +{ + send_status_line(403, 'Forbidden'); + trigger_error('NO_AUTH_PRINT_TOPIC'); +} + $overrides_f_read_check = false; $overrides_forum_password_check = false; $topic_tracking_info = isset($topic_tracking_info) ? $topic_tracking_info : null; @@ -433,6 +452,38 @@ $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; +/** +* Event to add new sorting options +* +* @event core.viewtopic_gen_sort_selects_before +* @var array limit_days Limit results by time +* @var array sort_by_text Language strings for sorting options +* @var array sort_by_sql SQL conditions for sorting options +* @var array join_user_sql SQL joins required for sorting options +* @var int sort_days User selected sort days +* @var string sort_key User selected sort key +* @var string sort_dir User selected sort direction +* @var string s_limit_days Initial value of limit days selectbox +* @var string s_sort_key Initial value of sort key selectbox +* @var string s_sort_dir Initial value of sort direction selectbox +* @var string u_sort_param Initial value of sorting form action +* @since 3.2.8-RC1 +*/ +$vars = array( + 'limit_days', + 'sort_by_text', + 'sort_by_sql', + 'join_user_sql', + 'sort_days', + 'sort_key', + 'sort_dir', + 's_limit_days', + 's_sort_key', + 's_sort_dir', + 'u_sort_param', +); +extract($phpbb_dispatcher->trigger_event('core.viewtopic_gen_sort_selects_before', compact($vars))); + gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param, $default_sort_days, $default_sort_key, $default_sort_dir); // Obtain correct post count and ordering SQL if user has @@ -478,7 +529,7 @@ $start = $pagination->validate_start($start, $config['posts_per_page'], $total_posts); // General Viewtopic URL for return links -$viewtopic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start") . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($highlight_match) ? "&hilit=$highlight" : '')); +$viewtopic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($start == 0) ? '' : "&start=$start") . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($highlight_match) ? "&hilit=$highlight" : '')); // Are we watching this topic? $s_watching_topic = array( @@ -593,9 +644,7 @@ 'start' => $start, 'quickmod' => 1, 'redirect' => urlencode(str_replace('&', '&', $viewtopic_url)), - ), - true, - $user->session_id + ) ); $quickmod_array = array( @@ -690,7 +739,7 @@ } // If we've got a hightlight set pass it on to pagination. -$base_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($highlight_match) ? "&hilit=$highlight" : '')); +$base_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($highlight_match) ? "&hilit=$highlight" : '')); /** * Event to modify data before template variables are being assigned @@ -739,7 +788,7 @@ 'TOPIC_AUTHOR' => get_username_string('username', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']), 'TOTAL_POSTS' => $user->lang('VIEW_TOPIC_POSTS', (int) $total_posts), - 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=topic_view&f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start") . ((strlen($u_sort_param)) ? "&$u_sort_param" : ''), true, $user->session_id) : '', + 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=topic_view&t=$topic_id" . (($start == 0) ? '' : "&start=$start") . ((strlen($u_sort_param)) ? "&$u_sort_param" : '')) : '', 'MODERATORS' => (isset($forum_moderators[$forum_id]) && count($forum_moderators[$forum_id])) ? implode($user->lang['COMMA_SEPARATOR'], $forum_moderators[$forum_id]) : '', 'POST_IMG' => ($topic_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', 'FORUM_LOCKED') : $user->img('button_topic_new', 'POST_NEW_TOPIC'), @@ -753,7 +802,6 @@ 'SEARCH_IMG' => $user->img('icon_user_search', 'SEARCH_USER_POSTS'), 'PM_IMG' => $user->img('icon_contact_pm', 'SEND_PRIVATE_MESSAGE'), 'EMAIL_IMG' => $user->img('icon_contact_email', 'SEND_EMAIL'), - 'JABBER_IMG' => $user->img('icon_contact_jabber', 'JABBER') , 'REPORT_IMG' => $user->img('icon_post_report', 'REPORT_POST'), 'REPORTED_IMG' => $user->img('icon_topic_reported', 'POST_REPORTED'), 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'), @@ -764,7 +812,7 @@ 'S_SELECT_SORT_KEY' => $s_sort_key, 'S_SELECT_SORT_DAYS' => $s_limit_days, 'S_SINGLE_MODERATOR' => (!empty($forum_moderators[$forum_id]) && count($forum_moderators[$forum_id]) > 1) ? false : true, - 'S_TOPIC_ACTION' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start")), + 'S_TOPIC_ACTION' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($start == 0) ? '' : "&start=$start")), 'S_MOD_ACTION' => $s_quickmod_action, 'L_RETURN_TO_FORUM' => $user->lang('RETURN_TO', $topic_data['forum_name']), @@ -778,13 +826,13 @@ 'S_DISPLAY_REPLY_INFO' => ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_reply', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false, 'S_ENABLE_FEEDS_TOPIC' => ($config['feed_topic'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $topic_data['forum_options'])) ? true : false, - 'U_TOPIC' => "{$server_path}viewtopic.$phpEx?f=$forum_id&t=$topic_id", + 'U_TOPIC' => "{$server_path}viewtopic.$phpEx?t=$topic_id", 'U_FORUM' => $server_path, - 'U_VIEW_TOPIC' => $viewtopic_url, + 'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($start == 0) ? '' : "&start=$start") . (strlen($u_sort_param) ? "&$u_sort_param" : '')), 'U_CANONICAL' => generate_board_url() . '/' . append_sid("viewtopic.$phpEx", "t=$topic_id" . (($start) ? "&start=$start" : ''), true, ''), 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), - 'U_VIEW_OLDER_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&view=previous"), - 'U_VIEW_NEWER_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&view=next"), + 'U_VIEW_OLDER_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id&view=previous"), + 'U_VIEW_NEWER_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id&view=next"), 'U_PRINT_TOPIC' => ($auth->acl_get('f_print', $forum_id)) ? $viewtopic_url . '&view=print' : '', 'U_EMAIL_TOPIC' => ($auth->acl_get('f_email', $forum_id) && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=email&t=$topic_id") : '', @@ -800,8 +848,8 @@ 'S_BOOKMARKED_TOPIC' => ($user->data['is_registered'] && $config['allow_bookmarks'] && $topic_data['bookmarked']) ? true : false, 'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=post&f=$forum_id") : '', - 'U_POST_REPLY_TOPIC' => ($auth->acl_get('f_reply', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=reply&f=$forum_id&t=$topic_id") : '', - 'U_BUMP_TOPIC' => (bump_topic_allowed($forum_id, $topic_data['topic_bumped'], $topic_data['topic_last_post_time'], $topic_data['topic_poster'], $topic_data['topic_last_poster_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=bump&f=$forum_id&t=$topic_id&hash=" . generate_link_hash("topic_$topic_id")) : '') + 'U_POST_REPLY_TOPIC' => ($auth->acl_get('f_reply', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=reply&t=$topic_id") : '', + 'U_BUMP_TOPIC' => (bump_topic_allowed($forum_id, $topic_data['topic_bumped'], $topic_data['topic_last_post_time'], $topic_data['topic_poster'], $topic_data['topic_last_poster_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=bump&t=$topic_id&hash=" . generate_link_hash("topic_$topic_id")) : '') ); // Does this topic contain a poll? @@ -895,7 +943,7 @@ if (!count($voted_id) || count($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id) || !check_form_key('posting')) { - $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start")); + $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($start == 0) ? '' : "&start=$start")); meta_refresh(5, $redirect_url); if (!count($voted_id)) @@ -982,7 +1030,7 @@ //, topic_last_post_time = ' . time() . " -- for bumping topics with new votes, ignore for now $db->sql_query($sql); - $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start")); + $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($start == 0) ? '' : "&start=$start")); $message = $user->lang['VOTE_SUBMITTED'] . '

      ' . sprintf($user->lang['RETURN_TOPIC'], '', ''); if ($request->is_ajax()) @@ -998,6 +1046,29 @@ 'total_votes' => array_sum($vote_counts), 'can_vote' => !count($valid_user_votes) || ($auth->acl_get('f_votechg', $forum_id) && $topic_data['poll_vote_change']), ); + + /** + * Event to manipulate the poll data sent by AJAX response + * + * @event core.viewtopic_modify_poll_ajax_data + * @var array data JSON response data + * @var array valid_user_votes Valid user votes + * @var array vote_counts Vote counts + * @var int forum_id Forum ID + * @var array topic_data Topic data + * @var array poll_info Array with the poll information + * @since 3.2.4-RC1 + */ + $vars = array( + 'data', + 'valid_user_votes', + 'vote_counts', + 'forum_id', + 'topic_data', + 'poll_info', + ); + extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_poll_ajax_data', compact($vars))); + $json_response = new \phpbb\json_response(); $json_response->send($data); } @@ -1104,6 +1175,9 @@ unset($poll_end, $poll_info, $poll_options_template_data, $poll_template_data, $voted_id); } +/** @var \phpbb\avatar\helper $avatar_helper */ +$avatar_helper = $phpbb_container->get('avatar.helper'); + // If the user is trying to reach the second half of the topic, fetch it starting from the end $store_reverse = false; $sql_limit = $config['posts_per_page']; @@ -1148,6 +1222,29 @@ " . (($join_user_sql[$sort_key]) ? 'AND u.user_id = p.poster_id': '') . " $limit_posts_time ORDER BY $sql_sort_order"; + +/** +* Event to modify the SQL query that gets post_list +* +* @event core.viewtopic_modify_post_list_sql +* @var string sql The SQL query to generate the post_list +* @var int sql_limit The number of posts the query fetches +* @var int sql_start The index the query starts to fetch from +* @var string sort_key Key the posts are sorted by +* @var string sort_days Display posts of previous x days +* @var int forum_id Forum ID +* @since 3.2.4-RC1 +*/ +$vars = array( + 'sql', + 'sql_limit', + 'sql_start', + 'sort_key', + 'sort_days', + 'forum_id', +); +extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_post_list_sql', compact($vars))); + $result = $db->sql_query_limit($sql, $sql_limit, $sql_start); $i = ($store_reverse) ? $sql_limit - 1 : 0; @@ -1319,13 +1416,12 @@ 'sig_bbcode_bitfield' => '', 'online' => false, - 'avatar' => ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '', + 'avatar' => ($user->optionget('viewavatars')) ? $avatar_helper->get_user_avatar($row) : [], 'rank_title' => '', 'rank_image' => '', 'rank_image_src' => '', 'pm' => '', 'email' => '', - 'jabber' => '', 'search' => '', 'age' => '', @@ -1383,7 +1479,7 @@ 'viewonline' => $row['user_allow_viewonline'], 'allow_pm' => $row['user_allow_pm'], - 'avatar' => ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '', + 'avatar' => ($user->optionget('viewavatars')) ? $avatar_helper->get_user_avatar($row) : [], 'age' => '', 'rank_title' => '', @@ -1395,7 +1491,6 @@ 'contact_user' => $user->lang('CONTACT_USER', get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['username'])), 'online' => false, - 'jabber' => ($config['jab_enable'] && $row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=jabber&u=$poster_id") : '', 'search' => ($config['load_search'] && $auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&sr=posts") : '', 'author_full' => get_username_string('full', $poster_id, $row['username'], $row['user_colour']), @@ -1833,7 +1928,7 @@ $s_cannot_edit = !$auth->acl_get('f_edit', $forum_id) || $user->data['user_id'] != $poster_id; $s_cannot_edit_time = $config['edit_time'] && $row['post_time'] <= time() - ($config['edit_time'] * 60); - $s_cannot_edit_locked = $topic_data['topic_status'] == ITEM_LOCKED || $row['post_edit_locked']; + $s_cannot_edit_locked = ($topic_data['topic_status'] == ITEM_LOCKED && !$auth->acl_get('m_lock', $forum_id)) || $row['post_edit_locked']; $s_cannot_delete = $user->data['user_id'] != $poster_id || ( !$auth->acl_get('f_delete', $forum_id) && @@ -1928,7 +2023,6 @@ $u_pm = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&action=quotepost&p=' . $row['post_id']); } - // $post_row = array( 'POST_AUTHOR_FULL' => ($poster_id != ANONYMOUS) ? $user_cache[$poster_id]['author_full'] : get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), 'POST_AUTHOR_COLOUR' => ($poster_id != ANONYMOUS) ? $user_cache[$poster_id]['author_colour'] : get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), @@ -1940,12 +2034,12 @@ 'RANK_IMG_SRC' => $user_cache[$poster_id]['rank_image_src'], 'POSTER_JOINED' => $user_cache[$poster_id]['joined'], 'POSTER_POSTS' => $user_cache[$poster_id]['posts'], - 'POSTER_AVATAR' => $user_cache[$poster_id]['avatar'], 'POSTER_WARNINGS' => $auth->acl_get('m_warn') ? $user_cache[$poster_id]['warnings'] : '', 'POSTER_AGE' => $user_cache[$poster_id]['age'], 'CONTACT_USER' => $user_cache[$poster_id]['contact_user'], 'POST_DATE' => $user->format_date($row['post_time'], false, ($view == 'print') ? true : false), + 'POST_DATE_RFC3339' => gmdate(DATE_RFC3339, $row['post_time']), 'POST_SUBJECT' => $row['post_subject'], 'MESSAGE' => $message, 'SIGNATURE' => ($row['enable_sig']) ? $user_cache[$poster_id]['sig'] : '', @@ -1963,26 +2057,26 @@ 'ONLINE_IMG' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')), 'S_ONLINE' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? false : (($user_cache[$poster_id]['online']) ? true : false), - 'U_EDIT' => ($edit_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f=$forum_id&p={$row['post_id']}") : '', - 'U_QUOTE' => ($quote_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=quote&f=$forum_id&p={$row['post_id']}") : '', - 'U_INFO' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&f=$forum_id&p=" . $row['post_id'], true, $user->session_id) : '', - 'U_DELETE' => ($delete_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=' . (($softdelete_allowed) ? 'soft_delete' : 'delete') . "&f=$forum_id&p={$row['post_id']}") : '', + 'U_EDIT' => ($edit_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&p={$row['post_id']}") : '', + 'U_QUOTE' => ($quote_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=quote&p={$row['post_id']}") : '', + 'U_INFO' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&p=" . $row['post_id']) : '', + 'U_DELETE' => ($delete_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=' . (($softdelete_allowed) ? 'soft_delete' : 'delete') . "&p={$row['post_id']}") : '', 'U_SEARCH' => $user_cache[$poster_id]['search'], 'U_PM' => $u_pm, 'U_EMAIL' => $user_cache[$poster_id]['email'], - 'U_JABBER' => $user_cache[$poster_id]['jabber'], - 'U_APPROVE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p={$row['post_id']}&f=$forum_id&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url . '&p=' . $row['post_id'] . '#p' . $row['post_id']))), + 'U_APPROVE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p={$row['post_id']}&f={$row['forum_id']}&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url . '&p=' . $row['post_id'] . '#p' . $row['post_id']))), 'U_REPORT' => ($auth->acl_get('f_report', $forum_id)) ? $phpbb_container->get('controller.helper')->route('phpbb_report_post_controller', array('id' => $row['post_id'])) : '', - 'U_MCP_REPORT' => ($auth->acl_get('m_report', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', - 'U_MCP_APPROVE' => ($auth->acl_get('m_approve', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', - 'U_MCP_RESTORE' => ($auth->acl_get('m_approve', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_data['topic_visibility'] != ITEM_DELETED) ? 'deleted_posts' : 'deleted_topics') . '&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', + 'U_MCP_REPORT' => ($auth->acl_get('m_report', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&p=' . $row['post_id']) : '', + 'U_MCP_APPROVE' => ($auth->acl_get('m_approve', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&p=' . $row['post_id']) : '', + 'U_MCP_RESTORE' => ($auth->acl_get('m_approve', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_data['topic_visibility'] != ITEM_DELETED) ? 'deleted_posts' : 'deleted_topics') . '&p=' . $row['post_id']) : '', 'U_MINI_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'], + 'U_MINI_POST_VIEW' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '&view=show#p' . $row['post_id'], 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, - 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id, true, $user->session_id) : '', - 'U_WARN' => ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', + 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id) : '', + 'U_WARN' => ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id']) : '', 'POST_ID' => $row['post_id'], 'POST_NUMBER' => $i + $start + 1, @@ -1993,6 +2087,7 @@ 'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false, 'S_MULTIPLE_ATTACHMENTS' => !empty($attachments[$row['post_id']]) && count($attachments[$row['post_id']]) > 1, 'S_POST_UNAPPROVED' => ($row['post_visibility'] == ITEM_UNAPPROVED || $row['post_visibility'] == ITEM_REAPPROVE) ? true : false, + 'S_CAN_APPROVE' => $auth->acl_get('m_approve', $forum_id), 'S_POST_DELETED' => ($row['post_visibility'] == ITEM_DELETED) ? true : false, 'L_POST_DELETED_MESSAGE' => $l_deleted_message, 'S_POST_REPORTED' => ($row['post_reported'] && $auth->acl_get('m_report', $forum_id)) ? true : false, @@ -2007,10 +2102,14 @@ 'S_IGNORE_POST' => ($row['foe']) ? true : false, 'L_IGNORE_POST' => ($row['foe']) ? sprintf($user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '', 'S_POST_HIDDEN' => $row['hide_post'], - 'L_POST_DISPLAY' => ($row['hide_post']) ? $user->lang('POST_DISPLAY', '', '') : '', 'S_DELETE_PERMANENT' => $permanent_delete_allowed, ); + if ($user_cache[$poster_id]['avatar']) + { + $post_row += $avatar_helper->get_template_vars($user_cache[$poster_id]['avatar'], 'POSTER_'); + } + $user_poster_data = $user_cache[$poster_id]; $current_row_number = $i; @@ -2069,18 +2168,13 @@ array( 'ID' => 'pm', 'NAME' => $user->lang['SEND_PRIVATE_MESSAGE'], - 'U_CONTACT' => $u_pm, + 'U_CONTACT' => $post_row['U_PM'], ), array( 'ID' => 'email', 'NAME' => $user->lang['SEND_EMAIL'], 'U_CONTACT' => $user_cache[$poster_id]['email'], ), - array( - 'ID' => 'jabber', - 'NAME' => $user->lang['JABBER'], - 'U_CONTACT' => $user_cache[$poster_id]['jabber'], - ), ); foreach ($contact_fields as $field) @@ -2205,7 +2299,7 @@ else if (isset($topic_tracking_info[$topic_id]) && $topic_data['topic_last_post_time'] > $topic_tracking_info[$topic_id]) { $template->assign_vars(array( - 'U_VIEW_UNREAD_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&view=unread") . '#unread', + 'U_VIEW_UNREAD_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id&view=unread") . '#unread', )); } } @@ -2223,7 +2317,7 @@ else if (!$last_page) { $template->assign_vars(array( - 'U_VIEW_UNREAD_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&view=unread") . '#unread', + 'U_VIEW_UNREAD_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id&view=unread") . '#unread', )); } } @@ -2249,7 +2343,6 @@ $qr_hidden_fields = array( 'topic_cur_post_id' => (int) $topic_data['topic_last_post_id'], - 'lastclick' => (int) time(), 'topic_id' => (int) $topic_data['topic_id'], 'forum_id' => (int) $forum_id, ); @@ -2262,12 +2355,25 @@ ($s_notify) ? $qr_hidden_fields['notify'] = 1 : true; ($topic_data['topic_status'] == ITEM_LOCKED) ? $qr_hidden_fields['lock_topic'] = 1 : true; - $template->assign_vars(array( + $tpl_ary = [ 'S_QUICK_REPLY' => true, - 'U_QR_ACTION' => append_sid("{$phpbb_root_path}posting.$phpEx", "mode=reply&f=$forum_id&t=$topic_id"), + 'U_QR_ACTION' => append_sid("{$phpbb_root_path}posting.$phpEx", "mode=reply&t=$topic_id"), 'QR_HIDDEN_FIELDS' => build_hidden_fields($qr_hidden_fields), 'SUBJECT' => 'Re: ' . censor_text($topic_data['topic_title']), - )); + ]; + + /** + * Event after the quick-reply has been setup + * + * @event core.viewtopic_modify_quick_reply_template_vars + * @var array tpl_ary Array with template data + * @var array topic_data Array with topic data + * @since 3.2.9-RC1 + */ + $vars = ['tpl_ary', 'topic_data']; + extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_quick_reply_template_vars', compact($vars))); + + $template->assign_vars($tpl_ary); } } // now I have the urge to wash my hands :( diff --git a/phpBB/web.config b/phpBB/web.config index d0a3cb33fe3..86ea774d8ec 100644 --- a/phpBB/web.config +++ b/phpBB/web.config @@ -28,6 +28,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 71a94da89fb..6240baa3208 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,45 +1,41 @@ - - - - - ./tests - ./tests/functional - ./tests/lint_test.php - ./tests/ui - - - ./tests/functional - - - ./tests/lint_test.php - - - ./tests/ui - - - - - - slow - - - - - - ./phpBB/includes/ - ./phpBB/phpbb/ - - + + + + ./tests + ./tests/functional + ./tests/lint_test.php + + + ./tests/functional + + + ./tests/lint_test.php + + + + + slow + + + + + ./phpBB/ + ./tests/ + + + ./phpBB/vendor/ + ./phpBB/cache/ + ./phpBB/develop/ + ./phpBB/store/ + + diff --git a/psalm.xml b/psalm.xml new file mode 100644 index 00000000000..2bb877d330b --- /dev/null +++ b/psalm.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md index 56f28180781..d6406b506d3 100644 --- a/tests/RUNNING_TESTS.md +++ b/tests/RUNNING_TESTS.md @@ -30,11 +30,9 @@ Some of the functionality in phpBB and/or the test suite uses additional PHP extensions. If these extensions are not loaded, respective tests will be skipped: -- apc (APC cache driver, php5 only) - apcu (APCu cache driver - native API, php7+) - apcu_bc, apcu (APCu cache driver - APC API, php7+) - bz2 (compress tests) -- mysql, pdo_mysql (MySQL database driver) - mysqli, pdo_mysql (MySQLi database driver) - pcntl (flock class) - pdo (any database tests) @@ -111,6 +109,21 @@ Or via environment variables as follows: $ PHPBB_TEST_REDIS_HOST=localhost PHPBB_TEST_REDIS_PORT=6379 phpunit +Memcached +--------- + +In order to run tests for the memcached cache driver, at least one of memcached +host or port must be specified in the test configuration. This can be done via +test_config.php as follows: + + Acp_board_valid'), - array('acp_board_invalid', ''), - ); + return [ + [ + 'acp_board_valid', + [ + 'options' => [ + 0 => [ + 'value' => 'acp_board_valid', + 'label' => 'Acp_board_valid', + 'selected' => true, + 'data' => [ + 'toggle-setting' => '#auth_acp_board_valid_settings', + ], + ] + ], + ] + ], + [ + 'acp_board_invalid', + [ + 'options' => [ + 0 => [ + 'value' => 'acp_board_valid', + 'label' => 'Acp_board_valid', + 'selected' => false, + 'data' => [ + 'toggle-setting' => '#auth_acp_board_valid_settings', + ], + ] + ], + ] + ], + ]; } - public function setUp() + protected function setUp(): void { parent::setUp(); - global $phpbb_container; + global $phpbb_container, $config; $phpbb_container = new phpbb_mock_container_builder(); + $config = new \phpbb\config\config([]); - $phpbb_container->set('auth.provider_collection', array( - 'auth.provider.acp_board_valid' => new phpbb\auth\provider\acp\board_valid, - 'auth.provider.acp_board_invalid' => new phpbb\auth\provider\acp\board_invalid, - )); + // Create auth provider service collection + $auth_provider_collection = new \phpbb\auth\provider_collection($phpbb_container, $config); + $phpbb_container->set('auth.provider_collection', $auth_provider_collection); + + // Create auth provider services + $phpbb_container->set('auth.provider.acp_board_valid', new phpbb\auth\provider\acp\board_valid); + $phpbb_container->set('auth.provider.acp_board_invalid', new phpbb\auth\provider\acp\board_invalid); + + // Add auth provider servives to the service collection + $auth_provider_collection->add('auth.provider.acp_board_valid'); + $auth_provider_collection->add('auth.provider.acp_board_invalid'); $this->acp_board = new acp_board(); } diff --git a/tests/attachment/delete_test.php b/tests/attachment/delete_test.php index 5ea9f26ea08..73b7d755396 100644 --- a/tests/attachment/delete_test.php +++ b/tests/attachment/delete_test.php @@ -11,7 +11,7 @@ * */ -require_once(dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php'); +require_once(__DIR__ . '/../../phpBB/includes/functions_admin.php'); class phpbb_attachment_delete_test extends \phpbb_database_test_case { @@ -21,45 +21,39 @@ class phpbb_attachment_delete_test extends \phpbb_database_test_case /** @var \phpbb\db\driver\driver_interface */ protected $db; - /** @var \phpbb\filesystem\filesystem */ - protected $filesystem; + /** @var \phpbb\event\dispatcher_interface */ + protected $dispatcher; /** @var \phpbb\attachment\resync */ protected $resync; + /** @var \phpbb\storage\storage */ + protected $storage; + /** @var \phpbb\attachment\delete */ protected $attachment_delete; - protected $phpbb_root_path; - public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/resync.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/resync.xml'); } - public function setUp() + protected function setUp(): void { - global $db, $phpbb_root_path; - parent::setUp(); $this->config = new \phpbb\config\config(array()); $this->db = $this->new_dbal(); - $db = $this->db; $this->resync = new \phpbb\attachment\resync($this->db); - $this->filesystem = $this->createMock('\phpbb\filesystem\filesystem', array('remove', 'exists')); - $this->filesystem->expects($this->any()) - ->method('remove') - ->willReturn(false); - $this->filesystem->expects($this->any()) + $this->storage = $this->createMock('\phpbb\storage\storage'); + $this->storage->expects($this->any()) ->method('exists') ->willReturn(true); - $this->phpbb_root_path = $phpbb_root_path; $this->dispatcher = new \phpbb_mock_event_dispatcher(); - $this->attachment_delete = new \phpbb\attachment\delete($this->config, $this->db, $this->dispatcher, $this->filesystem, $this->resync, $phpbb_root_path); + $this->attachment_delete = new \phpbb\attachment\delete($this->config, $this->db, $this->dispatcher, $this->resync, $this->storage); } - public function data_attachment_delete() + public static function data_attachment_delete() { return array( array('attach', '', false, false), @@ -89,39 +83,37 @@ public function test_attachment_delete($mode, $ids, $resync, $expected) $this->assertSame($expected, $this->attachment_delete->delete($mode, $ids, $resync)); } - public function data_attachment_unlink() + public static function data_attachment_unlink() { return array( - array(true, true, true), - array(true, false, false), - array(true, true, false, true), + array(true, true), + array(false, false), + array(true, false, true), ); } /** * @dataProvider data_attachment_unlink */ - public function test_attachment_delete_success($remove_success, $exists_success, $expected, $throw_exception = false) + public function test_attachment_delete_success($exists_success, $expected, $throw_exception = false) { - $this->filesystem = $this->createMock('\phpbb\filesystem\filesystem', array('remove', 'exists')); + $this->storage = $this->createMock('\phpbb\storage\storage'); if ($throw_exception) { - $this->filesystem->expects($this->any()) - ->method('remove') - ->willThrowException(new \phpbb\filesystem\exception\filesystem_exception);; + $this->storage->expects($this->any()) + ->method('delete') + ->willThrowException(new \phpbb\storage\exception\storage_exception); } else { - $this->filesystem->expects($this->any()) - ->method('remove') - ->willReturn($remove_success); + $this->storage->expects($this->any()) + ->method('delete'); } - - $this->filesystem->expects($this->any()) + $this->storage->expects($this->any()) ->method('exists') ->willReturn($exists_success); - $this->attachment_delete = new \phpbb\attachment\delete($this->config, $this->db, $this->dispatcher, $this->filesystem, $this->resync, $this->phpbb_root_path); + $this->attachment_delete = new \phpbb\attachment\delete($this->config, $this->db, $this->dispatcher, $this->resync, $this->storage); $this->assertSame($expected, $this->attachment_delete->unlink_attachment('foobar')); } } diff --git a/tests/attachment/fixtures/resync.xml b/tests/attachment/fixtures/resync.xml index af04701b4a5..b06d2db3e2a 100644 --- a/tests/attachment/fixtures/resync.xml +++ b/tests/attachment/fixtures/resync.xml @@ -58,7 +58,6 @@ cat_idgroup_id - download_modeupload_iconmax_filesizeallow_group @@ -66,7 +65,6 @@ allowed_forumsgroup_name - 1 1 1 diff --git a/tests/attachment/manager_test.php b/tests/attachment/manager_test.php index 47d7f38b1db..88e39ed6710 100644 --- a/tests/attachment/manager_test.php +++ b/tests/attachment/manager_test.php @@ -17,19 +17,19 @@ class phpbb_attachment_manager_test extends \phpbb_test_case protected $resync; protected $upload; - public function setUp() + protected function setUp(): void { $this->delete = $this->getMockBuilder('\phpbb\attachment\delete') ->disableOriginalConstructor() - ->setMethods(['delete', 'unlink_attachment']) + ->onlyMethods(['delete', 'unlink_attachment']) ->getMock(); $this->resync = $this->getMockBuilder('\phpbb\attachment\resync') ->disableOriginalConstructor() - ->setMethods(['resync']) + ->onlyMethods(['resync']) ->getMock(); $this->upload = $this->getMockBuilder('\phpbb\attachment\upload') ->disableOriginalConstructor() - ->setMethods(['upload']) + ->onlyMethods(['upload']) ->getMock(); } @@ -38,7 +38,7 @@ protected function get_manager() return new \phpbb\attachment\manager($this->delete, $this->resync, $this->upload); } - public function data_manager() + public static function data_manager() { return array( array( diff --git a/tests/attachment/resync_test.php b/tests/attachment/resync_test.php index f882af9ae5b..2168d68cf4b 100644 --- a/tests/attachment/resync_test.php +++ b/tests/attachment/resync_test.php @@ -21,10 +21,10 @@ class phpbb_attachment_resync_test extends \phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/resync.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/resync.xml'); } - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -32,7 +32,7 @@ public function setUp() $this->resync = new \phpbb\attachment\resync($this->db); } - public function data_resync() + public static function data_resync() { return array( array('', array(1), 'post_id', POSTS_TABLE, array('post_attachment' => '1'), array('post_attachment' => '1')), diff --git a/tests/attachment/upload_test.php b/tests/attachment/upload_test.php index 6aaae6ad61e..76237021ec9 100644 --- a/tests/attachment/upload_test.php +++ b/tests/attachment/upload_test.php @@ -11,7 +11,7 @@ * */ -require_once(dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php'); +require_once(__DIR__ . '/../../phpBB/includes/functions_posting.php'); class phpbb_attachment_upload_test extends \phpbb_database_test_case { @@ -39,20 +39,24 @@ class phpbb_attachment_upload_test extends \phpbb_database_test_case /** @var \phpbb\plupload\plupload */ protected $plupload; + /** @var \phpbb\storage\storage */ + protected $storage; + /** @var \phpbb\user */ protected $user; - /** @var string phpBB root path */ - protected $phpbb_root_path; - /** @var \phpbb\db\driver\driver_interface */ protected $db; /** @var \phpbb\attachment\upload */ protected $upload; + /** @var \phpbb\filesystem\filesystem */ private $filesystem; + /** @var \phpbb\filesystem\temp */ + protected $temp; + /** @var \Symfony\Component\DependencyInjection\ContainerInterface */ protected $container; @@ -62,12 +66,18 @@ class phpbb_attachment_upload_test extends \phpbb_database_test_case /** @var \bantu\IniGetWrapper\IniGetWrapper */ protected $php_ini; + /** @var \phpbb\request\request */ + protected $request; + + /** @var string */ + protected $phpbb_root_path; + public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/resync.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/resync.xml'); } - public function setUp() + protected function setUp(): void { global $config, $phpbb_root_path, $phpEx; @@ -75,20 +85,21 @@ public function setUp() $this->auth = new \phpbb\auth\auth(); $this->config = new \phpbb\config\config(array( - 'upload_path' => '', 'img_create_thumbnail' => true, )); $config = $this->config; + $this->phpbb_root_path = $phpbb_root_path; $this->db = $this->new_dbal(); - $this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\dummy(), $this->config, $this->db, $phpbb_root_path, $phpEx); + $this->phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\dummy(), $this->config, $this->db, $this->phpbb_dispatcher, $phpbb_root_path, $phpEx); $this->request = $this->createMock('\phpbb\request\request'); $this->filesystem = new \phpbb\filesystem\filesystem(); $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); $this->php_ini = new \bantu\IniGetWrapper\IniGetWrapper; $guessers = array( - new \Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser(), - new \Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser(), + new \Symfony\Component\Mime\FileinfoMimeTypeGuesser(), + new \Symfony\Component\Mime\FileBinaryMimeTypeGuesser(), new \phpbb\mimetype\content_guesser(), new \phpbb\mimetype\extension_guesser(), ); @@ -96,27 +107,27 @@ public function setUp() $guessers[3]->set_priority(-2); $this->mimetype_guesser = new \phpbb\mimetype\guesser($guessers); $this->plupload = new \phpbb\plupload\plupload($phpbb_root_path, $this->config, $this->request, new \phpbb\user($this->language, '\phpbb\datetime'), $this->php_ini, $this->mimetype_guesser); + + $this->storage = $this->createMock('\phpbb\storage\storage'); + $this->storage->expects($this->any()) + ->method('free_space') + ->willReturn(1024*1024); // 1gb + $factory_mock = $this->getMockBuilder('\phpbb\files\factory') ->disableOriginalConstructor() ->getMock(); $factory_mock->expects($this->any()) ->method('get') - ->willReturn(new \phpbb\files\filespec( - $this->filesystem, + ->willReturn(new \phpbb\files\filespec_storage( $this->language, - $this->php_ini, new \FastImageSize\FastImageSize(), - $this->phpbb_root_path, $this->mimetype_guesser )); - $this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx); - $this->container->set('files.filespec', new \phpbb\files\filespec( - $this->filesystem, + $this->container = new phpbb_mock_container_builder(); + $this->container->set('files.filespec_storage', new \phpbb\files\filespec_storage( $this->language, - $this->php_ini, new \FastImageSize\FastImageSize(), - $phpbb_root_path, new \phpbb\mimetype\guesser(array( 'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(), )))); @@ -127,17 +138,18 @@ public function setUp() $this->plupload, $this->request )); - $this->container->set('files.types.local', new \phpbb\files\types\local( + $this->container->set('files.types.local_storage', new \phpbb\files\types\local_storage( $factory_mock, $this->language, $this->php_ini, $this->request )); $this->factory = new \phpbb\files\factory($this->container); - $this->files_upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $this->files_upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $this->phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $this->temp = new \phpbb\filesystem\temp($this->filesystem, ''); $this->user = new \phpbb\user($this->language, '\phpbb\datetime'); - + $this->user->data['user_id'] = ANONYMOUS; $this->upload = new \phpbb\attachment\upload( $this->auth, @@ -145,15 +157,15 @@ public function setUp() $this->config, $this->files_upload, $this->language, - $this->mimetype_guesser, $this->phpbb_dispatcher, $this->plupload, - $this->user, - $this->phpbb_root_path + $this->storage, + $this->temp, + $this->user ); } - public function data_upload() + public static function data_upload() { return array( array('foobar', 1, false, @@ -181,7 +193,14 @@ public function data_upload() ) ), array('foobar', 1, true, - array(), + // Instead of setting to false or empty array, set default filedata array + // as otherwise it throws PHP undefined array key warnings + // in different file upload related services + array( + 'realname' => null, + 'type' => null, + 'size' => null, + ), array( 'error' => array( 'NOT_UPLOADED', @@ -205,7 +224,7 @@ public function test_upload($form_name, $forum_id, $local, $filedata, $expected) public function test_init_error() { - $filespec = $this->getMockBuilder('\phpbb\files\filespec') + $filespec = $this->getMockBuilder('\phpbb\files\filespec_storage') ->disableOriginalConstructor() ->getMock(); $filespec->expects($this->any()) @@ -217,14 +236,14 @@ public function test_init_error() $filespec->expects($this->any()) ->method('set_upload_ary') ->willReturnSelf(); - $this->container->set('files.filespec', $filespec); + $this->container->set('files.filespec_storage', $filespec); $factory_mock = $this->getMockBuilder('\phpbb\files\factory') ->disableOriginalConstructor() ->getMock(); $factory_mock->expects($this->any()) ->method('get') ->willReturn($filespec); - $this->container->set('files.types.local', new \phpbb\files\types\local( + $this->container->set('files.types.local_storage', new \phpbb\files\types\local_storage( $factory_mock, $this->language, $this->php_ini, @@ -237,14 +256,23 @@ public function test_init_error() $this->config, $this->files_upload, $this->language, - $this->mimetype_guesser, $this->phpbb_dispatcher, $this->plupload, - $this->user, - $this->phpbb_root_path + $this->storage, + $this->temp, + $this->user ); - $filedata = $this->upload->upload('foobar', 1, true); + // Instead of setting to false or empty array, set default filedata array + // as otherwise it throws PHP undefined array key warnings + // in different file upload related services + $filedata = $this->upload->upload('foobar', 1, true, '', false, + [ + 'realname' => null, + 'type' => null, + 'size' => null, + ] + ); $this->assertSame(array( 'error' => array(), @@ -252,7 +280,7 @@ public function test_init_error() ), $filedata); } - public function data_image_upload() + public static function data_image_upload() { return array( array(false, false, array(), @@ -336,19 +364,16 @@ public function data_image_upload() */ public function test_image_upload($is_image, $plupload_active, $config_data, $expected) { - $filespec = $this->getMockBuilder('\phpbb\files\filespec') - ->setMethods(array( + $filespec = $this->getMockBuilder('\phpbb\files\filespec_storage') + ->onlyMethods(array( 'init_error', 'is_image', 'move_file', 'is_uploaded', )) ->setConstructorArgs(array( - $this->filesystem, $this->language, - $this->php_ini, new \FastImageSize\FastImageSize(), - $this->phpbb_root_path, $this->mimetype_guesser, $this->plupload )) @@ -370,14 +395,14 @@ public function test_image_upload($is_image, $plupload_active, $config_data, $ex $filespec->expects($this->any()) ->method('move_file') ->willReturn(false); - $this->container->set('files.filespec', $filespec); + $this->container->set('files.filespec_storage', $filespec); $factory_mock = $this->getMockBuilder('\phpbb\files\factory') ->disableOriginalConstructor() ->getMock(); $factory_mock->expects($this->any()) ->method('get') ->willReturn($filespec); - $this->container->set('files.types.local', new \phpbb\files\types\local( + $this->container->set('files.types.local_storage', new \phpbb\files\types\local_storage( $factory_mock, $this->language, $this->php_ini, @@ -403,11 +428,11 @@ public function test_image_upload($is_image, $plupload_active, $config_data, $ex $this->config, $this->files_upload, $this->language, - $this->mimetype_guesser, $this->phpbb_dispatcher, $plupload, - $this->user, - $this->phpbb_root_path + $this->storage, + $this->temp, + $this->user ); $filedata = $this->upload->upload('foobar', 1, true, '', false, array( diff --git a/tests/auth/fixtures/user.xml b/tests/auth/fixtures/user.xml index 1e0eb6ee499..33f69a9067f 100644 --- a/tests/auth/fixtures/user.xml +++ b/tests/auth/fixtures/user.xml @@ -1,5 +1,17 @@ +
      + group_id + group_name + group_type + group_desc + + 1 + REGISTERED + 3 + foobar + +
      user_idusername diff --git a/tests/auth/fixtures/user_533.xml b/tests/auth/fixtures/user_533.xml deleted file mode 100644 index 9731e4db4a5..00000000000 --- a/tests/auth/fixtures/user_533.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -
      - user_id - username - username_clean - user_password - user_passchg - user_email - user_type - user_login_attempts - user_permissions - user_sig - - 1 - foobar - foobar - $2a$10$e01Syh9PbJjUkio66eFuUu4FhCE2nRgG7QPc1JACalsPXcIuG2bbi - 0 - example@example.com - 0 - 0 - - - - - 2 - foobar2 - foobar2 - $H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/ - 0 - example@example.com - 0 - 0 - - - -
      - diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index f30d19ef9d2..2094205bfe1 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -13,11 +13,16 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case { + /** @var \phpbb\auth\provider\apache */ protected $provider; + + /** @var \phpbb\user */ protected $user; + + /** @var \phpbb\request\request_interface */ protected $request; - protected function setup() + protected function setUp(): void { parent::setUp(); @@ -29,40 +34,13 @@ protected function setup() $lang = new \phpbb\language\language($lang_loader); $this->request = $this->createMock('\phpbb\request\request'); $this->user = new \phpbb\user($lang, '\phpbb\datetime'); - $driver_helper = new \phpbb\passwords\driver\helper($config); - $passwords_drivers = array( - 'passwords.driver.bcrypt_2y' => new \phpbb\passwords\driver\bcrypt_2y($config, $driver_helper), - 'passwords.driver.bcrypt' => new \phpbb\passwords\driver\bcrypt($config, $driver_helper), - 'passwords.driver.salted_md5' => new \phpbb\passwords\driver\salted_md5($config, $driver_helper), - 'passwords.driver.phpass' => new \phpbb\passwords\driver\phpass($config, $driver_helper), - ); - $passwords_helper = new \phpbb\passwords\helper; - // Set up passwords manager - $passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers)); - - if (version_compare(PHP_VERSION, '5.3.7', '<')) - { - $this->password_hash = '$2a$10$e01Syh9PbJjUkio66eFuUu4FhCE2nRgG7QPc1JACalsPXcIuG2bbi'; - } - else - { - $this->password_hash = '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i'; - } - - $this->provider = new \phpbb\auth\provider\apache($db, $config, $passwords_manager, $this->request, $this->user, $phpbb_root_path, $phpEx); + $this->provider = new \phpbb\auth\provider\apache($config, $db, $lang, $this->request, $this->user, $phpbb_root_path, $phpEx); } public function getDataSet() { - if ((version_compare(PHP_VERSION, '5.3.7', '<'))) - { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user_533.xml'); - } - else - { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml'); - } + return $this->createXMLDataSet(__DIR__ . '/fixtures/user.xml'); } /** @@ -94,14 +72,12 @@ public function test_login() ->with('PHP_AUTH_USER', \phpbb\request\request_interface::SERVER) ->will($this->returnValue(true)); - $this->request->expects($this->at(1)) + $this->request->expects($this->exactly(2)) ->method('server') - ->with('PHP_AUTH_USER') - ->will($this->returnValue('foobar')); - $this->request->expects($this->at(2)) - ->method('server') - ->with('PHP_AUTH_PW') - ->will($this->returnValue('example')); + ->willReturnMap([ + ['PHP_AUTH_USER', 'foobar'], + ['PHP_AUTH_PW', 'example'] + ]); $expected = array( 'status' => LOGIN_SUCCESS, @@ -109,7 +85,7 @@ public function test_login() 'user_row' => array( 'user_id' => '1', 'username' => 'foobar', - 'user_password' => $this->password_hash, + 'user_password' => '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i', 'user_passchg' => '0', 'user_email' => 'example@example.com', 'user_type' => '0', @@ -126,82 +102,81 @@ public function test_autologin() ->with('PHP_AUTH_USER', \phpbb\request\request_interface::SERVER) ->will($this->returnValue(true)); - $this->request->expects($this->at(1)) - ->method('server') - ->with('PHP_AUTH_USER') - ->will($this->returnValue('foobar')); - $this->request->expects($this->at(2)) + $this->request->expects($this->exactly(2)) ->method('server') - ->with('PHP_AUTH_PW') - ->will($this->returnValue('example')); + ->willReturnCallback(fn(string $arg) => match(true) { + $arg === 'PHP_AUTH_USER' => 'foobar', + $arg === 'PHP_AUTH_PW' => 'example', + }); $expected = array( - 'user_id' => '1', - 'user_type' => '0', - 'group_id' => '3', + 'user_id' => 1, + 'user_type' => 0, + 'group_id' => 3, 'user_permissions' => '', - 'user_perm_from' => '0', + 'user_perm_from' => 0, 'user_ip' => '', - 'user_regdate' => '0', + 'user_regdate' => 0, 'username' => 'foobar', 'username_clean' => 'foobar', - 'user_password' => $this->password_hash, - 'user_passchg' => '0', + 'user_password' => '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i', + 'user_passchg' => 0, 'user_email' => 'example@example.com', - 'user_email_hash' => '0', 'user_birthday' => '', - 'user_lastvisit' => '0', - 'user_lastmark' => '0', - 'user_lastpost_time' => '0', + 'user_lastvisit' => 0, + 'user_last_active' => 0, + 'user_lastmark' => 0, + 'user_lastpost_time' => 0, 'user_lastpage' => '', 'user_last_confirm_key' => '', - 'user_last_search' => '0', - 'user_warnings' => '0', - 'user_last_warning' => '0', - 'user_login_attempts' => '0', - 'user_inactive_reason' => '0', - 'user_inactive_time' => '0', - 'user_posts' => '0', + 'user_last_search' => 0, + 'user_warnings' => 0, + 'user_last_warning' => 0, + 'user_login_attempts' => 0, + 'user_inactive_reason' => 0, + 'user_inactive_time' => 0, + 'user_posts' => 0, 'user_lang' => '', 'user_timezone' => '', 'user_dateformat' => 'd M Y H:i', - 'user_style' => '0', - 'user_rank' => '0', + 'user_style' => 0, + 'user_rank' => 0, 'user_colour' => '', - 'user_new_privmsg' => '0', - 'user_unread_privmsg' => '0', - 'user_last_privmsg' => '0', - 'user_message_rules' => '0', - 'user_full_folder' => '-3', - 'user_emailtime' => '0', - 'user_topic_show_days' => '0', + 'user_new_privmsg' => 0, + 'user_unread_privmsg' => 0, + 'user_last_privmsg' => 0, + 'user_message_rules' => 0, + 'user_full_folder' => -3, + 'user_emailtime' => 0, + 'user_topic_show_days' => 0, 'user_topic_sortby_type' => 't', 'user_topic_sortby_dir' => 'd', - 'user_post_show_days' => '0', + 'user_post_show_days' => 0, 'user_post_sortby_type' => 't', 'user_post_sortby_dir' => 'a', - 'user_notify' => '0', - 'user_notify_pm' => '1', - 'user_notify_type' => '0', - 'user_allow_pm' => '1', - 'user_allow_viewonline' => '1', - 'user_allow_viewemail' => '1', - 'user_allow_massemail' => '1', - 'user_options' => '230271', + 'user_notify' => 0, + 'user_notify_pm' => 1, + 'user_allow_pm' => 1, + 'user_allow_viewonline' => 1, + 'user_allow_viewemail' => 1, + 'user_allow_massemail' => 1, + 'user_options' => 230271, 'user_avatar' => '', 'user_avatar_type' => '', - 'user_avatar_width' => '0', - 'user_avatar_height' => '0', + 'user_avatar_width' => 0, + 'user_avatar_height' => 0, 'user_sig' => '', 'user_sig_bbcode_uid' => '', 'user_sig_bbcode_bitfield' => '', - 'user_jabber' => '', 'user_actkey' => '', + 'user_actkey_expiration' => 0, 'user_newpasswd' => '', 'user_form_salt' => '', - 'user_new' => '1', - 'user_reminded' => '0', - 'user_reminded_time' => '0', + 'user_new' => 1, + 'user_reminded' => 0, + 'user_reminded_time' => 0, + 'reset_token' => '', + 'reset_token_expiration' => 0, ); $this->assertEquals($expected, $this->provider->autologin()); diff --git a/tests/auth/provider_db_test.php b/tests/auth/provider_db_test.php index b7d94ed046c..145e3c47cda 100644 --- a/tests/auth/provider_db_test.php +++ b/tests/auth/provider_db_test.php @@ -15,14 +15,7 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case { public function getDataSet() { - if ((version_compare(PHP_VERSION, '5.3.7', '<'))) - { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user_533.xml'); - } - else - { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml'); - } + return $this->createXMLDataSet(__DIR__ . '/fixtures/user.xml'); } public function test_login() @@ -37,7 +30,6 @@ public function test_login() )); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); - $request = $this->createMock('\phpbb\request\request'); $user = new \phpbb\user($lang, '\phpbb\datetime'); $driver_helper = new \phpbb\passwords\driver\helper($config); $passwords_drivers = array( @@ -52,16 +44,21 @@ public function test_login() $passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers)); $phpbb_container = new phpbb_mock_container_builder(); + $plugins = new \phpbb\di\service_collection($phpbb_container); + $plugins->add('core.captcha.plugins.qa'); + $phpbb_container->set( + 'captcha.factory', + new \phpbb\captcha\factory($phpbb_container, $plugins) + ); + $phpbb_container->set( + 'core.captcha.plugins.qa', + new \phpbb\captcha\plugins\qa('', '', '') + ); + /** @var \phpbb\captcha\factory $captcha_factory */ + $captcha_factory = $phpbb_container->get('captcha.factory'); - $provider = new \phpbb\auth\provider\db($db, $config, $passwords_manager, $request, $user, $phpbb_container, $phpbb_root_path, $phpEx); - if (version_compare(PHP_VERSION, '5.3.7', '<')) - { - $password_hash = '$2a$10$e01Syh9PbJjUkio66eFuUu4FhCE2nRgG7QPc1JACalsPXcIuG2bbi'; - } - else - { - $password_hash = '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i'; - } + $provider = new \phpbb\auth\provider\db($captcha_factory, $config, $db, $passwords_manager, $user); + $password_hash = '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i'; $expected = array( 'status' => LOGIN_SUCCESS, @@ -88,7 +85,6 @@ public function test_login() // Check if convert works $login_return = $provider->login('foobar2', 'example'); - $password_start = (version_compare(PHP_VERSION, '5.3.7', '<')) ? '$2a$10$' : '$2y$10$'; - $this->assertStringStartsWith($password_start, $login_return['user_row']['user_password']); + $this->assertStringStartsWith('$2y$10$', $login_return['user_row']['user_password']); } } diff --git a/tests/auth/provider_ldap_test.php b/tests/auth/provider_ldap_test.php new file mode 100644 index 00000000000..48d4ac69924 --- /dev/null +++ b/tests/auth/provider_ldap_test.php @@ -0,0 +1,105 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** + * @group slow + */ +class phpbb_auth_provider_ldap_test extends phpbb_database_test_case +{ + /** @var \phpbb\auth\provider\ldap */ + protected $provider; + + /** @var \phpbb\user */ + protected $user; + + protected function setUp() : void + { + parent::setUp(); + + global $phpbb_root_path, $phpEx; + + $db = $this->new_dbal(); + $config = new \phpbb\config\config([ + 'ldap_server' => 'localhost', + 'ldap_port' => 3389, + 'ldap_base_dn' => 'dc=example,dc=com', + 'ldap_uid' => 'uid', + 'ldap_email' => 'mail', + ]); + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $lang = new \phpbb\language\language($lang_loader); + $this->user = new \phpbb\user($lang, '\phpbb\datetime'); + $this->user->data['username'] = 'admin'; + + $this->provider = new \phpbb\auth\provider\ldap($config, $db, $lang, $this->user); + } + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/user.xml'); + } + + /** + * Test to see if a user is identified to Apache. Expects false if they are. + */ + public function test_init() + { + if (!extension_loaded('ldap')) + { + $this->markTestSkipped('LDAP extension not available.'); + } + + $this->assertFalse($this->provider->init()); + } + + public function test_login() + { + if (!extension_loaded('ldap')) + { + $this->markTestSkipped('LDAP extension not available.'); + } + + $username = 'admin'; + $password = 'adminadmin'; + + $expected = array( + 'status' => LOGIN_SUCCESS_CREATE_PROFILE, // successful login and user created + 'error_msg' => false, + 'user_row' => array( + 'username' => 'admin', + 'user_password' => '', + 'user_email' => 'admin@example.com', + 'user_type' => 0, + 'group_id' => 1, + 'user_new' => 0, + 'user_ip' => '', + ), + ); + + $this->assertEquals($expected, $this->provider->login($username, $password)); + } + + public function test_autologin() + { + $this->assertNull($this->provider->autologin()); + } + + public function test_validate_session() + { + $user = array( + 'username' => 'admin', + ); + + $this->assertNull($this->provider->validate_session($user)); + } +} diff --git a/tests/auth/provider_oauth_token_storage_test.php b/tests/auth/provider_oauth_token_storage_test.php index ae5de6aa7ef..7e29bd08bf3 100644 --- a/tests/auth/provider_oauth_token_storage_test.php +++ b/tests/auth/provider_oauth_token_storage_test.php @@ -13,7 +13,7 @@ use OAuth\OAuth2\Token\StdOAuth2Token; -require_once dirname(__FILE__) . '/phpbb_not_a_token.php'; +require_once __DIR__ . '/phpbb_not_a_token.php'; class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_case { @@ -23,9 +23,11 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c protected $token_storage; protected $token_storage_table; protected $state_table; + + /** @var \phpbb\user */ protected $user; - protected function setup() + protected function setUp(): void { parent::setUp(); @@ -51,7 +53,7 @@ protected function setup() public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/oauth_tokens.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/oauth_tokens.xml'); } public static function retrieveAccessToken_data() @@ -73,7 +75,10 @@ public function test_retrieveAccessToken($cache_token, $exception) $token = $cache_token; } - $this->setExpectedException($exception); + if (!empty($exception)) + { + $this->expectException($exception); + } $stored_token = $this->token_storage->retrieveAccessToken($this->service_name); $this->assertEquals($token, $stored_token); @@ -120,7 +125,10 @@ public function test_retrieve_access_token_by_session($cache_token, $exception) $token = $cache_token; } - $this->setExpectedException($exception); + if (!empty($exception)) + { + $this->expectException($exception); + } $stored_token = $this->token_storage->retrieve_access_token_by_session($this->service_name); $this->assertEquals($token, $stored_token); diff --git a/tests/avatar/driver_gravatar_test.php b/tests/avatar/driver_gravatar_test.php new file mode 100644 index 00000000000..bc84f356102 --- /dev/null +++ b/tests/avatar/driver_gravatar_test.php @@ -0,0 +1,213 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case +{ + + /** @var \phpbb\config\config */ + private $config; + + /** @var gravatar */ + private $gravatar; + + /** @var request_interface */ + private $request; + + /** @var \phpbb\template\template */ + private $template; + + /** @var \phpbb\user */ + private $user; + + private $template_data = []; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/users.xml'); + } + + protected function setUp(): void + { + global $phpbb_root_path, $phpEx; + + $this->config = new \phpbb\config\config(array()); + $this->request = $this->getMockBuilder(request::class) + ->disableOriginalConstructor() + ->onlyMethods(['get_super_global']) + ->getMock(); + $this->request->method('get_super_global') + ->willReturn([]); + $this->template = $this->getMockBuilder(\phpbb\template\twig\twig::class) + ->disableOriginalConstructor() + ->onlyMethods(['assign_vars']) + ->getMock(); + $this->template->method('assign_vars') + ->will($this->returnCallback([$this, 'template_assign_vars'])); + $this->user = $this->getMockBuilder(\phpbb\user::class) + ->disableOriginalConstructor() + ->getMock(); + $imagesize = new \FastImageSize\FastImageSize(); + $cache = $this->createMock('\phpbb\cache\driver\driver_interface'); + $path_helper = new \phpbb\path_helper( + new \phpbb\symfony_request( + $this->request + ), + $this->request, + $phpbb_root_path, + $phpEx + ); + + global $phpbb_dispatcher; + $phpbb_dispatcher = $this->getMockBuilder(\phpbb\event\dispatcher::class) + ->disableOriginalConstructor() + ->onlyMethods(['trigger_event']) + ->getMock(); + $phpbb_dispatcher->method('trigger_event') + ->willReturnArgument(1); + + $this->gravatar = new gravatar($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache); + $this->gravatar->set_name('avatar.driver.gravatar'); + } + + public function template_assign_vars($data) + { + $this->template_data = array_merge($this->template_data, $data); + } + + public static function data_prepare_form(): array + { + return [ + [ + // Only default empty values, no request data + [ + 'AVATAR_GRAVATAR_WIDTH' => '', + 'AVATAR_GRAVATAR_HEIGHT' => '', + 'AVATAR_GRAVATAR_EMAIL' => '', + ], + [], + [ + 'avatar_type' => '', + 'avatar_width' => '', + 'avatar_height' => '', + ] + ], + [ + // Only default empty values, request data set + [ + 'AVATAR_GRAVATAR_WIDTH' => '80', + 'AVATAR_GRAVATAR_HEIGHT' => '90', + 'AVATAR_GRAVATAR_EMAIL' => '', + ], + [ + request_interface::POST => [ + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar_gravatar_width' => '80', + 'avatar_gravatar_height' => '90', + ], + ], + [ + 'avatar_type' => '', + 'avatar_width' => '80', + 'avatar_height' => '90', + ] + ], + [ + // Only default empty values, request data set + [ + 'AVATAR_GRAVATAR_WIDTH' => '70', + 'AVATAR_GRAVATAR_HEIGHT' => '60', + 'AVATAR_GRAVATAR_EMAIL' => 'bar@foo.com', + ], + [ + request_interface::POST => [ + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar_gravatar_width' => '80', + 'avatar_gravatar_height' => '90', + ], + ], + [ + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar' => 'bar@foo.com', + 'avatar_width' => '70', + 'avatar_height' => '60', + ] + ], + ]; + } + + /** + * @dataProvider data_prepare_form + */ + public function test_prepare_form($expected_vars, $request_data, $row) + { + $error = []; + $this->template_data = []; + + $request = $this->getMockBuilder(request::class) + ->disableOriginalConstructor() + ->onlyMethods(['get_super_global']) + ->getMock(); + $request->method('get_super_global') + ->willReturn([]); + + $requestInputReflection = new \ReflectionProperty($request, 'input'); + $request_data[request_interface::GET] = $request_data[request_interface::GET] ?? []; + $request_data[request_interface::POST] = $request_data[request_interface::POST] ?? []; + $request_data[request_interface::REQUEST] = $request_data[request_interface::GET] + $request_data[request_interface::POST]; + $requestInputReflection->setValue($request, $request_data); + $requestTypeCastHelperReflection = new \ReflectionProperty($request, 'type_cast_helper'); + $requestTypeCastHelperReflection->setValue($request, new \phpbb\request\type_cast_helper()); + + $this->gravatar->prepare_form($request, $this->template, $this->user, $row, $error); + + // Error not touched by gravatar + $this->assertEquals([], $error); + + $this->assertEquals($expected_vars, $this->template_data); + } + + public function test_gravatar_misc(): void + { + $this->assertEquals('ucp_avatar_options_gravatar.html', $this->gravatar->get_template_name()); + $this->assertEquals('acp_avatar_options_gravatar.html', $this->gravatar->get_acp_template_name()); + + $row = [ + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar' => 'bar@foo.com', + 'avatar_width' => '70', + 'avatar_height' => '60', + ]; + $this->assertEquals('', $this->gravatar->get_custom_html($this->user, $row)); + } + + public function test_get_data(): void + { + $row = [ + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar' => 'bar@foo.com', + 'avatar_width' => '70', + 'avatar_height' => '60', + ]; + + $this->assertEquals([ + 'src' => '//gravatar.com/avatar/e0ee9d02824d4320a999507150c5b8a371c635c41f645ba3a7205f36384dc199?s=70', + 'width' => '70', + 'height' => '60', + ], $this->gravatar->get_data($row)); + } +} diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index 2866a1673d1..66cba2e8900 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -11,7 +11,8 @@ * */ -require_once dirname(__FILE__) . '/driver/foobar.php'; +require_once __DIR__ . '/driver/foobar.php'; +require_once __DIR__ . '/driver/barfoo.php'; class phpbb_avatar_manager_test extends \phpbb_database_test_case { @@ -19,15 +20,18 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case protected $manager; protected $avatar_foobar; protected $avatar_barfoo; + protected $config; + protected $db; + protected $user; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/users.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/users.xml'); } - public function setUp() + protected function setUp(): void { - global $phpbb_root_path, $phpEx; + global $phpbb_dispatcher, $phpbb_root_path, $phpEx; // Mock phpbb_container $phpbb_container = $this->createMock('Symfony\Component\DependencyInjection\ContainerInterface'); @@ -35,14 +39,7 @@ public function setUp() ->method('get') ->will($this->returnArgument(0)); - $filesystem = new \phpbb\filesystem\filesystem(); - $adapter = new \phpbb\storage\adapter\local($filesystem, new \FastImageSize\FastImageSize(), new \phpbb\mimetype\guesser(array(new \phpbb\mimetype\extension_guesser)), $phpbb_root_path); - $adapter->configure(['path' => 'images/avatars/upload']); - $adapter_factory_mock = $this->createMock('\phpbb\storage\adapter_factory'); - $adapter_factory_mock->expects($this->any()) - ->method('get') - ->willReturn($adapter); - $storage = new \phpbb\storage\storage($adapter_factory_mock, ''); + $storage = $this->createMock('\phpbb\storage\storage'); // Prepare dependencies for avatar manager and driver $this->config = new \phpbb\config\config(array()); @@ -56,28 +53,29 @@ public function setUp() $phpEx ); - $guessers = array( - new \Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser(), - new \Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser(), - new \phpbb\mimetype\extension_guesser, - new \phpbb\mimetype\content_guesser, - ); - $guesser = new \phpbb\mimetype\guesser($guessers); - $imagesize = new \FastImageSize\FastImageSize(); + $imagesize = $this->getMockBuilder('\FastImageSize\FastImageSize') + ->onlyMethods(['getImageSize']) + ->getMock(); + $imagesize->method('getImageSize') + ->willReturn(['width' => 80, 'height' => 80, 'mime' => 'image/jpeg']); $dispatcher = new phpbb_mock_event_dispatcher(); + $phpbb_dispatcher = $dispatcher; + + $controller_helper = $this->createMock('\phpbb\controller\helper'); + $routing_helper = $this->createMock('\phpbb\routing\helper'); // $this->avatar_foobar will be needed later on $this->avatar_foobar = $this->getMockBuilder('\phpbb\avatar\driver\foobar') - ->setMethods(array('get_name')) + ->onlyMethods(array('get_name')) ->setConstructorArgs(array($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache)) ->getMock(); $this->avatar_foobar->expects($this->any()) ->method('get_name') ->will($this->returnValue('avatar.driver.foobar')); - // barfoo driver can't be mocked with constructor arguments $this->avatar_barfoo = $this->getMockBuilder('\phpbb\avatar\driver\barfoo') - ->setMethods(array('get_name', 'get_config_name')) + ->onlyMethods(array('get_name', 'get_config_name')) + ->setConstructorArgs(array($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache)) ->getMock(); $this->avatar_barfoo->expects($this->any()) ->method('get_name') @@ -96,15 +94,15 @@ public function setUp() if ($driver !== 'upload') { $cur_avatar = $this->getMockBuilder('\phpbb\avatar\driver\\' . $driver) - ->setMethods(array('get_name')) + ->onlyMethods(array('get_name')) ->setConstructorArgs(array($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache)) ->getMock(); } else { $cur_avatar = $this->getMockBuilder('\phpbb\avatar\driver\\' . $driver) - ->setMethods(array('get_name')) - ->setConstructorArgs(array($this->config, $phpbb_root_path, $phpEx, $storage, $path_helper, $dispatcher, $files_factory, $php_ini)) + ->onlyMethods(array('get_name')) + ->setConstructorArgs(array($this->config, $phpbb_root_path, $phpEx, $storage, $path_helper, $routing_helper, $dispatcher, $files_factory, $php_ini)) ->getMock(); } $cur_avatar->expects($this->any()) @@ -118,7 +116,7 @@ public function setUp() $this->config['allow_avatar_' . get_class($this->avatar_barfoo)] = false; // Set up avatar manager - $this->manager = new \phpbb\avatar\manager($this->config, $avatar_drivers, $phpbb_container); + $this->manager = new \phpbb\avatar\manager($this->config, $dispatcher, $avatar_drivers); $this->db = $this->new_dbal(); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); @@ -130,7 +128,6 @@ protected function avatar_drivers() return array( 'local', 'upload', - 'remote', 'gravatar', ); } @@ -142,7 +139,6 @@ public function test_get_all_drivers() 'avatar.driver.barfoo' => 'avatar.driver.barfoo', 'avatar.driver.foobar' => 'avatar.driver.foobar', 'avatar.driver.local' => 'avatar.driver.local', - 'avatar.driver.remote' => 'avatar.driver.remote', 'avatar.driver.upload' => 'avatar.driver.upload', 'avatar.driver.gravatar' => 'avatar.driver.gravatar', ), $drivers); @@ -156,7 +152,7 @@ public function test_get_enabled_drivers() $this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']); } - public function get_driver_data_enabled() + public static function get_driver_data_enabled() { return array( array('avatar.driver.foobar', 'avatar.driver.foobar'), @@ -165,7 +161,6 @@ public function get_driver_data_enabled() array('avatar.driver.local', null), array(AVATAR_GALLERY, null), array(AVATAR_UPLOAD, null), - array(AVATAR_REMOTE, null), ); } @@ -178,7 +173,7 @@ public function test_get_driver_enabled($driver_name, $expected) $this->assertEquals($expected, ($driver === null) ? null : $driver->get_name()); } - public function get_driver_data_all() + public static function get_driver_data_all() { return array( array('avatar.driver.foobar', 'avatar.driver.foobar'), @@ -186,7 +181,6 @@ public function get_driver_data_all() array('avatar.driver.local', 'avatar.driver.local'), array(AVATAR_GALLERY, 'avatar.driver.local'), array(AVATAR_UPLOAD, 'avatar.driver.upload'), - array(AVATAR_REMOTE, 'avatar.driver.remote'), ); } @@ -203,14 +197,19 @@ public function test_get_avatar_settings() { $avatar_settings = $this->manager->get_avatar_settings($this->avatar_foobar); - $expected_settings = array( - 'allow_avatar_' . get_class($this->avatar_foobar) => array('lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - ); + $expected_settings = [ + 'allow_avatar_' . get_class($this->avatar_foobar) => [ + 'lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)), + 'validate' => 'bool', + 'type' => 'radio:yes_no', + 'explain' => true + ], + ]; $this->assertEquals($expected_settings, $avatar_settings); } - public function database_row_data() + public static function database_row_data() { return array( array( @@ -221,13 +220,7 @@ public function database_row_data() 'user_avatar_height' => '', 'group_avatar' => '', ), - array( - 'user_avatar' => '', - 'user_avatar_type' => '', - 'user_avatar_width' => '', - 'user_avatar_height' => '', - 'group_avatar' => '', - ), + array(), 'foobar', ), array( @@ -246,7 +239,6 @@ public function database_row_data() 'group_id' => 4, ), array( - 'user_avatar' => '', 'user_id' => 5, 'group_id' => 4, ), @@ -291,6 +283,11 @@ public function test_clean_row(array $input, array $output, $prefix = '') $this->assertArrayHasKey($key, $cleaned_row); $this->assertEquals($cleaned_row[$key], $value); } + + if (empty($output)) + { + $this->assertEquals($output, $cleaned_row); + } } public function test_clean_driver_name() @@ -308,7 +305,7 @@ public function test_localize_errors() global $phpbb_root_path, $phpEx; $user = $this->getMockBuilder('\phpbb\user') - ->setMethods(array()) + ->onlyMethods(['lang']) ->setConstructorArgs(array(new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), '\phpbb\datetime')) ->getMock(); $lang_array = array( @@ -332,7 +329,7 @@ public function test_localize_errors() ))); } - public function data_handle_avatar_delete() + public static function data_handle_avatar_delete() { return array( array( @@ -341,7 +338,9 @@ public function data_handle_avatar_delete() 'avatar_type' => '', 'avatar_width' => 0, 'avatar_height' => 0, - ), 1, array( + ), + array( + 'id' => 1, 'avatar' => 'foobar@example.com', 'avatar_type' => 'avatar.driver.gravatar', 'avatar_width' => '16', @@ -354,7 +353,9 @@ public function data_handle_avatar_delete() 'avatar_type' => '', 'avatar_width' => 0, 'avatar_height' => 0, - ), 5, array( + ), + array( + 'id' => 5, 'avatar' => 'g5_1414350991.jpg', 'avatar_type' => 'avatar.driver.upload', 'avatar_width' => '80', @@ -367,13 +368,13 @@ public function data_handle_avatar_delete() /** * @dataProvider data_handle_avatar_delete */ - public function test_handle_avatar_delete($expected, $id, $avatar_data, $table, $prefix) + public function test_handle_avatar_delete($expected, $avatar_data, $table, $prefix) { $this->config['allow_avatar_gravatar'] = true; $this->assertNull($this->manager->handle_avatar_delete($this->db, $this->user, $avatar_data, $table, $prefix)); $sql = 'SELECT * FROM ' . $table . ' - WHERE ' . $prefix . 'id = ' . $id; + WHERE ' . $prefix . 'id = ' . (int) $avatar_data['id']; $result = $this->db->sql_query_limit($sql, 1); $row = $this->manager->clean_row($this->db->sql_fetchrow($result), substr($prefix, 0, -1)); @@ -403,58 +404,4 @@ public function test_user_group_avatar_deleted() 'avatar_height' => 0, ), $row); } - - public function data_remote_avatar_url() - { - return array( - array('127.0.0.1:91?foo.jpg', 80, 80, array('AVATAR_URL_INVALID')), - array(gethostbyname('secure.gravatar.com') . '/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), - array('secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80), - array(gethostbyname('secure.gravatar.com') . ':120/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), - array('secure.gravatar.com:80/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), - array('secure.gravatar.com:80?55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), - array('secure.gravatar.com?55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), // should be a 404 - array('2001:db8:0:0:0:0:2:1/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), - array('secure.gravatar.com/2001:db8:0:0:0:0:2:1/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), - array('secure.gravatar.com/127.0.0.1:80/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), - ); - } - - /** - * @dataProvider data_remote_avatar_url - */ - public function test_remote_avatar_url($url, $width, $height, $expected_error = array()) - { - global $phpbb_root_path, $phpEx; - - if (!function_exists('get_preg_expression')) - { - require($phpbb_root_path . 'includes/functions.' . $phpEx); - } - - $this->config['server_name'] = 'foobar.com'; - - /** @var \phpbb\avatar\driver\remote $remote_avatar */ - $remote_avatar = $this->manager->get_driver('avatar.driver.remote', false); - - $request = new phpbb_mock_request(array(), array( - 'avatar_remote_url' => $url, - 'avatar_remote_width' => $width, - 'avatar_remote_height' => $height, - )); - - $row = array(); - $error = array(); - - $return = $remote_avatar->process_form($request, null, $this->user, $row, $error); - if (count($expected_error) > 0) - { - $this->assertFalse($return); - } - else - { - $this->assertNotEquals(false, $return); - } - $this->assertSame($expected_error, $error); - } } diff --git a/tests/ban/ban_manager_test.php b/tests/ban/ban_manager_test.php new file mode 100644 index 00000000000..34a0acdaa35 --- /dev/null +++ b/tests/ban/ban_manager_test.php @@ -0,0 +1,765 @@ +createXMLDataSet(__DIR__ . '/fixtures/sessions_banlist.xml'); + } + + public function setUp(): void + { + parent::setUp(); + + global $config, $phpbb_dispatcher, $phpbb_root_path, $phpEx; + + $language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $user = new \phpbb\user($language, '\phpbb\datetime'); + $user->data['user_id'] = 2; + $user->data['user_email'] = 'foo@bar.com'; + $user->data['user_timezone'] = 0; + $config = new \phpbb\config\config([]); + $phpbb_dispatcher = new \phpbb_mock_event_dispatcher(); + + $phpbb_container = new \phpbb_mock_container_builder(); + $ban_type_email = new \phpbb\ban\type\email($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_user = new \phpbb\ban\type\user($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_ip = new \phpbb\ban\type\ip($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $phpbb_container->set('ban.type.email', $ban_type_email); + $phpbb_container->set('ban.type.user', $ban_type_user); + $phpbb_container->set('ban.type.ip', $ban_type_ip); + $collection = new \phpbb\di\service_collection($phpbb_container); + $collection->add('ban.type.email'); + $collection->add('ban.type.user'); + $collection->add('ban.type.ip'); + $phpbb_log = new \phpbb\log\dummy(); + + $this->ban_manager = new \phpbb\ban\manager($collection, new \phpbb\cache\driver\dummy(), $this->db, $language, $phpbb_log, $user, 'phpbb_bans', 'phpbb_users'); + $phpbb_container->set('ban.manager', $this->ban_manager); + $this->phpbb_container = $phpbb_container; + } + + public static function data_check_ban(): array + { + return [ + [ + [], + false + ], + [ + ['user_ip' => '127.0.0.1'], + [ + 'item' => '127.0.0.1', + 'end' => '0', + 'reason' => '1', + 'mode' => 'ip', + ], + ], + [ + ['user_ip' => '10.0.0.1'], // first IP for 10.0.0.1/28 range + [ + 'item' => '10.0.0.1/28', + 'end' => '0', + 'reason' => '1', + 'mode' => 'ip', + ], + ], + [ + ['user_ip' => '10.0.0.14'], // last IP for 10.0.0.1/28 range + [ + 'item' => '10.0.0.1/28', + 'end' => '0', + 'reason' => '1', + 'mode' => 'ip', + ], + ], + [ + ['user_ip' => '10.0.0.15'], // first IP outside 10.0.0.1/28 range + [ + 'item' => '10.0.0.1/28', + 'end' => '0', + 'reason' => '1', + 'mode' => 'ip', + ], + ], + [ + ['user_ip' => '2001:4860:4860::8888'], // first IP in 2001:4860:4860::8888/12 range + [ + 'item' => '2001:4860:4860::8888/12', + 'end' => '0', + 'reason' => '1', + 'mode' => 'ip', + ], + ], + [ + ['user_ip' => '200F:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF'], // last IP in 2001:4860:4860::8888/12 range + [ + 'item' => '2001:4860:4860::8888/12', + 'end' => '0', + 'reason' => '1', + 'mode' => 'ip', + ], + ], + [ + ['user_ip' => '2010:4860:4860::1'], // IP outside the 2001:4860:4860::8888/12 range + false, + ], + [ + ['user_id' => 2], + false, + ], + [ + ['user_id' => 5], // there is only an expired ban + false, + ], + [ + ['user_id' => 4], + [ + 'item' => '4', + 'end' => '0', + 'reason' => '1', + 'mode' => 'user', + ], + ], + [ + ['user_email' => 'test@phpbb.com'], + false, + ], + [ + ['user_email' => 'bar@example.org'], + [ + 'item' => 'bar@example.org', + 'end' => '0', + 'reason' => '1', + 'mode' => 'email', + ], + ], + [ + ['user_email' => 'test@foo.bar'], + [ + 'item' => '*@foo.bar', + 'end' => '0', + 'reason' => '1', + 'mode' => 'email', + ], + ], + ]; + } + + /** + * @dataProvider data_check_ban + */ + public function test_check_ban($user_data, $expected) + { + $this->assertEquals($expected, $this->ban_manager->check($user_data)); + } + + public static function data_get_bans(): array + { + return [ + [ + 'foo', + '', + type_not_found_exception::class + ], + [ + 'ip', + [ + [ + 'ban_id' => '6', + 'ban_userid' => 0, + 'ban_item' => '10.0.0.1/28', + 'ban_start' => '1111', + 'ban_end' => '0', + 'ban_reason' => 'HAHAHA', + 'ban_reason_display' => '1', + 'ban_mode' => 'ip', + ], + [ + 'ban_id' => '2', + 'ban_userid' => 0, + 'ban_item' => '127.0.0.1', + 'ban_start' => '1111', + 'ban_end' => '0', + 'ban_reason' => 'HAHAHA', + 'ban_reason_display' => '1', + 'ban_mode' => 'ip', + ], + [ + 'ban_id' => '3', + 'ban_userid' => 0, + 'ban_item' => '127.1.1.1', + 'ban_start' => '1111', + 'ban_end' => '0', + 'ban_reason' => 'HAHAHA', + 'ban_reason_display' => '1', + 'ban_mode' => 'ip', + ], + [ + 'ban_id' => '7', + 'ban_userid' => 0, + 'ban_item' => '2001:4860:4860::8888/12', + 'ban_start' => '1111', + 'ban_end' => '0', + 'ban_reason' => 'HAHAHA', + 'ban_reason_display' => '1', + 'ban_mode' => 'ip', + ], + ], + ], + [ + 'email', + [ + [ + 'ban_id' => '9', + 'ban_userid' => 0, + 'ban_item' => '*@foo.bar', + 'ban_start' => '1111', + 'ban_end' => '0', + 'ban_reason' => 'HAHAHA', + 'ban_reason_display' => '1', + 'ban_mode' => 'email', + ], + [ + 'ban_id' => '5', + 'ban_userid' => 0, + 'ban_item' => 'bar@example.org', + 'ban_start' => '1111', + 'ban_end' => '0', + 'ban_reason' => 'HAHAHA', + 'ban_reason_display' => '1', + 'ban_mode' => 'email', + ], + ], + ], + [ + 'user', + [ + [ + 'ban_id' => '4', + 'ban_item' => '4', + 'ban_start' => '1111', + 'ban_end' => '0', + 'ban_reason' => 'HAHAHA', + 'ban_reason_display' => '1', + 'ban_mode' => 'user', + 'ban_userid' => 4, + 'user_id' => '4', + 'username' => 'ipv6_user', + 'username_clean' => 'ipv6_user', + 'label' => 'ipv6_user', + ], + ], + ], + ]; + } + + /** + * @dataProvider data_get_bans + */ + public function test_get_bans($ban_type, $expected, $expected_exception = false) + { + if ($expected_exception !== false) + { + $this->expectException($expected_exception); + } + + $actual = $this->ban_manager->get_bans($ban_type); + // Sort both arrays by ban_item to be synced + if (is_array($expected) && !empty($actual)) + { + usort($expected, function($a, $b) + { + return strcmp($a['ban_item'], $b['ban_item']) <=> 0; + } + ); + usort($actual, function($a, $b) + { + return strcmp($a['ban_item'], $b['ban_item']) <=> 0; + } + ); + } + $this->assertEquals($expected, $actual); + } + + public static function data_get_ban_end(): array + { + return [ + [ + 0, + 20, + 0, + ], + [ + 80, // 1 minute plus 20 seconds + 20, + 1, + ], + [ + 20, + 20, + -1, + ], + [ + 2 * 86400, // Ban end should be before this time + 20, + -1, + '1970-01-02', + ], + [ + 0, + 20, + -1, + '1970-01-02-15:30', // wrong format + invalid_length_exception::class, + ], + ]; + } + + /** + * @dataProvider data_get_ban_end + */ + public function test_get_ban_end($expected, $ban_start, $length, $end_date = '', $expected_exception = false) + { + if ($expected_exception) + { + $this->expectException($expected_exception); + } + + $start_time = new \DateTime(); + $start_time->setTimestamp($ban_start); + + $expected_end = new \DateTime(); + $expected_end->setTimestamp($expected); + + $ban_end = $this->ban_manager->get_ban_end($start_time, $length, $end_date); + + if ($length >= 0 || !$end_date) + { + $this->assertEquals($expected_end, $ban_end); + } + else + { + $this->assertLessThan($expected_end, $ban_end); + $this->assertGreaterThan($start_time, $ban_end); + } + } + + public function test_get_banned_users() + { + $banned_users = $this->ban_manager->get_banned_users(); + $this->assertEquals( + [ + 4 => 0, + 5 => 0 + ], + $banned_users + ); + } + + public function test_get_banned_users_own_method() + { + global $phpbb_root_path, $phpEx; + + $phpbb_container = new \phpbb_mock_container_builder(); + $ban_type_email = new \phpbb\ban\type\email($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_user = new \phpbb\ban\type\user($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_ip = $this->getMockBuilder(\phpbb\ban\type\ip::class) + ->setConstructorArgs([$this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys']) + ->getMock(); + $ban_type_ip->method('get_banned_users') + ->willReturn([19 => 1234, 20 => 0]); + $phpbb_container->set('ban.type.email', $ban_type_email); + $phpbb_container->set('ban.type.user', $ban_type_user); + $phpbb_container->set('ban.type.ip', $ban_type_ip); + $collection = new \phpbb\di\service_collection($phpbb_container); + $collection->add('ban.type.email'); + $collection->add('ban.type.user'); + $collection->add('ban.type.ip'); + + $language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $user = new \phpbb\user($language, '\phpbb\datetime'); + $phpbb_log = new \phpbb\log\dummy(); + + $ban_manager = new \phpbb\ban\manager($collection, new \phpbb\cache\driver\dummy(), $this->db, $language, $phpbb_log, $user, 'phpbb_bans', 'phpbb_users'); + + $this->assertEquals( + [ + 4 => 0, + 5 => 0, + 19 => 1234, + 20 => 0, + ], + $ban_manager->get_banned_users() + ); + + $ban_type_ip_reflection = new \ReflectionClass($ban_type_ip); + $get_excluded_reflection = $ban_type_ip_reflection->getMethod('get_excluded'); + $this->assertFalse($get_excluded_reflection->invoke($ban_type_ip)); + } + + public function test_ban_empty_ban_items() + { + global $phpbb_root_path, $phpEx; + + $phpbb_container = new \phpbb_mock_container_builder(); + $ban_type_email = new \phpbb\ban\type\email($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_user = new \phpbb\ban\type\user($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_ip = $this->getMockBuilder(\phpbb\ban\type\ip::class) + ->setConstructorArgs([$this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys']) + ->getMock(); + $ban_type_ip->method('prepare_for_storage') + ->willReturn([]); + $ban_type_ip->method('get_type') + ->willReturn('ip'); + $phpbb_container->set('ban.type.email', $ban_type_email); + $phpbb_container->set('ban.type.user', $ban_type_user); + $phpbb_container->set('ban.type.ip', $ban_type_ip); + $collection = new \phpbb\di\service_collection($phpbb_container); + $collection->add('ban.type.email'); + $collection->add('ban.type.user'); + $collection->add('ban.type.ip'); + + $language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $user = new \phpbb\user($language, '\phpbb\datetime'); + $phpbb_log = new \phpbb\log\dummy(); + + $ban_manager = new \phpbb\ban\manager($collection, new \phpbb\cache\driver\dummy(), $this->db, $language, $phpbb_log, $user, 'phpbb_bans', 'phpbb_users'); + + $start_time = new \DateTime(); + $start_time->setTimestamp(1000); + $end_time = new \DateTime(); + $end_time->setTimestamp(0); + + $this->assertFalse($ban_manager->ban( + 'ip', + ['192.168.1.1'], + $start_time, + $end_time, + '' + )); + } + + public static function data_test_ban(): array + { + return [ + [ + 'user', + ['normal_user'], + 1000, + 500, // end before start + '', + '', + false, + invalid_length_exception::class, + ], + [ + 'foo', // invalid ban type + ['normal_user'], + 1000, + 0, // end before start + '', + '', + false, + type_not_found_exception::class, + ], + [ + 'user', + [], // empty user list + 1000, + 0, + '', + '', + false, + no_valid_users_exception::class, + ], + [ + 'user', + ['founder'], // user same as current user + 1000, + 0, + '', + '', + false, + no_valid_users_exception::class, + ], + [ + 'user', + ['normal_user'], + 1000, + 0, + '', + '', + true, + ], + [ + 'user', + ['normal_u*'], + 1000, + 0, + '', + '', + true, + ], + [ + 'ip', + [], + 1000, + 0, + '', + '', + false, + no_valid_ips_exception::class, + ], + [ + 'ip', + ['192.168.I.1'], // invalid IP + 1000, + 0, + '', + '', + false, + no_valid_ips_exception::class, + ], + [ + 'ip', + ['192.168.1.1'], + 1000, + 0, + '', + '', + true, + ], + [ + 'email', + ['this_is_not_an_email'], + 1000, + 0, + '', + '', + false, + no_valid_emails_exception::class + ], + [ + 'email', + ['test@example.com'], + 1000, + 0, + '', + '', + true, + ], + [ + 'email', + ['*@foo.bar'], + 1000, + 0, + '', + '', + true, + ], + [ + 'email', + ['test@example.com', str_repeat('a', 100) . '@example.com'], // one email too long, shouldn't cause any issues though + 1000, + 0, + '', + '', + true, + ], + ]; + } + + /** + * @dataProvider data_test_ban + */ + public function test_ban($mode, $items, $start, $end, $reason, $display_reason, $expected, $expected_exception = '') + { + if ($expected_exception) + { + $this->expectException($expected_exception); + } + + $start_time = new \DateTime(); + $start_time->setTimestamp($start); + $end_time = new \DateTime(); + $end_time->setTimestamp($end); + + $ban_return = $this->ban_manager->ban($mode, $items, $start_time, $end_time, $reason, $display_reason); + + $this->assertEquals($expected, $ban_return); + } + + public function test_ban_actual() + { + $start_time = new \DateTime(); + $start_time->setTimestamp(1000); + $end_time = new \DateTime(); + $end_time->setTimestamp(0); + + $ban_return = $this->ban_manager->ban('ip', ['121.122.123.124'], $start_time, $end_time, '', 'because'); + + $this->assertTrue($ban_return); + + $this->assertEquals( + [ + 'item' => '121.122.123.124', + 'end' => 0, + 'reason' => 'because', + 'mode' => 'ip' + ], + $this->ban_manager->check(['user_ip' => '121.122.123.124']) + ); + } + + public static function data_test_unban(): array + { + return [ + [ + 'does_not_exist', + [10], + [], + type_not_found_exception::class + ], + [ + 'user', + [4], + [ + [ + 'ban_id' => '4', + 'ban_userid' => '4', + 'ban_item' => '4', + 'ban_start' => '1111', + 'ban_end' => '0', + 'ban_reason' => 'HAHAHA', + 'ban_reason_display' => '1', + 'ban_mode' => 'user', + 'user_id' => '4', + 'username' => 'ipv6_user', + 'username_clean' => 'ipv6_user', + 'label' => 'ipv6_user', + ], + ], + ], + ]; + } + + /** + * @dataProvider data_test_unban + */ + public function test_unban($mode, $items, $expected, $expected_exception = '') + { + if ($expected_exception) + { + $this->expectException($expected_exception); + } + + $before_bans = $this->ban_manager->get_bans($mode); + + $this->ban_manager->unban($mode, $items); + + $after_bans = $this->ban_manager->get_bans($mode); + + $ban_diff = array_diff_assoc($before_bans, count($after_bans) ? $after_bans : []); + + $this->assertEquals($expected, $ban_diff); + } + + public function test_unban_invalid_type() + { + $this->expectException(type_not_found_exception::class); + + $this->ban_manager->unban('does_not_exist', []); + } + + public function test_base_type_methods() + { + $ban_type_ip = $this->phpbb_container->get('ban.type.ip'); + $base_type_reflection = new \ReflectionClass(\phpbb\ban\type\base::class); + $after_unban = $base_type_reflection->getMethod('after_unban'); + $this->assertEquals([], $after_unban->invoke($ban_type_ip, ['items' => ['foo']])); + + $check = $base_type_reflection->getMethod('check'); + $this->assertFalse($check->invoke($ban_type_ip, [], [])); + } + + public static function data_get_ban_message(): array + { + return [ + [ + [ + 'end' => 0, + ], + 'foobar', + 'http://foo.bar', + 'You have been permanently banned from this board.

      Please contact the Board Administrator for more information.

      BAN_TRIGGERED_BY_FOOBAR', + ], + [ + [ + 'end' => 1, + ], + 'foobar', + 'http://foo.bar', + 'You have been banned from this board until .

      Please contact the Board Administrator for more information.

      BAN_TRIGGERED_BY_FOOBAR', + ], + [ + [ + 'end' => 1, + 'reason' => 'just because', + ], + 'foobar', + 'http://foo.bar', + 'You have been banned from this board until .

      Please contact the Board Administrator for more information.

      Reason given for ban: just because

      BAN_TRIGGERED_BY_FOOBAR', + ], + ]; + } + + /** + * @dataProvider data_get_ban_message + */ + public function test_get_ban_message($ban_row, $ban_triggered_by, $contact_link, $expected) + { + $this->assertEquals($expected, $this->ban_manager->get_ban_message($ban_row, $ban_triggered_by, $contact_link)); + } + + public function test_get_ban_options_user() + { + $foo = $this->ban_manager->get_bans('user'); + + $this->assertEquals( + [ + [ + 'ban_id' => 4, + 'ban_userid' => '4', + 'ban_mode' => 'user', + 'ban_item' => '4', + 'ban_start' => '1111', + 'ban_end' => '0', + 'ban_reason' => 'HAHAHA', + 'ban_reason_display' => '1', + 'user_id' => '4', + 'username' => 'ipv6_user', + 'username_clean' => 'ipv6_user', + 'label' => 'ipv6_user', + ], + ], + $foo + ); + } +} diff --git a/tests/ban/fixtures/sessions_banlist.xml b/tests/ban/fixtures/sessions_banlist.xml new file mode 100644 index 00000000000..c6c882fcf9b --- /dev/null +++ b/tests/ban/fixtures/sessions_banlist.xml @@ -0,0 +1,177 @@ + + + + user_id + username + username_clean + user_permissions + user_sig + user_email + user_ip + user_type + + 1 + anonymous + anonymous + + + + 127.0.0.1 + 2 + + + 2 + founder + founder + + + admin@foo.bar + 21.22.23.24 + 3 + + + 3 + normal_user + normal_user + + + normal_user@foo.bar + 21.22.23.25 + 0 + + + 4 + ipv6_user + ipv6_user + + + normal_user@foo.bar + 2345:0425:2CA1:0000:0000:0567:5673:23b5 + 0 + + + 5 + another_user + another_user + + + bar@example.org + 123.124.125.126 + 0 + +
      + + session_id + session_user_id + session_ip + session_browser + session_admin + + bar_session000000000000000000000 + 4 + 127.0.0.1 + user agent + 1 + +
      + + ban_id + ban_userid + ban_mode + ban_item + ban_start + ban_end + ban_reason + ban_reason_display + + 2 + 0 + ip + 127.0.0.1 + 1111 + 0 + HAHAHA + 1 + + + 3 + 0 + ip + 127.1.1.1 + 1111 + 0 + HAHAHA + 1 + + + 4 + 4 + user + 4 + 1111 + 0 + HAHAHA + 1 + + + 5 + 0 + email + bar@example.org + 1111 + 0 + HAHAHA + 1 + + + 6 + 0 + ip + 10.0.0.1/28 + 1111 + 0 + HAHAHA + 1 + + + 7 + 0 + ip + 2001:4860:4860::8888/12 + 1111 + 0 + HAHAHA + 1 + + + 8 + 0 + invalid_mode + foo + 1111 + 0 + HAHAHA + 1 + + + 9 + 0 + email + *@foo.bar + 1111 + 0 + HAHAHA + 1 + + + 10 + 10 + user + 3 + 1111 + 1234 + expired + 1 + +
      +       diff --git a/tests/bbcode/parser_test.php b/tests/bbcode/parser_test.php index b569d371f18..1786fabc5fc 100644 --- a/tests/bbcode/parser_test.php +++ b/tests/bbcode/parser_test.php @@ -11,12 +11,12 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php'; +require_once __DIR__ . '/../../phpBB/includes/bbcode.php'; +require_once __DIR__ . '/../../phpBB/includes/message_parser.php'; class phpbb_bbcode_parser_test extends \phpbb_test_case { - public function bbcode_firstpass_data() + public static function bbcode_firstpass_data() { return array( // Default bbcodes from in their simplest way @@ -120,6 +120,11 @@ public function bbcode_firstpass_data() '[img]https://area51.phpbb.com/images/area51.png[/img]', '[img:]https://area51.phpbb.com/images/area51.png[/img:]', ), + array( + 'Test default bbcodes: img with unsupported protocol', + '[img]foo://foo/bar[/img]', + '[img]foo://foo/bar[/img]', + ), array( 'Test default bbcodes: simple url', '[url]https://area51.phpbb.com/[/url]', @@ -206,11 +211,6 @@ public function bbcode_firstpass_data() '[quote="[img]https://area51.phpbb.com/images/area51.png[/img]"]test[/quote]', '[quote="[img:]https://area51.phpbb.com/images/area51.png[/img:]":]test[/quote:]', ), - array( - 'Disallow flash bbcodes in usernames - Username displayed as [flash]http://www.phpbb.com/[/flash]', - '[quote="[flash]http://www.phpbb.com/[/flash]"]test[/quote]', - '[quote="[flash]http://www.phpbb.com/[/flash]":]test[/quote:]', - ), array( 'Disallow quote bbcodes in usernames - Username displayed as [quote]test[/quote]', '[quote="[quote]test[/quote]"]test[/quote]', @@ -249,12 +249,21 @@ public function test_bbcode_firstpass($description, $message, $expected, $incomp $this->markTestIncomplete($incomplete); } - global $user, $request, $symfony_request; + global $user, $request, $symfony_request, $phpbb_dispatcher, $config, $phpEx; + $phpEx = 'php'; + $config = new \phpbb\config\config([ + 'max_post_font_size' => 0, + 'force_server_vars' => 0, + 'server_name' => 'testhost', + ]); $user = new phpbb_mock_user; + $user->lang['UNAUTHORISED_BBCODE'] = 'UNAUTHORISED_BBCODE'; $request = new phpbb_mock_request; $symfony_request = new \phpbb\symfony_request($request); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $bbcode = new bbcode_firstpass(); + $bbcode->mode = 'post'; $bbcode->message = $message; $bbcode->bbcode_init(false); $bbcode->parse_bbcode(); diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php index f95970a6bb9..5f42f1d4bb4 100644 --- a/tests/bbcode/url_bbcode_test.php +++ b/tests/bbcode/url_bbcode_test.php @@ -11,12 +11,12 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php'; +require_once __DIR__ . '/../../phpBB/includes/bbcode.php'; +require_once __DIR__ . '/../../phpBB/includes/message_parser.php'; class phpbb_url_bbcode_test extends phpbb_test_case { - public function url_bbcode_test_data() + public static function url_bbcode_test_data() { return array( array( @@ -52,10 +52,18 @@ public function url_bbcode_test_data() */ public function test_url($description, $message, $expected) { - global $user, $request, $symfony_request; + global $user, $request, $symfony_request, $phpbb_dispatcher, $config, $phpEx; + $phpEx = 'php'; + $config = new \phpbb\config\config([ + 'max_post_font_size' => 0, + 'force_server_vars' => 0, + 'server_name' => 'testhost', + ]); $user = new phpbb_mock_user; + $user->lang['UNAUTHORISED_BBCODE'] = 'UNAUTHORISED_BBCODE'; $request = new phpbb_mock_request; $symfony_request = new \phpbb\symfony_request($request); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $bbcode = new bbcode_firstpass(); $bbcode->message = $message; diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 18977bac88f..9efef937a4a 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -14,13 +14,14 @@ define('IN_PHPBB', true); define('PHPBB_ENVIRONMENT', 'test'); +global $phpbb_class_loader, $phpbb_class_loader_mock, $phpbb_class_loader_ext, $phpbb_class_loader_tests; +global $phpbb_root_path, $phpEx, $table_prefix; + $phpbb_root_path = 'phpBB/'; $phpEx = 'php'; +$table_prefix = 'phpbb_'; -global $table_prefix; require_once $phpbb_root_path . 'includes/startup.php'; - -$table_prefix = 'phpbb_'; require_once $phpbb_root_path . 'includes/constants.php'; require_once $phpbb_root_path . 'phpbb/class_loader.' . $phpEx; require_once $phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx; @@ -34,15 +35,16 @@ $phpbb_class_loader_ext->register(); $phpbb_class_loader = new \phpbb\class_loader('phpbb\\', $phpbb_root_path . 'phpbb/', "php"); $phpbb_class_loader->register(); +$phpbb_class_loader_tests = new \phpbb\class_loader('phpbb\\tests\\', $phpbb_root_path . '../tests/', 'php'); +$phpbb_class_loader_tests->register(); require_once 'test_framework/phpbb_test_case_helpers.php'; require_once 'test_framework/phpbb_test_case.php'; require_once 'test_framework/phpbb_database_test_case.php'; require_once 'test_framework/phpbb_database_test_connection_manager.php'; require_once 'test_framework/phpbb_functional_test_case.php'; -require_once 'test_framework/phpbb_ui_test_case.php'; -if (version_compare(PHP_VERSION, '5.3.19', ">=") && file_exists(__DIR__ . '/vendor/autoload.php')) +if (file_exists(__DIR__ . '/vendor/autoload.php')) { require_once __DIR__ . '/vendor/autoload.php'; } diff --git a/tests/cache/apc_driver_test.php b/tests/cache/apc_driver_test.php deleted file mode 100644 index 706f2744489..00000000000 --- a/tests/cache/apc_driver_test.php +++ /dev/null @@ -1,57 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -// Important: apc.enable_cli=1 must be in php.ini. -// http://forums.devshed.com/php-development-5/apc-problem-561290.html -// http://php.net/manual/en/apc.configuration.php - -require_once dirname(__FILE__) . '/common_test_case.php'; - -class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case -{ - protected static $config; - protected $driver; - - public function getDataSet() - { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); - } - - static public function setUpBeforeClass() - { - if (!extension_loaded('apc')) - { - self::markTestSkipped('APC extension is not loaded'); - } - - $php_ini = new \bantu\IniGetWrapper\IniGetWrapper; - - if (!$php_ini->getBool('apc.enabled')) - { - self::markTestSkipped('APC is not enabled. Make sure apc.enabled=1 in php.ini'); - } - - if (PHP_SAPI == 'cli' && !$php_ini->getBool('apc.enable_cli')) - { - self::markTestSkipped('APC is not enabled for CLI. Set apc.enable_cli=1 in php.ini'); - } - } - - protected function setUp() - { - parent::setUp(); - - $this->driver = new \phpbb\cache\driver\apc; - $this->driver->purge(); - } -} diff --git a/tests/cache/apcu_driver_test.php b/tests/cache/apcu_driver_test.php index 9de1d82a15c..4079a27dbd2 100644 --- a/tests/cache/apcu_driver_test.php +++ b/tests/cache/apcu_driver_test.php @@ -15,19 +15,16 @@ // http://forums.devshed.com/php-development-5/apc-problem-561290.html // http://php.net/manual/en/apc.configuration.php -require_once dirname(__FILE__) . '/common_test_case.php'; +require_once __DIR__ . '/common_test_case.php'; class phpbb_cache_apcu_driver_test extends phpbb_cache_common_test_case { - protected static $config; - protected $driver; - public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); } - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { if (!extension_loaded('apcu')) { @@ -45,14 +42,33 @@ static public function setUpBeforeClass() { self::markTestSkipped('APCu is not enabled for CLI. Set apc.enable_cli=1 in php.ini'); } + + parent::setUpBeforeClass(); } - protected function setUp() + protected function setUp(): void { + global $phpbb_container, $phpbb_root_path; + parent::setUp(); + $phpbb_container = new phpbb_mock_container_builder(); + $phpbb_container->setParameter('core.cache_dir', $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'); + $this->driver = new \phpbb\cache\driver\apcu; $this->driver->purge(); } + + public function test_purge() + { + /* add a cache entry which does not match our key */ + $foreign_key = 'test_' . $this->driver->key_prefix . 'test'; + $this->assertSame(true, apcu_store($foreign_key, 0, 600)); + $this->assertSame(true, apcu_exists($foreign_key)); + + parent::test_purge(); + + $this->assertSame(true, apcu_exists($foreign_key)); + } } diff --git a/tests/cache/cache_memory.php b/tests/cache/cache_memory.php index 806edb963a8..9d94c080f26 100644 --- a/tests/cache/cache_memory.php +++ b/tests/cache/cache_memory.php @@ -18,45 +18,31 @@ class phpbb_cache_memory extends \phpbb\cache\driver\memory /** * Set cache path */ - function phpbb_cache_memory() + function __construct() { } /** - * Fetch an item from the cache - * - * @access protected - * @param string $var Cache key - * @return mixed Cached data - */ - function _read($var) + * {@inheritDoc} + */ + protected function _read(string $var) { - return $this->data[$var]; + return $this->data[$var] ?? false; } /** - * Store data in the cache - * - * @access protected - * @param string $var Cache key - * @param mixed $data Data to store - * @param int $ttl Time-to-live of cached data - * @return bool True if the operation succeeded + * {@inheritDoc} */ - function _write($var, $data, $ttl = 2592000) + protected function _write(string $var, $data, int $ttl = 2592000): bool { $this->data[$var] = $data; return true; } /** - * Remove an item from the cache - * - * @access protected - * @param string $var Cache key - * @return bool True if the operation succeeded - */ - function _delete($var) + * {@inheritDoc} + */ + protected function _delete(string $var): bool { unset($this->data[$var]); return true; diff --git a/tests/cache/cache_memory_test.php b/tests/cache/cache_memory_test.php index ba1010bcf39..1607d294251 100644 --- a/tests/cache/cache_memory_test.php +++ b/tests/cache/cache_memory_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/cache_memory.php'; +require_once __DIR__ . '/cache_memory.php'; class phpbb_cache_memory_test extends phpbb_database_test_case { @@ -20,10 +20,10 @@ class phpbb_cache_memory_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/cache_memory.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/cache_memory.xml'); } - protected function setUp() + protected function setUp(): void { global $db; parent::setUp(); @@ -123,7 +123,7 @@ public function test_cache_single_query($sql_queries, $table) foreach ($sql_queries as $query) { - $this->assertNotEquals(false, $this->cache->sql_load($query[0])); + $this->assertFalse($this->cache->sql_load($query[0])); } } } diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php index ee0649a755b..cb98b150861 100644 --- a/tests/cache/common_test_case.php +++ b/tests/cache/common_test_case.php @@ -13,6 +13,9 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case { + /** @var \phpbb\cache\driver\driver_interface */ + protected $driver; + public function test_get_put_exists() { $this->assertFalse($this->driver->_exists('test_key')); @@ -71,7 +74,8 @@ public function test_cache_sql() global $db, $cache, $phpbb_root_path, $phpEx; $config = new phpbb\config\config(array()); $db = $this->new_dbal(); - $cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_root_path, $phpEx); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_dispatcher, $phpbb_root_path, $phpEx); $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; @@ -82,7 +86,7 @@ public function test_cache_sql() $this->assertEquals($expected, $first_result); $sql = 'DELETE FROM phpbb_config'; - $result = $db->sql_query($sql); + $db->sql_query($sql); $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; diff --git a/tests/cache/dummy_driver_test.php b/tests/cache/dummy_driver_test.php index 6cb6b737290..f73155542ff 100644 --- a/tests/cache/dummy_driver_test.php +++ b/tests/cache/dummy_driver_test.php @@ -17,10 +17,10 @@ class phpbb_cache_dummy_driver_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -52,7 +52,8 @@ public function test_cache_sql() global $db, $cache, $phpbb_root_path, $phpEx; $config = new phpbb\config\config(array()); $db = $this->new_dbal(); - $cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_root_path, $phpEx); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_dispatcher, $phpbb_root_path, $phpEx); $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; @@ -62,7 +63,7 @@ public function test_cache_sql() $this->assertEquals($expected, $first_result); $sql = 'DELETE FROM phpbb_config'; - $result = $db->sql_query($sql); + $db->sql_query($sql); // As null cache driver does not actually cache, // this should return no results diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php index 471316847d9..f615cea3b01 100644 --- a/tests/cache/file_driver_test.php +++ b/tests/cache/file_driver_test.php @@ -11,27 +11,26 @@ * */ -require_once dirname(__FILE__) . '/common_test_case.php'; +require_once __DIR__ . '/common_test_case.php'; class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case { private $cache_dir; - protected $driver; - public function __construct() - { - $this->cache_dir = dirname(__FILE__) . '/../tmp/cache/'; - } + /** @var \phpbb\cache\driver\file */ + private $cache_file; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); + $this->cache_dir = __DIR__ . '/../tmp/cache/'; + if (file_exists($this->cache_dir)) { // cache directory possibly left after aborted @@ -40,10 +39,11 @@ protected function setUp() } $this->create_cache_dir(); - $this->driver = new \phpbb\cache\driver\file($this->cache_dir); + $this->cache_file = new \phpbb\cache\driver\file($this->cache_dir); + $this->driver = $this->cache_file; } - protected function tearDown() + protected function tearDown(): void { if (file_exists($this->cache_dir)) { @@ -53,6 +53,141 @@ protected function tearDown() parent::tearDown(); } + public function test_read_not_readable() + { + if (strtolower(substr(PHP_OS, 0, 3)) === 'win') + { + $this->markTestSkipped('Unable to test unreadable files on Windows'); + } + + global $phpEx; + + // Create file that is not readable + $this->assertTrue($this->cache_file->_write('unreadable', 'foo', time() + 86400)); + + $filename = "{$this->cache_dir}unreadable.$phpEx"; + @chmod($filename, 0000); + $readReflection = new \ReflectionMethod($this->cache_file, '_read'); + $this->assertFalse($readReflection->invoke($this->cache_file, 'unreadable')); + @chmod($filename, 0600); + $this->assertNotFalse($readReflection->invoke($this->cache_file, 'unreadable')); + } + + public function test_read_data_global_invalid() + { + global $phpEx; + + $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); + $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); + + $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); + $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]); + + // Create file in invalid format + $this->assertTrue($this->cache_file->_write('data_global')); + $filename = "{$this->cache_dir}data_global.$phpEx"; + $cache_data = file_get_contents($filename); + // Force negative read when retrieving data_global + $cache_data = str_replace("\n13\n", "\n1\n", $cache_data); + file_put_contents($filename, $cache_data); + + $readReflection = new \ReflectionMethod($this->cache_file, '_read'); + $this->assertFalse($readReflection->invoke($this->cache_file, 'data_global')); + } + + public function test_read_data_global_zero_bytes() + { + global $phpEx; + + $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); + $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); + + $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); + $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]); + + // Create file in invalid format + $this->assertTrue($this->cache_file->_write('data_global')); + $filename = "{$this->cache_dir}data_global.$phpEx"; + $cache_data = file_get_contents($filename); + // Force negative read when retrieving data_global + $cache_data = str_replace("\n13\n", "\n0\n", $cache_data); + file_put_contents($filename, $cache_data); + + $readReflection = new \ReflectionMethod($this->cache_file, '_read'); + $this->assertFalse($readReflection->invoke($this->cache_file, 'data_global')); + } + + public function test_read_data_global_hex_bytes() + { + global $phpEx; + + $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); + $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); + + $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); + $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]); + + // Create file in invalid format + $this->assertTrue($this->cache_file->_write('data_global')); + $filename = "{$this->cache_dir}data_global.$phpEx"; + $cache_data = file_get_contents($filename); + // Force negative read when retrieving data_global + $cache_data = str_replace("\n13\n", "\nA\n", $cache_data); + file_put_contents($filename, $cache_data); + + $readReflection = new \ReflectionMethod($this->cache_file, '_read'); + $this->assertFalse($readReflection->invoke($this->cache_file, 'data_global')); + } + + public function test_read_data_global_expired() + { + $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); + $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); + + $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); + $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() - 86400]); + + // Create file in invalid format + $this->assertTrue($this->cache_file->_write('data_global')); + + // Clear data + $reflectionCacheVars->setValue($this->cache_file, []); + $reflectionCacheVarExpires->setValue($this->cache_file, []); + + $readReflection = new \ReflectionMethod($this->cache_file, '_read'); + $this->assertTrue($readReflection->invoke($this->cache_file, 'data_global')); + + // Check data, should be empty + $this->assertEquals([], $reflectionCacheVars->getValue($this->cache_file)); + } + + public function test_read_data_global() + { + $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); + $expectedVars = ['foo' => 'bar']; + $reflectionCacheVars->setValue($this->cache_file, $expectedVars); + + $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); + $expectedVarExpires = ['foo' => time() + 86400]; + $reflectionCacheVarExpires->setValue($this->cache_file, $expectedVarExpires); + + // Create file in invalid format + $this->assertTrue($this->cache_file->_write('data_global')); + + // Clear data + $reflectionCacheVars->setValue($this->cache_file, []); + $reflectionCacheVarExpires->setValue($this->cache_file, []); + $this->assertEquals([], $reflectionCacheVars->getValue($this->cache_file)); + $this->assertEquals([], $reflectionCacheVarExpires->getValue($this->cache_file)); + + $readReflection = new \ReflectionMethod($this->cache_file, '_read'); + $this->assertTrue($readReflection->invoke($this->cache_file, 'data_global')); + + // Check data, should be empty + $this->assertEquals($expectedVars, $reflectionCacheVars->getValue($this->cache_file)); + $this->assertEquals($expectedVarExpires, $reflectionCacheVarExpires->getValue($this->cache_file)); + } + private function create_cache_dir() { $this->get_test_case_helpers()->makedirs($this->cache_dir); diff --git a/tests/cache/memcached_driver_test.php b/tests/cache/memcached_driver_test.php new file mode 100644 index 00000000000..172be106241 --- /dev/null +++ b/tests/cache/memcached_driver_test.php @@ -0,0 +1,65 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +require_once __DIR__ . '/common_test_case.php'; + +class phpbb_cache_memcached_driver_test extends \phpbb_cache_common_test_case +{ + protected static $config; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); + } + + static public function setUpBeforeClass(): void + { + if (!extension_loaded('memcached')) + { + self::markTestSkipped('memcached extension is not loaded'); + } + + $config = phpbb_test_case_helpers::get_test_config(); + if (isset($config['memcached_host']) || isset($config['memcached_port'])) + { + $host = isset($config['memcached_host']) ? $config['memcached_host'] : 'localhost'; + $port = isset($config['memcached_port']) ? $config['memcached_port'] : 11211; + self::$config = array('host' => $host, 'port' => $port); + } + else + { + self::markTestSkipped('Test memcached host/port is not specified'); + } + + $memcached = new \Memcached(); + $memcached->addServer(self::$config['host'], self::$config['port']); + if (empty($memcached->getStats())) + { + self::markTestSkipped('Test memcached server is not available'); + } + + parent::setUpBeforeClass(); + } + + protected function setUp(): void + { + global $phpbb_root_path, $phpbb_container; + + parent::setUp(); + + $phpbb_container = new phpbb_mock_container_builder(); + $phpbb_container->setParameter('core.cache_dir', $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'); + $this->driver = new \phpbb\cache\driver\memcached(self::$config['host'] . '/' . self::$config['port']); + $this->driver->purge(); + } +} diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php index 387e6ca8557..49f748526b2 100644 --- a/tests/cache/redis_driver_test.php +++ b/tests/cache/redis_driver_test.php @@ -11,19 +11,18 @@ * */ -require_once dirname(__FILE__) . '/common_test_case.php'; +require_once __DIR__ . '/common_test_case.php'; -class phpbb_cache_redis_driver_test extends phpbb_cache_common_test_case +class phpbb_cache_redis_driver_test extends \phpbb_cache_common_test_case { protected static $config; - protected $driver; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); } - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { if (!extension_loaded('redis')) { @@ -33,7 +32,7 @@ static public function setUpBeforeClass() $config = phpbb_test_case_helpers::get_test_config(); if (isset($config['redis_host']) || isset($config['redis_port'])) { - $host = isset($config['redis_host']) ? $config['redis_host'] : 'localhost'; + $host = isset($config['redis_host']) ? $config['redis_host'] : '0.0.0.0'; $port = isset($config['redis_port']) ? $config['redis_port'] : 6379; self::$config = array('host' => $host, 'port' => $port); } @@ -41,12 +40,20 @@ static public function setUpBeforeClass() { self::markTestSkipped('Test redis host/port is not specified'); } + + parent::setUpBeforeClass(); } - protected function setUp() + protected function setUp(): void { + global $phpbb_root_path, $phpbb_container, $dbname, $table_prefix; + parent::setUp(); + $phpbb_container = new phpbb_mock_container_builder(); + $phpbb_container->setParameter('core.cache_dir', $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'); + $config = phpbb_test_case_helpers::get_test_config(); + $dbname = $config['dbname']; $this->driver = new \phpbb\cache\driver\redis(self::$config['host'], self::$config['port']); $this->driver->purge(); } diff --git a/tests/captcha/incomplete_test.php b/tests/captcha/incomplete_test.php new file mode 100644 index 00000000000..4c5e7c6b279 --- /dev/null +++ b/tests/captcha/incomplete_test.php @@ -0,0 +1,99 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\captcha\plugins\confirm_type; +use phpbb\captcha\plugins\incomplete; +use phpbb\config\config; +use phpbb\language\language; +use phpbb\request\request; +use phpbb\template\template; +use phpbb\user; + +class phpbb_captcha_incomplete_test extends phpbb_database_test_case +{ + protected config $config; + + protected template $template; + + + /** @var incomplete */ + protected incomplete $incomplete_captcha; + + protected array $assigned_vars = []; + + public function assign_vars(array $vars): void + { + $this->assigned_vars = array_merge($this->assigned_vars, $vars); + } + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); + } + + protected function setUp(): void + { + global $phpbb_root_path, $phpEx; + + $this->config = new config([]); + $this->template = $this->getMockBuilder('\phpbb\template\twig\twig') + ->onlyMethods(['assign_vars']) + ->disableOriginalConstructor() + ->getMock(); + $this->template->method('assign_vars') + ->willReturnCallback([$this, 'assign_vars']); + $db = $this->new_dbal(); + $language = $this->createMock(language::class); + $request = $this->createMock(request::class); + $user = $this->createMock(user::class); + + $this->incomplete_captcha = new incomplete( + $this->config, + $db, + $language, + $request, + $this->template, + $user, + $phpbb_root_path, + $phpEx + ); + } + + public function test_miscellaneous_incomplete(): void + { + $this->assertTrue($this->incomplete_captcha->is_available()); + $this->assertFalse($this->incomplete_captcha->is_solved()); + $this->assertFalse($this->incomplete_captcha->validate()); + $this->assertFalse($this->incomplete_captcha->has_config()); + $this->incomplete_captcha->set_name('foo'); + $this->assertSame('CAPTCHA_INCOMPLETE', $this->incomplete_captcha->get_name()); + $this->incomplete_captcha->init(confirm_type::UNDEFINED); + $this->assertEmpty($this->assigned_vars); + $this->assertEmpty($this->incomplete_captcha->get_demo_template(0)); + $this->assertEmpty($this->incomplete_captcha->get_error()); + $this->assertSame(0, $this->incomplete_captcha->get_attempt_count()); + } + + public function test_get_tempate(): void + { + $this->incomplete_captcha->init(confirm_type::REGISTRATION); + $this->assertSame('captcha_incomplete.html', $this->incomplete_captcha->get_template()); + $this->assertEquals('CONFIRM_INCOMPLETE', $this->assigned_vars['CONFIRM_LANG']); + + $this->assigned_vars = []; + + $this->incomplete_captcha->init(confirm_type::POST); + $this->assertSame('captcha_incomplete.html', $this->incomplete_captcha->get_template()); + $this->assertEquals('CONFIRM_INCOMPLETE', $this->assigned_vars['CONFIRM_LANG']); + } +} diff --git a/tests/captcha/legacy_wrapper_test.php b/tests/captcha/legacy_wrapper_test.php new file mode 100644 index 00000000000..873012bd6a1 --- /dev/null +++ b/tests/captcha/legacy_wrapper_test.php @@ -0,0 +1,261 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\captcha\plugins\confirm_type; +use phpbb\captcha\plugins\legacy_wrapper; + +class phpbb_captcha_legacy_wrapper_test extends phpbb_test_case +{ + private $legacy_captcha; + private $legacy_wrapper; + + public function setUp(): void + { + $this->legacy_captcha = $this->createMock(stdClass::class); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + } + + public function test_is_available_with_method_exists(): void + { + // Simulate is_available method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['is_available']) + ->getMock(); + $this->legacy_captcha->method('is_available')->willReturn(true); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + + $this->assertTrue($this->legacy_wrapper->is_available()); + } + + public function test_is_available_without_method_exists(): void + { + // Simulate is_available method does not exist in the legacy captcha + $this->assertFalse($this->legacy_wrapper->is_available()); + } + + public function test_has_config_with_method_exists(): void + { + // Simulate has_config method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['has_config']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('has_config')->willReturn(true); + + $this->assertTrue($this->legacy_wrapper->has_config()); + } + + public function test_has_config_without_method_exists(): void + { + // Simulate has_config method does not exist in the legacy captcha + $this->assertFalse($this->legacy_wrapper->has_config()); + } + + public function test_get_name_with_method_exists(): void + { + // Simulate get_name method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['get_name']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('get_name')->willReturn('LegacyCaptchaName'); + + $this->assertSame('LegacyCaptchaName', $this->legacy_wrapper->get_name()); + } + + public function test_get_name_without_method_exists(): void + { + // Simulate get_name method does not exist in the legacy captcha + $this->assertSame('', $this->legacy_wrapper->get_name()); + } + + public function test_set_name_with_method_exists(): void + { + // Simulate set_name method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['set_name']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->expects($this->once())->method('set_name')->with('NewName'); + + $this->legacy_wrapper->set_name('NewName'); + } + + public function test_init_with_method_exists(): void + { + // Simulate init method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['init']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->expects($this->once())->method('init')->with(confirm_type::REGISTRATION->value); + + $this->legacy_wrapper->init(confirm_type::REGISTRATION); + } + + public function test_get_hidden_fields_with_method_exists(): void + { + // Simulate get_hidden_fields method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['get_hidden_fields']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('get_hidden_fields')->willReturn(['field1' => 'value1']); + + $this->assertSame(['field1' => 'value1'], $this->legacy_wrapper->get_hidden_fields()); + } + + public function test_get_hidden_fields_without_method_exists(): void + { + // Simulate get_hidden_fields method does not exist in the legacy captcha + $this->assertSame([], $this->legacy_wrapper->get_hidden_fields()); + } + + public function test_validate_with_error(): void + { + // Simulate validate method returns an error + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['validate']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('validate')->willReturn('Captcha Error'); + + $this->assertFalse($this->legacy_wrapper->validate()); + $this->assertSame('Captcha Error', $this->legacy_wrapper->get_error()); + } + + public function test_validate_without_method_exists(): void + { + $this->assertFalse($this->legacy_wrapper->validate()); + } + + public function test_validate_without_error(): void + { + // Simulate validate method does not return an error + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['validate']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('validate')->willReturn(null); + + $this->assertTrue($this->legacy_wrapper->validate()); + } + + public function test_is_solved_with_method_exists(): void + { + // Simulate is_solved method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['is_solved']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('is_solved')->willReturn(true); + + $this->assertTrue($this->legacy_wrapper->is_solved()); + } + + public function test_is_solved_without_method_exists(): void + { + // Simulate is_solved method does not exist in the legacy captcha + $this->assertFalse($this->legacy_wrapper->is_solved()); + } + + public function test_reset_with_method_exists(): void + { + // Simulate reset method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['reset']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->expects($this->once())->method('reset'); + + $this->legacy_wrapper->reset(); + } + + public function test_get_attempt_count_with_method_exists(): void + { + // Simulate get_attempt_count method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['get_attempt_count']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('get_attempt_count')->willReturn(5); + + $this->assertSame(5, $this->legacy_wrapper->get_attempt_count()); + } + + public function test_get_attempt_count_without_method_exists(): void + { + // Simulate get_attempt_count method does not exist in the legacy captcha + $this->assertSame(PHP_INT_MAX, $this->legacy_wrapper->get_attempt_count()); + } + + public function test_get_template_with_method_exists(): void + { + // Simulate get_template method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['get_template']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('get_template')->willReturn('template_content'); + + $this->assertSame('template_content', $this->legacy_wrapper->get_template()); + } + + public function test_get_template_without_method_exists(): void + { + // Simulate get_template method does not exist in the legacy captcha + $this->assertSame('', $this->legacy_wrapper->get_template()); + } + + public function test_get_demo_template_with_method_exists(): void + { + // Simulate get_demo_template method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['get_demo_template']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('get_demo_template')->willReturn('demo_template_content'); + + $this->assertSame('demo_template_content', $this->legacy_wrapper->get_demo_template()); + } + + public function test_get_demo_template_without_method_exists(): void + { + // Simulate get_demo_template method does not exist in the legacy captcha + $this->assertSame('', $this->legacy_wrapper->get_demo_template()); + } + + public function test_garbage_collect_with_method_exists(): void + { + // Simulate garbage_collect method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['garbage_collect']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->expects($this->once())->method('garbage_collect')->with(confirm_type::REGISTRATION->value); + + $this->legacy_wrapper->garbage_collect(confirm_type::REGISTRATION); + } + + public function test_acp_page_with_method_exists(): void + { + // Simulate acp_page method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['acp_page']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->expects($this->once())->method('acp_page')->with(1, 'module'); + + $this->legacy_wrapper->acp_page(1, 'module'); + } +} diff --git a/tests/captcha/qa_test.php b/tests/captcha/qa_test.php index 7ec4be69f50..b91db97d6e3 100644 --- a/tests/captcha/qa_test.php +++ b/tests/captcha/qa_test.php @@ -20,30 +20,27 @@ class phpbb_captcha_qa_test extends \phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); } - public function setUp() + protected function setUp(): void { global $db, $request, $phpbb_container; $db = $this->new_dbal(); + $db_doctrine = $this->new_doctrine_dbal(); parent::setUp(); $request = new \phpbb_mock_request(); $phpbb_container = new \phpbb_mock_container_builder(); $factory = new \phpbb\db\tools\factory(); - $phpbb_container->set('dbal.tools', $factory->get($db)); + $phpbb_container->set('dbal.tools', $factory->get($db_doctrine)); $this->qa = new \phpbb\captcha\plugins\qa('phpbb_captcha_questions', 'phpbb_captcha_answers', 'phpbb_qa_confirm'); } public function test_is_installed() { - $this->assertFalse($this->qa->is_installed()); - - $this->qa->install(); - $this->assertTrue($this->qa->is_installed()); } @@ -54,7 +51,7 @@ public function test_set_get_name() $this->assertSame('foobar', $this->qa->get_service_name()); } - public function data_acp_get_question_input() + public static function data_acp_get_question_input() { return array( array("foobar\ntest\nyes", array( diff --git a/tests/captcha/turnstile_test.php b/tests/captcha/turnstile_test.php new file mode 100644 index 00000000000..c95e3225d2e --- /dev/null +++ b/tests/captcha/turnstile_test.php @@ -0,0 +1,541 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\captcha\plugins\confirm_type; +use phpbb\captcha\plugins\turnstile; +use phpbb\config\config; +use phpbb\db\driver\driver_interface; +use phpbb\form\form_helper; +use phpbb\language\language; +use phpbb\log\log_interface; +use phpbb\request\request; +use phpbb\request\request_interface; +use phpbb\template\template; +use phpbb\user; +use GuzzleHttp\Client; +use GuzzleHttp\Psr7\Response; +use GuzzleHttp\Psr7\Utils; + +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; + +class phpbb_captcha_turnstile_test extends \phpbb_database_test_case +{ + /** @var turnstile */ + protected $turnstile; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $config; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $db; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $language; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $log; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $request; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $template; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $user; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); + } + + protected function setUp(): void + { + // Mock the dependencies + $this->config = $this->createMock(config::class); + $this->db = $this->new_dbal(); + $this->language = $this->createMock(language::class); + $this->log = $this->createMock(log_interface::class); + $this->request = $this->createMock(request::class); + $this->template = $this->createMock(template::class); + $this->user = $this->createMock(user::class); + + $this->language->method('lang')->willReturnArgument(0); + + // Instantiate the turnstile class with the mocked dependencies + $this->turnstile = new turnstile( + $this->config, + $this->db, + $this->language, + $this->log, + $this->request, + $this->template, + $this->user + ); + } + + public function test_is_available(): void + { + // Test when both sitekey and secret are present + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_secret', 'secret_value'], + ]); + + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->assertTrue($this->turnstile->is_available()); + + $this->assertEquals(0, $this->turnstile->get_attempt_count()); + } + + public function test_attempt_count_increase(): void + { + // Test when both sitekey and secret are present + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_secret', 'secret_value'], + ]); + + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->turnstile->init(confirm_type::REGISTRATION); + $this->assertFalse($this->turnstile->validate()); + + $confirm_id_reflection = new \ReflectionProperty($this->turnstile, 'confirm_id'); + $confirm_id = $confirm_id_reflection->getValue($this->turnstile); + + $this->request = $this->createMock(request::class); + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, $confirm_id], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->turnstile = new turnstile( + $this->config, + $this->db, + $this->language, + $this->log, + $this->request, + $this->template, + $this->user + ); + + $this->turnstile->init(confirm_type::REGISTRATION); + $this->assertEquals(1, $this->turnstile->get_attempt_count()); + + // Run some garbage collection + $this->turnstile->garbage_collect(confirm_type::REGISTRATION); + + // Start again at 0 after garbage collection + $this->turnstile->init(confirm_type::REGISTRATION); + $this->assertEquals(0, $this->turnstile->get_attempt_count()); + } + + public function test_reset(): void + { + // Test when both sitekey and secret are present + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_secret', 'secret_value'], + ]); + + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->turnstile->init(confirm_type::REGISTRATION); + $this->assertFalse($this->turnstile->validate()); + $this->turnstile->reset(); + + $confirm_id_reflection = new \ReflectionProperty($this->turnstile, 'confirm_id'); + $confirm_id = $confirm_id_reflection->getValue($this->turnstile); + + $this->request = $this->createMock(request::class); + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, $confirm_id], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->turnstile = new turnstile( + $this->config, + $this->db, + $this->language, + $this->log, + $this->request, + $this->template, + $this->user + ); + + $this->turnstile->init(confirm_type::REGISTRATION); + // Should be zero attempts since we reset the captcha + $this->assertEquals(0, $this->turnstile->get_attempt_count()); + } + + public function test_get_hidden_fields(): void + { + // Test when both sitekey and secret are present + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_secret', 'secret_value'], + ]); + + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->turnstile->init(confirm_type::REGISTRATION); + $this->assertFalse($this->turnstile->validate()); + $this->turnstile->reset(); + + $confirm_id_reflection = new \ReflectionProperty($this->turnstile, 'confirm_id'); + $confirm_id = $confirm_id_reflection->getValue($this->turnstile); + + $this->assertEquals( + [ + 'confirm_id' => $confirm_id, + 'confirm_code' => '', + ], + $this->turnstile->get_hidden_fields(), + ); + $this->assertEquals('CONFIRM_CODE_WRONG', $this->turnstile->get_error()); + } + + public function test_not_available(): void + { + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + // Test when sitekey or secret is missing + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', ''], + ['captcha_turnstile_secret', 'secret_value'], + ]); + + $this->assertFalse($this->turnstile->is_available()); + } + + public function test_get_name(): void + { + $this->assertEquals('CAPTCHA_TURNSTILE', $this->turnstile->get_name()); + } + + public function test_set_Name(): void + { + $this->turnstile->set_name('custom_service'); + $service_name_property = new \ReflectionProperty($this->turnstile, 'service_name'); + $this->assertEquals('custom_service', $service_name_property->getValue($this->turnstile)); + } + + public function test_validate_without_response(): void + { + // Test when there is no Turnstile response + $this->request->method('variable')->with('cf-turnstile-response')->willReturn(''); + + $this->assertFalse($this->turnstile->validate()); + } + + public function test_validate_with_response_success(): void + { + // Mock the request and response from the Turnstile API + $this->request->method('variable')->with('cf-turnstile-response')->willReturn('valid_response'); + $this->request->method('header')->with('CF-Connecting-IP')->willReturn('127.0.0.1'); + + // Mock the GuzzleHttp client and response + $client_mock = $this->createMock(Client::class); + $response_mock = $this->createMock(Response::class); + + $client_mock->method('request')->willReturn($response_mock); + $response_mock->method('getBody')->willReturn(Utils::streamFor(json_encode(['success' => true]))); + + // Mock config values for secret + $this->config->method('offsetGet')->willReturn('secret_value'); + + // Use reflection to inject the mocked client into the turnstile class + $reflection = new \ReflectionClass($this->turnstile); + $client_property = $reflection->getProperty('client'); + $client_property->setValue($this->turnstile, $client_mock); + + // Validate that the CAPTCHA was solved successfully + $this->assertTrue($this->turnstile->validate()); + } + + public function test_validate_with_guzzle_exception(): void + { + // Mock the request and response from the Turnstile API + $this->request->method('variable')->with('cf-turnstile-response')->willReturn('valid_response'); + $this->request->method('header')->with('CF-Connecting-IP')->willReturn('127.0.0.1'); + + // Mock the GuzzleHttp client and response + $client_mock = $this->createMock(Client::class); + + $request_mock = $this->createMock(\GuzzleHttp\Psr7\Request::class); + $exception = new \GuzzleHttp\Exception\ConnectException('Failed at connecting', $request_mock); + $client_mock->method('request')->willThrowException($exception); + + // Mock config values for secret + $this->config->method('offsetGet')->willReturn('secret_value'); + + // Use reflection to inject the mocked client into the turnstile class + $reflection = new \ReflectionClass($this->turnstile); + $client_property = $reflection->getProperty('client'); + $client_property->setValue($this->turnstile, $client_mock); + + // Validatation fails due to guzzle exception + $this->assertFalse($this->turnstile->validate()); + } + + public function test_validate_previous_solve(): void + { + // Use reflection to inject the mocked client into the turnstile class + $reflection = new \ReflectionClass($this->turnstile); + $confirm_id = $reflection->getProperty('confirm_id'); + $confirm_id->setValue($this->turnstile, 'confirm_id'); + $code_property = $reflection->getProperty('code'); + $code_property->setValue($this->turnstile, 'test_code'); + $confirm_code_property = $reflection->getProperty('confirm_code'); + $confirm_code_property->setValue($this->turnstile, 'test_code'); + + // Validate that the CAPTCHA was solved successfully + $this->assertTrue($this->turnstile->validate()); + $this->assertTrue($this->turnstile->is_solved()); + } + + public function test_has_config(): void + { + $this->assertTrue($this->turnstile->has_config()); + } + + public function test_get_client(): void + { + $turnstile_reflection = new \ReflectionClass($this->turnstile); + $get_client_method = $turnstile_reflection->getMethod('get_client'); + $client_property = $turnstile_reflection->getProperty('client'); + + $this->assertFalse($client_property->isInitialized($this->turnstile)); + $client = $get_client_method->invoke($this->turnstile); + $this->assertNotNull($client); + $this->assertInstanceOf(\GuzzleHttp\Client::class, $client); + $this->assertTrue($client === $get_client_method->invoke($this->turnstile)); + } + + public function test_validate_with_response_failure(): void + { + // Mock the request and response from the Turnstile API + $this->request->method('variable')->with('cf-turnstile-response')->willReturn('valid_response'); + $this->request->method('header')->with('CF-Connecting-IP')->willReturn('127.0.0.1'); + + // Mock the GuzzleHttp client and response + $client_mock = $this->createMock(Client::class); + $response_mock = $this->createMock(Response::class); + + $client_mock->method('request')->willReturn($response_mock); + $response_mock->method('getBody')->willReturn(Utils::streamFor(json_encode(['success' => false]))); + + // Mock config values for secret + $this->config->method('offsetGet')->willReturn('secret_value'); + + // Use reflection to inject the mocked client into the turnstile class + $reflection = new \ReflectionClass($this->turnstile); + $client_property = $reflection->getProperty('client'); + $client_property->setValue($this->turnstile, $client_mock); + + // Validate that the CAPTCHA was not solved + $this->assertFalse($this->turnstile->validate()); + } + + public function test_get_template(): void + { + // Mock is_solved to return false + $is_solved_property = new \ReflectionProperty($this->turnstile, 'solved'); + $is_solved_property->setValue($this->turnstile, false); + + // Mock the template assignments + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_theme', 'light'], + ]); + + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->template->expects($this->once())->method('assign_vars')->with([ + 'S_TURNSTILE_AVAILABLE' => $this->turnstile->is_available(), + 'TURNSTILE_SITEKEY' => 'sitekey_value', + 'TURNSTILE_THEME' => 'light', + 'U_TURNSTILE_SCRIPT' => 'https://challenges.cloudflare.com/turnstile/v0/api.js', + 'CONFIRM_TYPE_REGISTRATION' => confirm_type::UNDEFINED->value, + ]); + + $this->assertEquals('captcha_turnstile.html', $this->turnstile->get_template()); + + $is_solved_property->setValue($this->turnstile, true); + $this->assertEquals('', $this->turnstile->get_template()); + } + + public function test_get_demo_template(): void + { + // Mock the config assignments + $this->config->method('offsetGet')->willReturn('light'); + + $this->template->expects($this->once())->method('assign_vars')->with([ + 'TURNSTILE_THEME' => 'light', + 'U_TURNSTILE_SCRIPT' => 'https://challenges.cloudflare.com/turnstile/v0/api.js', + ]); + + $this->assertEquals('captcha_turnstile_acp_demo.html', $this->turnstile->get_demo_template()); + } + + public function test_acp_page_display(): void + { + global $phpbb_container, $phpbb_dispatcher, $template; + + $phpbb_container = new phpbb_mock_container_builder(); + $form_helper = new form_helper($this->config, $this->request, $this->user); + $phpbb_container->set('form_helper', $form_helper); + $this->user->data['user_id'] = ANONYMOUS; + $this->user->data['user_form_salt'] = 'foobar'; + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $template = $this->template; + + // Mock the template assignments + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_theme', 'light'], + ]); + + $this->request->method('variable')->willReturn(''); + + $expected = [ + 1 => [ + 'TURNSTILE_THEME' => 'light', + 'U_TURNSTILE_SCRIPT' => 'https://challenges.cloudflare.com/turnstile/v0/api.js', + ], + 2 => [ + 'CAPTCHA_PREVIEW' => 'captcha_turnstile_acp_demo.html', + 'CAPTCHA_NAME' => '', + 'CAPTCHA_TURNSTILE_THEME' => 'light', + 'CAPTCHA_TURNSTILE_THEMES' => ['light', 'dark', 'auto'], + 'U_ACTION' => 'test_u_action', + ], + ]; + $matcher = $this->exactly(count($expected)); + $this->template + ->expects($matcher) + ->method('assign_vars') + ->willReturnCallback(function ($template_data) use ($matcher, $expected) { + $callNr = $matcher->numberOfInvocations(); + $this->assertEquals($expected[$callNr], $template_data); + }); + + $module_mock = new ModuleMock(); + + $this->turnstile->acp_page('', $module_mock); + } + + public function test_acp_page_submit_without_form(): void + { + global $language, $phpbb_container, $phpbb_dispatcher, $template; + + $language = $this->language; + $phpbb_container = new phpbb_mock_container_builder(); + $form_helper = new form_helper($this->config, $this->request, $this->user); + $phpbb_container->set('form_helper', $form_helper); + $this->user->data['user_id'] = ANONYMOUS; + $this->user->data['user_form_salt'] = 'foobar'; + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $template = $this->template; + + // Mock the template assignments + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_theme', 'light'], + ]); + + $this->request->method('is_set_post')->willReturnMap([ + ['creation_time', ''], + ['submit', true] + ]); + + $this->setExpectedTriggerError(E_USER_NOTICE, 'FORM_INVALID'); + + $module_mock = new ModuleMock(); + + $this->turnstile->acp_page('', $module_mock); + } + + public function test_acp_page_submit_valid(): void + { + global $language, $phpbb_container, $phpbb_dispatcher, $template; + + $language = $this->language; + $phpbb_container = new phpbb_mock_container_builder(); + $form_helper = new form_helper($this->config, $this->request, $this->user); + $phpbb_container->set('form_helper', $form_helper); + $this->user->data['user_id'] = ANONYMOUS; + $this->user->data['user_form_salt'] = 'foobar'; + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $template = $this->template; + + $form_tokens = $form_helper->get_form_tokens('acp_captcha'); + + // Mock the template assignments + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_theme', 'light'], + ]); + $this->config['form_token_lifetime'] = 3600; + + $this->request->method('is_set_post')->willReturnMap([ + ['creation_time', true], + ['form_token', true], + ['submit', true] + ]); + + $this->request->method('variable')->willReturnMap([ + ['creation_time', 0, false, request_interface::REQUEST, $form_tokens['creation_time']], + ['form_token', '', false, request_interface::REQUEST, $form_tokens['form_token']], + ['captcha_turnstile_sitekey', '', false, request_interface::REQUEST, 'newsitekey'], + ['captcha_turnstile_theme', 'light', false, request_interface::REQUEST, 'auto'], + ]); + + $this->setExpectedTriggerError(E_USER_NOTICE, 'CONFIG_UPDATED'); + + $module_mock = new ModuleMock(); + sleep(1); // sleep for a second to ensure form token validation succeeds + + $this->turnstile->acp_page('', $module_mock); + } +} + +class ModuleMock +{ + public string $tpl_name = ''; + public string $page_title = ''; + public string $u_action = 'test_u_action'; +} diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php index ffb14b07200..ae8d82a98d8 100644 --- a/tests/class_loader/class_loader_test.php +++ b/tests/class_loader/class_loader_test.php @@ -13,7 +13,7 @@ class phpbb_class_loader_test extends \phpbb_test_case { - public function setUp() + protected function setUp(): void { global $phpbb_class_loader; $phpbb_class_loader->unregister(); @@ -22,7 +22,7 @@ public function setUp() $phpbb_class_loader_ext->unregister(); } - public function tearDown() + protected function tearDown(): void { global $phpbb_class_loader_ext; $phpbb_class_loader_ext->register(); @@ -33,7 +33,7 @@ public function tearDown() public function test_resolve_path() { - $prefix = dirname(__FILE__) . '/'; + $prefix = __DIR__ . '/'; $class_loader = new \phpbb\class_loader('phpbb\\', $prefix . 'phpbb/'); $prefix .= 'phpbb/'; @@ -68,7 +68,7 @@ public function test_resolve_cached() ); $cache = new phpbb_mock_cache($cache_map); - $prefix = dirname(__FILE__) . '/'; + $prefix = __DIR__ . '/'; $class_loader = new \phpbb\class_loader('phpbb\\', $prefix . 'phpbb/', 'php', $cache); $class_loader_ext = new \phpbb\class_loader('\\', $prefix . 'phpbb/', 'php', $cache); diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php index c071a049a8e..7e77dc0349b 100644 --- a/tests/compress/compress_test.php +++ b/tests/compress/compress_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compress.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_admin.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_compress.php'; class phpbb_compress_test extends phpbb_test_case { @@ -34,13 +34,13 @@ class phpbb_compress_test extends phpbb_test_case 'dir/2_1.txt', ); - protected function setUp() + protected function setUp(): void { // Required for compress::add_file global $phpbb_root_path; $phpbb_root_path = ''; - $this->path = dirname(__FILE__) . '/fixtures/'; + $this->path = __DIR__ . '/fixtures/'; } protected function check_extensions($extensions) @@ -54,9 +54,9 @@ protected function check_extensions($extensions) } } - protected function tearDown() + protected function tearDown(): void { - foreach (array(dirname(__FILE__) . self::EXTRACT_DIR, dirname(__FILE__) . self::ARCHIVE_DIR) as $dir) + foreach (array(__DIR__ . self::EXTRACT_DIR, __DIR__ . self::ARCHIVE_DIR) as $dir) { $this->clear_dir($dir); } @@ -110,7 +110,7 @@ protected function valid_extraction($extra = array()) foreach ($filelist as $filename) { - $path = dirname(__FILE__) . self::EXTRACT_DIR . $filename; + $path = __DIR__ . self::EXTRACT_DIR . $filename; $this->assertTrue(file_exists($path)); // Check the file's contents is correct @@ -120,7 +120,7 @@ protected function valid_extraction($extra = array()) } } - public function tar_archive_list() + public static function tar_archive_list() { return array( array('archive.tar', '.tar', array()), @@ -155,7 +155,7 @@ public function test_compress_tar($filename, $type, $extensions) { $this->check_extensions($extensions); - $tar = dirname(__FILE__) . self::ARCHIVE_DIR . $filename; + $tar = __DIR__ . self::ARCHIVE_DIR . $filename; $compress = new compress_tar('w', $tar); $this->archive_files($compress); $compress->close(); @@ -174,7 +174,7 @@ public function test_compress_zip() { $this->check_extensions(array('zlib')); - $zip = dirname(__FILE__) . self::ARCHIVE_DIR . 'archive.zip'; + $zip = __DIR__ . self::ARCHIVE_DIR . 'archive.zip'; $compress = new compress_zip('w', $zip); $this->archive_files($compress); $compress->close(); diff --git a/tests/config/db_test.php b/tests/config/db_test.php index 713e6cb6d91..5bed8d405d3 100644 --- a/tests/config/db_test.php +++ b/tests/config/db_test.php @@ -19,10 +19,10 @@ class phpbb_config_db_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); } - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -86,6 +86,17 @@ public function test_set_new() $this->cache->checkVar($this, 'config', array('foo' => '23', 'foobar' => '5')); } + public function test_set_new_json() + { + $json_value = '{"menu":{"id":"file","value":"File"}}'; + $this->config->set('foobar_json', $json_value); + $this->assertEquals($json_value, $this->config['foobar_json']); + + // re-read config and populate cache + $config2 = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config'); + $this->cache->checkVar($this, 'config', ['foo' => '23', 'foobar_json' => $json_value]); + } + public function test_set_new_uncached() { $this->config->set('foobar', '5', false); @@ -125,7 +136,7 @@ public function test_increment() public function test_increment_new() { $this->config->increment('foobar', 3); - $this->assertEquals(3, $this->config['foobar']);; + $this->assertEquals(3, $this->config['foobar']); } public function test_delete() diff --git a/tests/config/db_text_test.php b/tests/config/db_text_test.php index a91abf990f7..d85dc8d637c 100644 --- a/tests/config/db_text_test.php +++ b/tests/config/db_text_test.php @@ -16,12 +16,14 @@ class phpbb_config_db_text_test extends phpbb_database_test_case /** @var \phpbb\config\db_text */ protected $config_text; + protected $db; + public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config_text.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config_text.xml'); } - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -46,6 +48,13 @@ public function test_set_new_get() $this->assertSame('phpbb', $this->config_text->get('barz')); } + public function test_set_new_get_json() + { + $json_value = '{"menu":{"id":"file","value":"File"}}'; + $this->config_text->set('foobar_json', $json_value); + $this->assertEquals($json_value, $this->config_text->get('foobar_json')); + } + public function test_set_replace_get() { $this->config_text->set('foo', '24'); diff --git a/tests/console/cache/purge_test.php b/tests/console/cache/purge_test.php index 7a7e1dee5ce..1e245f88aea 100644 --- a/tests/console/cache/purge_test.php +++ b/tests/console/cache/purge_test.php @@ -15,25 +15,24 @@ use Symfony\Component\Console\Tester\CommandTester; use phpbb\console\command\cache\purge; -require_once dirname(__FILE__) . '/../../../phpBB/includes/functions_admin.php'; +require_once __DIR__ . '/../../../phpBB/includes/functions_admin.php'; class phpbb_console_command_cache_purge_test extends phpbb_test_case { protected $cache_dir; protected $cache; - protected $command_name; - protected $db; protected $config; + protected $db; + protected $db_tools; + protected $language; + protected $user; - public function __construct() - { - $this->cache_dir = dirname(__FILE__) . '/tmp/cache/'; - } - - protected function setUp() + protected function setUp(): void { global $phpbb_root_path, $phpEx; + $this->cache_dir = __DIR__ . '/tmp/cache/'; + if (file_exists($this->cache_dir)) { // cache directory possibly left after aborted @@ -45,12 +44,12 @@ protected function setUp() $this->cache = new \phpbb\cache\driver\file($this->cache_dir); $this->db = $this->createMock('\phpbb\db\driver\driver_interface'); + $tools_factory = new \phpbb\db\tools\factory(); + $this->db_tools = $this->createMock('\phpbb\db\tools\doctrine'); $this->config = new \phpbb\config\config(array('assets_version' => 1)); - $this->user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime') - ); + $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $this->user = new \phpbb\user($this->language, '\phpbb\datetime'); } public function test_purge() @@ -64,7 +63,7 @@ public function test_purge() ); $command_tester = $this->get_command_tester(); - $exit_status = $command_tester->execute(array('command' => $this->command_name)); + $exit_status = $command_tester->execute([]); $this->assertSame(false, $this->cache->get('test_key')); $this->assertSame(2, $this->config['assets_version']); @@ -91,10 +90,9 @@ private function remove_cache_dir() public function get_command_tester() { $application = new Application(); - $application->add(new purge($this->user, $this->cache, $this->db, $this->createMock('\phpbb\auth\auth'), new \phpbb\log\dummy(), $this->config)); + $application->add(new purge($this->user, $this->cache, $this->db, $this->db_tools, $this->createMock('\phpbb\auth\auth'), new \phpbb\log\dummy(), $this->config)); $command = $application->find('cache:purge'); - $this->command_name = $command->getName(); return new CommandTester($command); } } diff --git a/tests/console/config/config_test.php b/tests/console/config/config_test.php index 7f8b2efce24..26aff894ea4 100644 --- a/tests/console/config/config_test.php +++ b/tests/console/config/config_test.php @@ -20,16 +20,11 @@ class phpbb_console_command_config_test extends phpbb_test_case protected $command_name; protected $user; - public function setUp() + protected function setUp(): void { - global $phpbb_root_path, $phpEx; - $this->config = new \phpbb\config\config(array()); - $this->user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime') - ); + $this->user = $this->createMock('\phpbb\user'); $this->user->method('lang')->will($this->returnArgument(0)); } @@ -37,9 +32,8 @@ public function test_set_dynamic() { $this->assertEmpty($this->config); - $command_tester = $this->get_command_tester('set'); + $command_tester = $this->get_command_tester('set', 'set'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'test_key', 'value' => 'test_value', '--dynamic' => true, @@ -52,9 +46,8 @@ public function test_set_no_dynamic() { $this->assertEmpty($this->config); - $command_tester = $this->get_command_tester('set'); + $command_tester = $this->get_command_tester('set', 'set'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'test_key', 'value' => 'test_value', '--dynamic' => false, @@ -70,9 +63,8 @@ public function test_set_atomic_dynamic() $this->config->set('test_key', 'old_value', true); $this->assertSame($this->config['test_key'], 'old_value'); - $command_tester = $this->get_command_tester('set_atomic'); + $command_tester = $this->get_command_tester('set_atomic', 'set-atomic'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'test_key', 'old' => 'old_value', 'new' => 'new_value', @@ -89,9 +81,8 @@ public function test_set_atomic_no_dynamic() $this->config->set('test_key', 'old_value', false); $this->assertSame($this->config['test_key'], 'old_value'); - $command_tester = $this->get_command_tester('set_atomic'); + $command_tester = $this->get_command_tester('set_atomic', 'set-atomic'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'test_key', 'old' => 'old_value', 'new' => 'new_value', @@ -108,9 +99,8 @@ public function test_set_atomic_error_dynamic() $this->config->set('test_key', 'wrong_value', true); $this->assertSame($this->config['test_key'], 'wrong_value'); - $command_tester = $this->get_command_tester('set_atomic'); + $command_tester = $this->get_command_tester('set_atomic', 'set-atomic'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'test_key', 'old' => 'old_value', 'new' => 'new_value', @@ -125,9 +115,8 @@ public function test_get_no_new_line() $this->config->set('test_key', 'test_value', false); $this->assertSame($this->config['test_key'], 'test_value'); - $command_tester = $this->get_command_tester('get'); + $command_tester = $this->get_command_tester('get', 'get'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'test_key', '--no-newline' => true, )); @@ -140,9 +129,8 @@ public function test_get_new_line() $this->config->set('test_key', 'test_value', false); $this->assertSame($this->config['test_key'], 'test_value'); - $command_tester = $this->get_command_tester('get'); + $command_tester = $this->get_command_tester('get', 'get'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'test_key', '--no-newline' => false, )); @@ -155,14 +143,13 @@ public function test_get_error() $this->config->set('test_key', 'test_value', false); $this->assertSame($this->config['test_key'], 'test_value'); - $command_tester = $this->get_command_tester('get'); + $command_tester = $this->get_command_tester('get', 'get'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'wrong_key', '--no-newline' => false, )); - $this->assertContains('CLI_CONFIG_NOT_EXISTS', $command_tester->getDisplay()); + $this->assertStringContainsString('CLI_CONFIG_NOT_EXISTS', $command_tester->getDisplay()); } public function test_increment_dynamic() @@ -170,15 +157,14 @@ public function test_increment_dynamic() $this->config->set('test_key', 0, false); $this->assertSame($this->config['test_key'], 0); - $command_tester = $this->get_command_tester('increment'); + $command_tester = $this->get_command_tester('increment', 'increment'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'test_key', 'increment' => 2, '--dynamic' => true, )); - $this->assertContains('CLI_CONFIG_INCREMENT_SUCCESS', $command_tester->getDisplay()); + $this->assertStringContainsString('CLI_CONFIG_INCREMENT_SUCCESS', $command_tester->getDisplay()); $this->assertSame(2, $this->config['test_key']); } @@ -187,15 +173,14 @@ public function test_increment_no_dynamic() $this->config->set('test_key', 0, false); $this->assertSame($this->config['test_key'], 0); - $command_tester = $this->get_command_tester('increment'); + $command_tester = $this->get_command_tester('increment', 'increment'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'test_key', 'increment' => 2, '--dynamic' => false, )); - $this->assertContains('CLI_CONFIG_INCREMENT_SUCCESS', $command_tester->getDisplay()); + $this->assertStringContainsString('CLI_CONFIG_INCREMENT_SUCCESS', $command_tester->getDisplay()); $this->assertSame(2, $this->config['test_key']); } @@ -203,15 +188,14 @@ public function test_increment_no_set() { $this->assertEmpty($this->config); - $command_tester = $this->get_command_tester('increment'); + $command_tester = $this->get_command_tester('increment', 'increment'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'test_key', 'increment' => 2, '--dynamic' => true, )); - $this->assertContains('CLI_CONFIG_INCREMENT_SUCCESS', $command_tester->getDisplay()); + $this->assertStringContainsString('CLI_CONFIG_INCREMENT_SUCCESS', $command_tester->getDisplay()); $this->assertSame(2, $this->config['test_key']); } @@ -220,13 +204,12 @@ public function test_delete_ok() $this->config->set('test_key', 'test_value', false); $this->assertSame($this->config['test_key'], 'test_value'); - $command_tester = $this->get_command_tester('delete'); + $command_tester = $this->get_command_tester('delete', 'delete'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'test_key', )); - $this->assertContains('CLI_CONFIG_DELETE_SUCCESS', $command_tester->getDisplay()); + $this->assertStringContainsString('CLI_CONFIG_DELETE_SUCCESS', $command_tester->getDisplay()); $this->assertEmpty($this->config); } @@ -234,23 +217,21 @@ public function test_delete_error() { $this->assertEmpty($this->config); - $command_tester = $this->get_command_tester('delete'); + $command_tester = $this->get_command_tester('delete', 'delete'); $command_tester->execute(array( - 'command' => $this->command_name, 'key' => 'wrong_key', )); - $this->assertContains('CLI_CONFIG_NOT_EXISTS', $command_tester->getDisplay()); + $this->assertStringContainsString('CLI_CONFIG_NOT_EXISTS', $command_tester->getDisplay()); $this->assertEmpty($this->config); } - public function get_command_tester($class_name) + public function get_command_tester($class_name, $command_name) { $command_complete_name = '\phpbb\console\command\config' . '\\' . $class_name; $application = new Application(); $application->add(new $command_complete_name($this->user, $this->config)); - $command = $application->find('config:' . $this->command_name); - $this->command_name = $command->getName(); + $command = $application->find('config:' . $command_name); return new CommandTester($command); } } diff --git a/tests/console/cron/cron_list_test.php b/tests/console/cron/cron_list_test.php index 931713cd3c0..25e8efd74ee 100644 --- a/tests/console/cron/cron_list_test.php +++ b/tests/console/cron/cron_list_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/tasks/simple_ready.php'; -require_once dirname(__FILE__) . '/tasks/simple_not_ready.php'; +require_once __DIR__ . '/tasks/simple_ready.php'; +require_once __DIR__ . '/tasks/simple_not_ready.php'; use Symfony\Component\Console\Application; use Symfony\Component\Console\Tester\CommandTester; @@ -26,37 +26,32 @@ class phpbb_console_command_cron_list_test extends phpbb_test_case /** @var \phpbb\user */ protected $user; - protected $command_name; - protected $command_tester; - protected function setUp() + protected function setUp(): void { global $phpbb_root_path, $phpEx; - $this->user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + $this->user = $this->createMock('\phpbb\user'); $this->user->method('lang')->will($this->returnArgument(0)); } public function test_no_task() { $this->initiate_test(0, 0); - $this->assertContains('CRON_NO_TASKS', $this->command_tester->getDisplay()); + $this->assertStringContainsString('CRON_NO_TASKS', $this->command_tester->getDisplay()); } public function test_only_ready() { $this->initiate_test(2, 0); - $this->assertContains('TASKS_READY command1 command2', preg_replace('/[\s*=]+/', ' ', trim($this->command_tester->getDisplay()))); + $this->assertStringContainsString('TASKS_READY command1 command2', preg_replace('/[\s*=]+/', ' ', trim($this->command_tester->getDisplay()))); } public function test_only_not_ready() { $this->initiate_test(0, 2); - $this->assertContains('TASKS_NOT_READY command1 command2', preg_replace('/[\s*=]+/', ' ', trim($this->command_tester->getDisplay()))); + $this->assertStringContainsString('TASKS_NOT_READY command1 command2', preg_replace('/[\s*=]+/', ' ', trim($this->command_tester->getDisplay()))); } public function test_both_ready() @@ -81,11 +76,9 @@ public function get_cron_manager(array $tasks) )); $mock_router = $this->getMockBuilder('\phpbb\routing\router') - ->setMethods(array('setContext', 'generate')) + ->onlyMethods(array('setContext', 'generate')) ->disableOriginalConstructor() ->getMock(); - $mock_router->method('setContext') - ->willReturn(true); $mock_router->method('generate') ->willReturn('foobar'); @@ -101,7 +94,12 @@ public function get_cron_manager(array $tasks) $pathEx ); - $this->cron_manager = new \phpbb\cron\manager($tasks, $routing_helper, $phpbb_root_path, $pathEx); + $mock_container = new phpbb_mock_container_builder(); + $task_collection = new \phpbb\di\service_collection($mock_container); + $mock_container->set('cron.task_collection', $task_collection); + + $this->cron_manager = new \phpbb\cron\manager($mock_container, $routing_helper, $phpbb_root_path, $pathEx, null); + $this->cron_manager->load_tasks($tasks); } public function get_command_tester() @@ -110,7 +108,6 @@ public function get_command_tester() $application->add(new cron_list($this->user, $this->cron_manager)); $command = $application->find('cron:list'); - $this->command_name = $command->getName(); return new CommandTester($command); } @@ -130,6 +127,6 @@ public function initiate_test($number_ready, $number_not_ready) $this->get_cron_manager($tasks); $this->command_tester = $this->get_command_tester(); - $this->command_tester->execute(array('command' => $this->command_name), array('decorated' => false)); + $this->command_tester->execute([], array('decorated' => false)); } } diff --git a/tests/console/cron/run_test.php b/tests/console/cron/run_test.php index 81e4e69f396..7cf1407466c 100644 --- a/tests/console/cron/run_test.php +++ b/tests/console/cron/run_test.php @@ -15,7 +15,7 @@ use Symfony\Component\Console\Tester\CommandTester; use phpbb\console\command\cron\run; -require_once dirname(__FILE__) . '/tasks/simple.php'; +require_once __DIR__ . '/tasks/simple.php'; class phpbb_console_command_cron_run_test extends phpbb_database_test_case { @@ -24,15 +24,14 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case protected $lock; protected $user; protected $cron_manager; - protected $command_name; protected $task; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); } - public function setUp() + protected function setUp(): void { global $db, $config, $phpbb_root_path, $phpEx; @@ -40,10 +39,7 @@ public function setUp() $config = $this->config = new \phpbb\config\config(array('cron_lock' => '0')); $this->lock = new \phpbb\lock\db('cron_lock', $this->config, $this->db); - $this->user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + $this->user = $this->createMock('\phpbb\user'); $this->user->method('lang')->will($this->returnArgument(0)); $this->task = new phpbb_cron_task_simple(); @@ -57,11 +53,9 @@ public function setUp() )); $mock_router = $this->getMockBuilder('\phpbb\routing\router') - ->setMethods(array('setContext', 'generate')) + ->onlyMethods(array('setContext', 'generate')) ->disableOriginalConstructor() ->getMock(); - $mock_router->method('setContext') - ->willReturn(true); $mock_router->method('generate') ->willReturn('foobar'); @@ -77,7 +71,12 @@ public function setUp() $phpEx ); - $this->cron_manager = new \phpbb\cron\manager($tasks, $routing_helper, $phpbb_root_path, $phpEx); + $mock_container = new phpbb_mock_container_builder(); + $task_collection = new \phpbb\di\service_collection($mock_container); + $mock_container->set('cron.task_collection', $task_collection); + + $this->cron_manager = new \phpbb\cron\manager($mock_container, $routing_helper, $phpbb_root_path, $phpEx, null); + $this->cron_manager->load_tasks($tasks); $this->assertSame('0', $config['cron_lock']); } @@ -85,7 +84,7 @@ public function setUp() public function test_normal_use() { $command_tester = $this->get_command_tester(); - $exit_status = $command_tester->execute(array('command' => $this->command_name)); + $exit_status = $command_tester->execute([]); $this->assertSame('', $command_tester->getDisplay()); $this->assertSame(true, $this->task->executed); @@ -96,31 +95,32 @@ public function test_normal_use() public function test_verbose_mode() { $command_tester = $this->get_command_tester(); - $exit_status = $command_tester->execute(array('command' => $this->command_name, '--verbose' => true)); + $exit_status = $command_tester->execute(array('--verbose' => true)); - $this->assertContains('RUNNING_TASK', $command_tester->getDisplay()); + $this->assertStringContainsString('RUNNING_TASK', $command_tester->getDisplay()); $this->assertSame(true, $this->task->executed); $this->assertSame(0, $exit_status); $this->assertSame(false, $this->lock->owns_lock()); } - /** - * @expectedException \phpbb\exception\runtime_exception - * @expectedExceptionMessage CRON_LOCK_ERROR - */ public function test_error_lock() { + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('CRON_LOCK_ERROR'); + $this->lock->acquire(); $command_tester = $this->get_command_tester(); - $exit_status = $command_tester->execute(array('command' => $this->command_name)); + $exit_status = $command_tester->execute([]); - $this->assertContains('CRON_LOCK_ERROR', $command_tester->getDisplay()); + $this->assertStringContainsString('CRON_LOCK_ERROR', $command_tester->getDisplay()); $this->assertSame(false, $this->task->executed); $this->assertSame(1, $exit_status); } public function test_no_task() { + global $phpbb_root_path, $phpEx; + $tasks = array( ); @@ -130,11 +130,9 @@ public function test_no_task() )); $mock_router = $this->getMockBuilder('\phpbb\routing\router') - ->setMethods(array('setContext', 'generate')) + ->onlyMethods(array('setContext', 'generate')) ->disableOriginalConstructor() ->getMock(); - $mock_router->method('setContext') - ->willReturn(true); $mock_router->method('generate') ->willReturn('foobar'); @@ -150,9 +148,15 @@ public function test_no_task() $phpEx ); - $this->cron_manager = new \phpbb\cron\manager($tasks, $routing_helper, $phpbb_root_path, $phpEx); + $mock_container = new phpbb_mock_container_builder(); + $task_collection = new \phpbb\di\service_collection($mock_container); + $mock_container->set('cron.task_collection', $task_collection); + + $this->cron_manager = new \phpbb\cron\manager($mock_container, $routing_helper, $phpbb_root_path, $phpEx, null); + $this->cron_manager->load_tasks($tasks); + $command_tester = $this->get_command_tester(); - $exit_status = $command_tester->execute(array('command' => $this->command_name)); + $exit_status = $command_tester->execute([]); $this->assertSame('', $command_tester->getDisplay()); $this->assertSame(0, $exit_status); @@ -161,6 +165,8 @@ public function test_no_task() public function test_no_task_verbose() { + global $phpbb_root_path, $phpEx; + $tasks = array( ); @@ -170,11 +176,9 @@ public function test_no_task_verbose() )); $mock_router = $this->getMockBuilder('\phpbb\routing\router') - ->setMethods(array('setContext', 'generate')) + ->onlyMethods(array('setContext', 'generate')) ->disableOriginalConstructor() ->getMock(); - $mock_router->method('setContext') - ->willReturn(true); $mock_router->method('generate') ->willReturn('foobar'); @@ -190,11 +194,17 @@ public function test_no_task_verbose() $phpEx ); - $this->cron_manager = new \phpbb\cron\manager($tasks, $routing_helper, $phpbb_root_path, $phpEx); + $mock_container = new phpbb_mock_container_builder(); + $task_collection = new \phpbb\di\service_collection($mock_container); + $mock_container->set('cron.task_collection', $task_collection); + + $this->cron_manager = new \phpbb\cron\manager($mock_container, $routing_helper, $phpbb_root_path, $phpEx, null); + $this->cron_manager->load_tasks($tasks); + $command_tester = $this->get_command_tester(); - $exit_status = $command_tester->execute(array('command' => $this->command_name, '--verbose' => true)); + $exit_status = $command_tester->execute(array('--verbose' => true)); - $this->assertContains('CRON_NO_TASK', $command_tester->getDisplay()); + $this->assertStringContainsString('CRON_NO_TASK', $command_tester->getDisplay()); $this->assertSame(0, $exit_status); $this->assertSame(false, $this->lock->owns_lock()); } @@ -202,7 +212,7 @@ public function test_no_task_verbose() public function test_arg_valid() { $command_tester = $this->get_command_tester(); - $exit_status = $command_tester->execute(array('command' => $this->command_name, 'name' => 'phpbb_cron_task_simple')); + $exit_status = $command_tester->execute(array('name' => 'phpbb_cron_task_simple')); $this->assertSame('', $command_tester->getDisplay()); $this->assertSame(true, $this->task->executed); @@ -210,16 +220,15 @@ public function test_arg_valid() $this->assertSame(false, $this->lock->owns_lock()); } - /** - * @expectedException \phpbb\exception\runtime_exception - * @expectedExceptionMessage CRON_NO_SUCH_TASK - */ public function test_arg_invalid() { + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('CRON_NO_SUCH_TASK'); + $command_tester = $this->get_command_tester(); - $exit_status = $command_tester->execute(array('command' => $this->command_name, 'name' => 'foo')); + $exit_status = $command_tester->execute(array('name' => 'foo')); - $this->assertContains('CRON_NO_SUCH_TASK', $command_tester->getDisplay()); + $this->assertStringContainsString('CRON_NO_SUCH_TASK', $command_tester->getDisplay()); $this->assertSame(false, $this->task->executed); $this->assertSame(2, $exit_status); $this->assertSame(false, $this->lock->owns_lock()); @@ -228,9 +237,9 @@ public function test_arg_invalid() public function test_arg_valid_verbose() { $command_tester = $this->get_command_tester(); - $exit_status = $command_tester->execute(array('command' => $this->command_name, 'name' => 'phpbb_cron_task_simple', '--verbose' => true)); + $exit_status = $command_tester->execute(array('name' => 'phpbb_cron_task_simple', '--verbose' => true)); - $this->assertContains('RUNNING_TASK', $command_tester->getDisplay()); + $this->assertStringContainsString('RUNNING_TASK', $command_tester->getDisplay()); $this->assertSame(true, $this->task->executed); $this->assertSame(0, $exit_status); $this->assertSame(false, $this->lock->owns_lock()); @@ -242,7 +251,6 @@ public function get_command_tester() $application->add(new run($this->user, $this->cron_manager, $this->lock)); $command = $application->find('cron:run'); - $this->command_name = $command->getName(); return new CommandTester($command); } } diff --git a/tests/console/searchindex/create_test.php b/tests/console/searchindex/create_test.php new file mode 100644 index 00000000000..8d4958442c2 --- /dev/null +++ b/tests/console/searchindex/create_test.php @@ -0,0 +1,92 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\console\command\searchindex\create; +use Symfony\Component\Console\Application; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Tester\CommandTester; + +require_once __DIR__ . '/phpbb_console_searchindex_base.php'; +require_once __DIR__ . '/../../mock/search_backend_mock.php'; + +class phpbb_console_searchindex_create_test extends phpbb_console_searchindex_base +{ + public function get_command_tester() + { + $application = new Application(); + $application->add(new create( + $this->language, + $this->log, + $this->post_helper, + $this->search_backend_factory, + $this->state_helper, + $this->user + )); + + $command = $application->find('searchindex:create'); + + return new CommandTester($command); + } + + public function test_create() + { + $command_tester = $this->get_command_tester(); + + $command_tester->execute([ + 'search-backend' => 'search_backend_mock', + ]); + + $this->assertEquals(Command::SUCCESS, $command_tester->getStatusCode()); + $this->assertStringContainsString('CLI_SEARCHINDEX_CREATE_SUCCESS', $command_tester->getDisplay()); + } + + public function test_create_when_search_backend_dont_exist() + { + $command_tester = $this->get_command_tester(); + + $command_tester->execute([ + 'search-backend' => 'missing', + ]); + + $this->assertEquals(Command::FAILURE, $command_tester->getStatusCode()); + $this->assertStringContainsString('CLI_SEARCHINDEX_BACKEND_NOT_FOUND', $command_tester->getDisplay()); + } + + public function test_create_when_action_in_progress() + { + $this->config['search_indexing_state'] = ['not', 'empty']; + + $command_tester = $this->get_command_tester(); + + $command_tester->execute([ + 'search-backend' => 'search_backend_mock', + ]); + + $this->assertEquals(Command::FAILURE, $command_tester->getStatusCode()); + $this->assertStringContainsString('CLI_SEARCHINDEX_ACTION_IN_PROGRESS', $command_tester->getDisplay()); + + $this->config['search_indexing_state'] = []; + } + + public function test_create_when_search_backend_not_available() + { + $command_tester = $this->get_command_tester(); + + $command_tester->execute([ + 'search-backend' => 'search_backend_mock_not_available', + ]); + + $this->assertEquals(Command::FAILURE, $command_tester->getStatusCode()); + $this->assertStringContainsString('CLI_SEARCHINDEX_BACKEND_NOT_AVAILABLE', $command_tester->getDisplay()); + } +} diff --git a/tests/console/searchindex/delete_test.php b/tests/console/searchindex/delete_test.php new file mode 100644 index 00000000000..ac7762effd3 --- /dev/null +++ b/tests/console/searchindex/delete_test.php @@ -0,0 +1,92 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\console\command\searchindex\delete; +use Symfony\Component\Console\Application; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Tester\CommandTester; + +require_once __DIR__ . '/phpbb_console_searchindex_base.php'; +require_once __DIR__ . '/../../mock/search_backend_mock.php'; + +class phpbb_console_searchindex_delete_test extends phpbb_console_searchindex_base +{ + public function get_command_tester() + { + $application = new Application(); + $application->add(new delete( + $this->language, + $this->log, + $this->post_helper, + $this->search_backend_factory, + $this->state_helper, + $this->user + )); + + $command = $application->find('searchindex:delete'); + + return new CommandTester($command); + } + + public function test_delete() + { + $command_tester = $this->get_command_tester(); + + $command_tester->execute([ + 'search-backend' => 'search_backend_mock', + ]); + + $this->assertEquals(Command::SUCCESS, $command_tester->getStatusCode()); + $this->assertStringContainsString('CLI_SEARCHINDEX_DELETE_SUCCESS', $command_tester->getDisplay()); + } + + public function test_delete_when_search_backend_dont_exist() + { + $command_tester = $this->get_command_tester(); + + $command_tester->execute([ + 'search-backend' => 'missing', + ]); + + $this->assertEquals(Command::FAILURE, $command_tester->getStatusCode()); + $this->assertStringContainsString('CLI_SEARCHINDEX_BACKEND_NOT_FOUND', $command_tester->getDisplay()); + } + + public function test_delete_when_action_in_progress() + { + $this->config['search_indexing_state'] = ['not', 'empty']; + + $command_tester = $this->get_command_tester(); + + $command_tester->execute([ + 'search-backend' => 'search_backend_mock', + ]); + + $this->assertEquals(Command::FAILURE, $command_tester->getStatusCode()); + $this->assertStringContainsString('CLI_SEARCHINDEX_ACTION_IN_PROGRESS', $command_tester->getDisplay()); + + $this->config['search_indexing_state'] = []; + } + + public function test_delete_when_search_backend_not_available() + { + $command_tester = $this->get_command_tester(); + + $command_tester->execute([ + 'search-backend' => 'search_backend_mock_not_available', + ]); + + $this->assertEquals(Command::FAILURE, $command_tester->getStatusCode()); + $this->assertStringContainsString('CLI_SEARCHINDEX_BACKEND_NOT_AVAILABLE', $command_tester->getDisplay()); + } +} diff --git a/tests/console/searchindex/list_all_test.php b/tests/console/searchindex/list_all_test.php new file mode 100644 index 00000000000..79680326441 --- /dev/null +++ b/tests/console/searchindex/list_all_test.php @@ -0,0 +1,49 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\console\command\searchindex\list_all; +use Symfony\Component\Console\Application; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Tester\CommandTester; + +require_once __DIR__ . '/phpbb_console_searchindex_base.php'; +require_once __DIR__ . '/../../mock/search_backend_mock.php'; + +class phpbb_console_searchindex_list_all_test extends phpbb_console_searchindex_base +{ + public function get_command_tester() + { + $application = new Application(); + $application->add(new list_all( + $this->config, + $this->language, + $this->search_backend_collection, + $this->user + )); + + $command = $application->find('searchindex:list'); + + return new CommandTester($command); + } + + public function test_list() + { + $command_tester = $this->get_command_tester(); + + $command_tester->execute([]); + + $this->assertEquals(Command::SUCCESS, $command_tester->getStatusCode()); + $this->assertStringContainsString('Mock search backend', $command_tester->getDisplay()); + $this->assertStringContainsString('ACTIVE', $command_tester->getDisplay()); + } +} diff --git a/tests/console/searchindex/phpbb_console_searchindex_base.php b/tests/console/searchindex/phpbb_console_searchindex_base.php new file mode 100644 index 00000000000..209d12281ab --- /dev/null +++ b/tests/console/searchindex/phpbb_console_searchindex_base.php @@ -0,0 +1,93 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\config\config; +use phpbb\di\service_collection; +use phpbb\language\language; +use phpbb\log\log; +use phpbb\posting\post_helper; +use phpbb\search\search_backend_factory; +use phpbb\search\state_helper; +use phpbb\user; + +require_once __DIR__ . '/../../mock/search_backend_mock.php'; +require_once __DIR__ . '/../../mock/search_backend_mock_not_available.php'; + +class phpbb_console_searchindex_base extends phpbb_test_case +{ + /** @var config */ + protected $config; + + /** @var language */ + protected $language; + + /** @var log */ + protected $log; + + /** @var post_helper */ + protected $post_helper; + + /** @var user */ + protected $user; + + /** @var search_backend_factory */ + protected $search_backend_factory; + + /** @var state_helper */ + protected $state_helper; + + /** @var service_collection */ + protected $search_backend_collection; + + protected function setUp(): void + { + global $phpbb_root_path, $phpEx; + + $this->config = new \phpbb\config\config([ + 'search_indexing_state' => [], + 'search_type' => 'search_backend_mock' + ]); + + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $this->language = new \phpbb\language\language($lang_loader); + + $this->log = $this->createMock('\phpbb\log\log'); + + $this->post_helper = $this->createMock('\phpbb\posting\post_helper'); + $this->post_helper + ->method('get_max_post_id') + ->willReturn(1000); + + $this->user = $this->createMock('\phpbb\user'); + + $phpbb_container = new phpbb_mock_container_builder(); + $this->search_backend_collection = new \phpbb\di\service_collection($phpbb_container); + + $search_backend_mock = new search_backend_mock(); + $this->search_backend_collection->add('search_backend_mock'); + $this->search_backend_collection->add_service_class('search_backend_mock', 'search_backend_mock'); + $phpbb_container->set('search_backend_mock', $search_backend_mock); + + $search_backend_mock_not_available = new search_backend_mock_not_available(); + $this->search_backend_collection->add('search_backend_mock_not_available'); + $this->search_backend_collection->add_service_class('search_backend_mock_not_available', 'search_backend_mock_not_available'); + $phpbb_container->set('search_backend_mock_not_available', $search_backend_mock_not_available); + + $this->search_backend_factory = new search_backend_factory($this->config, $this->search_backend_collection); + + $this->state_helper = new state_helper($this->config, $this->search_backend_factory); + + parent::setUp(); + } +} + diff --git a/tests/console/thumbnail_test.php b/tests/console/thumbnail_test.php index ecce6f157c1..68d46517572 100644 --- a/tests/console/thumbnail_test.php +++ b/tests/console/thumbnail_test.php @@ -11,6 +11,7 @@ * */ +use phpbb\attachment\attachment_category; use Symfony\Component\Console\Application; use Symfony\Component\Console\Tester\CommandTester; use phpbb\console\command\thumbnail\generate; @@ -22,17 +23,20 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case protected $db; protected $config; protected $cache; + protected $language; protected $user; + protected $storage; + protected $temp; protected $phpEx; protected $phpbb_root_path; protected $application; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/thumbnail.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/thumbnail.xml'); } - public function setUp() + protected function setUp(): void { global $config, $phpbb_root_path, $phpEx, $phpbb_filesystem; @@ -45,52 +49,75 @@ public function setUp() $config = $this->config = new \phpbb\config\config(array( 'img_min_thumb_filesize' => 2, - 'img_max_thumb_width' => 2, - 'img_imagick' => '', + 'img_max_thumb_width' => 2 )); - $this->db = $this->db = $this->new_dbal(); - $this->user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime') - ); + $this->db = $this->new_dbal(); + $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $this->user = new \phpbb\user($this->language, '\phpbb\datetime'); $this->phpbb_root_path = $phpbb_root_path; $this->phpEx = $phpEx; - $this->cache = $this->createMock('\phpbb\cache\service', array(), array(new phpbb_mock_cache(), $this->config, $this->db, $this->phpbb_root_path, $this->phpEx)); + $this->cache = $this->createMock('\phpbb\cache\service'); $this->cache->expects(self::any())->method('obtain_attach_extensions')->will(self::returnValue(array( - 'png' => array('display_cat' => ATTACHMENT_CATEGORY_IMAGE), - 'txt' => array('display_cat' => ATTACHMENT_CATEGORY_NONE), + 'png' => array('display_cat' => attachment_category::IMAGE), + 'txt' => array('display_cat' => attachment_category::NONE), ))); - $this->application = new Application(); - $this->application->add(new generate($this->user, $this->db, $this->cache, $this->phpbb_root_path, $this->phpEx)); - $this->application->add(new delete($this->user, $this->db, $this->phpbb_root_path)); - $this->application->add(new recreate($this->user)); - $phpbb_filesystem = new \phpbb\filesystem\filesystem(); - copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_1'); - copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_2'); - copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/thumb_test_png_2'); - copy(dirname(__FILE__) . '/fixtures/txt.txt', $this->phpbb_root_path . 'files/test_txt'); + $this->storage = $this->createMock('\phpbb\storage\storage'); + $this->storage->method('write')->willReturnCallback(function ($path, $data) use ($phpbb_root_path) { + file_put_contents($phpbb_root_path . 'files/' . $path, $data); + }); + $this->storage->method('read')->willReturnCallback(function ($path) use ($phpbb_root_path) { + return fopen($phpbb_root_path . 'files/' . $path, 'rb'); + }); + $this->storage->method('delete')->willReturnCallback(function ($path) use ($phpbb_root_path) { + unlink($phpbb_root_path . 'files/' . $path); + }); + + $this->temp = $this->createMock('\phpbb\filesystem\temp'); + $this->temp->method('get_dir')->willReturnCallback(function () { + return sys_get_temp_dir(); + }); + + $this->application = new Application(); + $this->application->add(new generate($this->user, $this->db, $this->cache, $this->language, $this->storage, $this->temp, $this->phpbb_root_path, $this->phpEx)); + $this->application->add(new delete($this->user, $this->db, $this->language, $this->storage)); + $this->application->add(new recreate($this->user, $this->language)); + + copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_1'); + copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_2'); + copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/thumb_test_png_2'); + copy(__DIR__ . '/fixtures/txt.txt', $this->phpbb_root_path . 'files/test_txt'); } - protected function tearDown() + protected function tearDown(): void { parent::tearDown(); - unlink($this->phpbb_root_path . 'files/test_png_1'); - unlink($this->phpbb_root_path . 'files/test_png_2'); - unlink($this->phpbb_root_path . 'files/test_txt'); - unlink($this->phpbb_root_path . 'files/thumb_test_png_1'); - unlink($this->phpbb_root_path . 'files/thumb_test_png_2'); + $delete_files = [ + $this->phpbb_root_path . 'files/test_png_1', + $this->phpbb_root_path . 'files/test_png_2', + $this->phpbb_root_path . 'files/test_txt', + $this->phpbb_root_path . 'files/thumb_test_png_1', + $this->phpbb_root_path . 'files/thumb_test_png_2' + ]; + + foreach ($delete_files as $file) + { + if (file_exists($file)) + { + unlink($file); + } + } } public function test_thumbnails() { $command_tester = $this->get_command_tester('thumbnail:generate'); - $exit_status = $command_tester->execute(array('command' => 'thumbnail:generate')); + $exit_status = $command_tester->execute([]); self::assertSame(true, file_exists($this->phpbb_root_path . 'files/thumb_test_png_1')); self::assertSame(true, file_exists($this->phpbb_root_path . 'files/thumb_test_png_2')); @@ -98,7 +125,7 @@ public function test_thumbnails() self::assertSame(0, $exit_status); $command_tester = $this->get_command_tester('thumbnail:delete'); - $exit_status = $command_tester->execute(array('command' => 'thumbnail:delete')); + $exit_status = $command_tester->execute([]); self::assertSame(false, file_exists($this->phpbb_root_path . 'files/thumb_test_png_1')); self::assertSame(false, file_exists($this->phpbb_root_path . 'files/thumb_test_png_2')); @@ -106,7 +133,7 @@ public function test_thumbnails() self::assertSame(0, $exit_status); $command_tester = $this->get_command_tester('thumbnail:recreate'); - $exit_status = $command_tester->execute(array('command' => 'thumbnail:recreate')); + $exit_status = $command_tester->execute([]); self::assertSame(true, file_exists($this->phpbb_root_path . 'files/thumb_test_png_1')); self::assertSame(true, file_exists($this->phpbb_root_path . 'files/thumb_test_png_2')); diff --git a/tests/console/update/check_test.php b/tests/console/update/check_test.php index 6812ea61b8d..450ec933385 100644 --- a/tests/console/update/check_test.php +++ b/tests/console/update/check_test.php @@ -15,17 +15,15 @@ use Symfony\Component\Console\Tester\CommandTester; use phpbb\console\command\update\check; -require_once dirname(__FILE__) . '/../../../phpBB/includes/functions_admin.php'; -require_once dirname(__FILE__) . '/../../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../../phpBB/includes/utf/utf_tools.php'; +require_once __DIR__ . '/../../../phpBB/includes/functions_admin.php'; +require_once __DIR__ . '/../../../phpBB/includes/functions.php'; +require_once __DIR__ . '/../../../phpBB/includes/utf/utf_tools.php'; /** * @slow */ class phpbb_console_command_check_test extends phpbb_test_case { - protected $command_name; - protected $version_helper; /** @var \phpbb\language\language */ @@ -34,7 +32,7 @@ class phpbb_console_command_check_test extends phpbb_test_case public function test_up_to_date() { $command_tester = $this->get_command_tester('100000'); - $status = $command_tester->execute(array('command' => $this->command_name, '--no-ansi' => true)); + $status = $command_tester->execute(array('--no-ansi' => true)); $this->assertSame('', $command_tester->getDisplay()); $this->assertSame($status, 0); } @@ -42,8 +40,8 @@ public function test_up_to_date() public function test_up_to_date_verbose() { $command_tester = $this->get_command_tester('100000'); - $status = $command_tester->execute(array('command' => $this->command_name, '--no-ansi' => true, '--verbose' => true)); - $this->assertContains($this->language->lang('UPDATE_NOT_NEEDED'), $command_tester->getDisplay()); + $status = $command_tester->execute(array('--no-ansi' => true, '--verbose' => true)); + $this->assertStringContainsString($this->language->lang('UPDATE_NOT_NEEDED'), $command_tester->getDisplay()); $this->assertSame($status, 0); } @@ -51,30 +49,29 @@ public function test_up_to_date_verbose() public function test_not_up_to_date() { $command_tester = $this->get_command_tester('0'); - $status = $command_tester->execute(array('command' => $this->command_name, '--no-ansi' => true)); - $this->assertContains($this->language->lang('UPDATE_NEEDED'), $command_tester->getDisplay()); + $status = $command_tester->execute(array('--no-ansi' => true)); + $this->assertStringContainsString($this->language->lang('UPDATE_NEEDED'), $command_tester->getDisplay()); $this->assertSame($status, 1); } public function test_not_up_to_date_verbose() { $command_tester = $this->get_command_tester('0'); - $status = $command_tester->execute(array('command' => $this->command_name, '--no-ansi' => true, '--verbose' => true)); - $this->assertContains($this->language->lang('UPDATE_NEEDED'), $command_tester->getDisplay()); - $this->assertContains($this->language->lang('UPDATES_AVAILABLE'), $command_tester->getDisplay()); + $status = $command_tester->execute(array('--no-ansi' => true, '--verbose' => true)); + $this->assertStringContainsString($this->language->lang('UPDATE_NEEDED'), $command_tester->getDisplay()); + $this->assertStringContainsString($this->language->lang('UPDATES_AVAILABLE'), $command_tester->getDisplay()); $this->assertSame($status, 1); } - /** - * @expectedException phpbb\exception\runtime_exception - */ public function test_error() { + $this->expectException(\phpbb\exception\runtime_exception::class); + $command_tester = $this->get_command_tester('1'); $this->version_helper->set_file_location('acme.corp','foo', 'bar.json'); - $status = $command_tester->execute(array('command' => $this->command_name, '--no-ansi' => true)); - $this->assertContains('VERSIONCHECK_FAIL', $command_tester->getDisplay()); + $status = $command_tester->execute(array('--no-ansi' => true)); + $this->assertStringContainsString('VERSIONCHECK_FAIL', $command_tester->getDisplay()); $this->assertSame($status, 2); } @@ -84,10 +81,7 @@ public function get_command_tester($current_version) $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); - $user = $this->createMock('\phpbb\user', array(), array( - $this->language, - '\phpbb\datetime' - )); + $user = $this->createMock('\phpbb\user'); $user->method('lang')->will($this->returnArgument(0)); $cache = $this->getMockBuilder('\phpbb\cache\service') @@ -95,7 +89,33 @@ public function get_command_tester($current_version) ->getMock(); $config = new \phpbb\config\config(array('version' => $current_version)); - $this->version_helper = new \phpbb\version_helper($cache, $config, new \phpbb\file_downloader()); + $this->version_helper = $this->getMockBuilder('\phpbb\version_helper') + ->setConstructorArgs([$cache, $config, new \phpbb\file_downloader()]) + ->onlyMethods(['get_suggested_updates']) + ->getMock(); + $this->version_helper->method('get_suggested_updates') + ->willReturnCallback(function($force_update = false, $force_cache = false) use ($config) + { + if ($config['version'] === '100000') + { + return []; + } + else if ($config['version'] === '0') + { + return [ + [ + 'current' => '100000', + 'announcement' => 'https://www.phpbb.com/downloads/', + 'eol' => null, + 'security' => false, + ], + ]; + } + else + { + throw new \phpbb\exception\runtime_exception('VERSIONCHECK_FAIL'); + } + }); $container = new phpbb_mock_container_builder; $container->set('version_helper', $this->version_helper); @@ -104,7 +124,6 @@ public function get_command_tester($current_version) $application->add(new check($user, $config, $container, $this->language)); $command = $application->find('update:check'); - $this->command_name = $command->getName(); return new CommandTester($command); } } diff --git a/tests/console/user/activate_test.php b/tests/console/user/activate_test.php index 1588a76e47b..0f5830ee6b8 100644 --- a/tests/console/user/activate_test.php +++ b/tests/console/user/activate_test.php @@ -15,13 +15,13 @@ use Symfony\Component\Console\Tester\CommandTester; use phpbb\console\command\user\activate; -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_console_user_activate_test extends phpbb_console_user_base { protected $notifications; - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -35,10 +35,10 @@ public function get_command_tester() $application = new Application(); $application->add(new activate( $this->user, - $this->db, $this->config, $this->language, $this->log, + $this->email, $this->notifications, $this->user_loader, $this->phpbb_root_path, @@ -46,12 +46,11 @@ public function get_command_tester() )); $command = $application->find('user:activate'); - $this->command_name = $command->getName(); return new CommandTester($command); } - public function activate_test_data() + public static function activate_test_data() { return array( // Test an inactive user @@ -76,11 +75,10 @@ public function test_activate($username, $deactivate, $expected) $command_tester = $this->get_command_tester(); $command_tester->execute(array( - 'command' => $this->command_name, 'username' => $username, '--deactivate' => $deactivate, )); - $this->assertContains($expected, $command_tester->getDisplay()); + $this->assertStringContainsString($expected, $command_tester->getDisplay()); } } diff --git a/tests/console/user/add_test.php b/tests/console/user/add_test.php index bdfb8a8d2a5..0a3aab5422b 100644 --- a/tests/console/user/add_test.php +++ b/tests/console/user/add_test.php @@ -18,7 +18,7 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Question\Question; -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_console_user_add_test extends phpbb_console_user_base { @@ -30,13 +30,13 @@ public function get_command_tester($question_answers = []) $this->db, $this->config, $this->language, + $this->email, $this->passwords_manager, $this->phpbb_root_path, $this->php_ext )); $command = $application->find('user:add'); - $this->command_name = $command->getName(); if (!empty($question_answers)) { @@ -61,7 +61,10 @@ public function get_command_tester($question_answers = []) $output->writeln(print_r($response, true)); return $response; }; - $helper = $this->getMock('\Symfony\Component\Console\Helper\QuestionHelper', array('ask')); + $helper = $this->getMockBuilder('\Symfony\Component\Console\Helper\QuestionHelper') + ->onlyMethods(['ask']) + ->disableOriginalConstructor() + ->getMock(); $helper->expects($this->any()) ->method('ask') ->will($this->returnCallback($ask)); @@ -83,14 +86,13 @@ public function test_add_no_dialog() $this->assertEquals(2, $this->get_user_id('Admin')); $command_tester->execute(array( - 'command' => $this->command_name, '--username' => 'foo', '--password' => 'bar', '--email' => 'foo@test.com' )); $this->assertNotEquals(null, $this->get_user_id('foo')); - $this->assertContains('CLI_USER_ADD_SUCCESS', $command_tester->getDisplay()); + $this->assertStringContainsString('CLI_USER_ADD_SUCCESS', $command_tester->getDisplay()); } public function test_add_dialog() @@ -103,14 +105,12 @@ public function test_add_dialog() $this->assertEquals(2, $this->get_user_id('Admin')); - $this->question->setInputStream($this->getInputStream("bar\npassword\npassword\nbar@test.com\n")); + $command_tester->setInputs(['bar', 'password', 'password', 'bar@test.com']); - $command_tester->execute(array( - 'command' => $this->command_name, - )); + $command_tester->execute([]); $this->assertNotEquals(null, $this->get_user_id('bar')); - $this->assertContains('CLI_USER_ADD_SUCCESS', $command_tester->getDisplay()); + $this->assertStringContainsString('CLI_USER_ADD_SUCCESS', $command_tester->getDisplay()); } @@ -121,14 +121,13 @@ public function test_add_no_dialog_invalid() $this->assertEquals(3, $this->get_user_id('Test')); $command_tester->execute(array( - 'command' => $this->command_name, '--username' => 'Test', '--password' => '1', '--email' => 'foo' )); - $this->assertContains('USERNAME_TAKEN', $command_tester->getDisplay()); - $this->assertContains('TOO_SHORT', $command_tester->getDisplay()); - $this->assertContains('EMAIL_INVALID', $command_tester->getDisplay()); + $this->assertStringContainsString('USERNAME_TAKEN', $command_tester->getDisplay()); + $this->assertStringContainsString('TOO_SHORT', $command_tester->getDisplay()); + $this->assertStringContainsString('EMAIL_INVALID', $command_tester->getDisplay()); } } diff --git a/tests/console/user/base.php b/tests/console/user/base.php index 5382b9d8963..3e26d5ad5a7 100644 --- a/tests/console/user/base.php +++ b/tests/console/user/base.php @@ -15,26 +15,28 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case { protected $db; protected $config; + protected $email; protected $user; protected $language; protected $log; protected $passwords_manager; - protected $command_name; + /** @var Symfony\Component\Console\Helper\QuestionHelper */ protected $question; + protected $command_name; protected $user_loader; protected $phpbb_root_path; protected $php_ext; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); } - public function setUp() + protected function setUp(): void { global $auth, $db, $cache, $config, $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpEx; - $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $phpbb_dispatcher = new \phpbb\event\dispatcher(); $phpbb_container = new phpbb_mock_container_builder(); $phpbb_container->set('cache.driver', new phpbb_mock_cache()); $phpbb_container->set('notification_manager', new phpbb_mock_notification_manager()); @@ -50,7 +52,6 @@ public function setUp() 'min_name_chars' => 3, 'max_name_chars' => 10, 'min_pass_chars' => 3, - 'max_pass_chars' => 10, 'pass_complex' => 'PASS_TYPE_ANY', )); @@ -62,12 +63,15 @@ public function setUp() $this->language->expects($this->any()) ->method('lang') ->will($this->returnArgument(0)); - $user = $this->user = $this->createMock('\phpbb\user', array(), array( - $this->language, - '\phpbb\datetime' - )); - $this->user_loader = new \phpbb\user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE); + $user = $this->user = $this->createMock('\phpbb\user'); + $user->data['user_email'] = ''; + + $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') + ->disableOriginalConstructor() + ->getMock(); + + $this->user_loader = new \phpbb\user_loader($avatar_helper, $db, $phpbb_root_path, $phpEx, USERS_TABLE); $driver_helper = new \phpbb\passwords\driver\helper($this->config); $passwords_drivers = array( @@ -94,6 +98,125 @@ public function setUp() 'auth.provider_collection', $provider_collection ); + $phpbb_container->setParameter('tables.auth_provider_oauth_token_storage', 'phpbb_oauth_tokens'); + $phpbb_container->setParameter('tables.auth_provider_oauth_states', 'phpbb_oauth_states'); + $phpbb_container->setParameter('tables.auth_provider_oauth_account_assoc', 'phpbb_oauth_accounts'); + + $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); + + $assets_bag = new \phpbb\template\assets_bag(); + $phpbb_container->set('assets.bag', $assets_bag); + + $phpbb_container->set('dispatcher', $phpbb_dispatcher); + + $core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'; + $phpbb_container->setParameter('core.cache_dir', $core_cache_dir); + + $core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx; + $phpbb_container->setParameter('core.messenger_queue_file', $core_messenger_queue_file); + + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $messenger_method_collection->add('messenger.method.email'); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + + $messenger_queue = new \phpbb\messenger\queue($config, $phpbb_dispatcher, $messenger_method_collection, $core_messenger_queue_file); + $phpbb_container->set('messenger.queue', $messenger_queue); + + $request = new phpbb_mock_request; + $phpbb_container->set('request', $request); + + $symfony_request = new \phpbb\symfony_request( + $request + ); + + $phpbb_path_helper = new \phpbb\path_helper( + $symfony_request, + $request, + $phpbb_root_path, + $phpEx + ); + $phpbb_container->set('path_helper', $phpbb_path_helper); + + $factory = new \phpbb\db\tools\factory(); + $db_doctrine = $this->new_doctrine_dbal(); + $db_tools = $factory->get($db_doctrine); + $migrator = new \phpbb\db\migrator( + $phpbb_container, + $config, + $db, + $db_tools, + 'phpbb_migrations', + $phpbb_root_path, + $this->php_ext, + 'phpbb_', + self::get_core_tables(), + [], + new \phpbb\db\migration\helper() + ); + $phpbb_container->set('migrator', $migrator); + + $finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $this->php_ext); + $extension_manager = new \phpbb\extension\manager( + $phpbb_container, + $db, + $config, + $finder_factory, + 'phpbb_ext', + __DIR__ . '/', + new \phpbb\cache\service(new phpbb_mock_cache(), $config, $db, $phpbb_dispatcher, $phpbb_root_path, $this->php_ext) + ); + $phpbb_container->set('ext.manager', $extension_manager); + + $context = new \phpbb\template\context(); + $cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; + $phpbb_container->setParameter('core.template.cache_path', $cache_path); + $filesystem = new \phpbb\filesystem\filesystem(); + $phpbb_container->set('filesystem', $filesystem); + + $twig = new \phpbb\template\twig\environment( + $assets_bag, + $this->config, + $filesystem, + $phpbb_path_helper, + $cache_path, + null, + new \phpbb\template\twig\loader(''), + $phpbb_dispatcher, + [ + 'cache' => false, + 'debug' => false, + 'auto_reload' => true, + 'autoescape' => false, + ] + ); + $twig_extension = new \phpbb\template\twig\extension($context, $twig, $this->language); + $phpbb_container->set('template.twig.extensions.phpbb', $twig_extension); + + $twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); + $twig_extensions_collection->add('template.twig.extensions.phpbb'); + $phpbb_container->set('template.twig.extensions.collection', $twig_extensions_collection); + + $twig->addExtension($twig_extension); + $twig_lexer = new \phpbb\template\twig\lexer($twig); + $phpbb_container->set('template.twig.lexer', $twig_lexer); + + $this->email = new \phpbb\messenger\method\email( + $assets_bag, + $this->config, + $phpbb_dispatcher, + $this->language, + $messenger_queue, + $phpbb_path_helper, + $request, + $twig_extensions_collection, + $twig_lexer, + $user, + $phpbb_root_path, + $cache_path, + $extension_manager, + $this->log + ); + $phpbb_container->set('messenger.method.email', $this->email); parent::setUp(); } @@ -107,15 +230,7 @@ public function get_user_id($username) $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); - return $row['user_id']; - } - - public function getInputStream($input) - { - $stream = fopen('php://memory', 'r+', false); - fputs($stream, $input); - rewind($stream); - - return $stream; + $user_id = $row ? $row['user_id'] : null; + return $user_id; } } diff --git a/tests/console/user/delete_ids_test.php b/tests/console/user/delete_ids_test.php new file mode 100644 index 00000000000..fb5b60ba0ed --- /dev/null +++ b/tests/console/user/delete_ids_test.php @@ -0,0 +1,129 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +use Symfony\Component\Console\Application; +use Symfony\Component\Console\Tester\CommandTester; +use phpbb\console\command\user\delete_id; + +require_once __DIR__ . '/base.php'; + +class phpbb_console_user_delete_ids_test extends phpbb_console_user_base +{ + public function get_command_tester() + { + $application = new Application(); + $application->add(new delete_id( + $this->db, + $this->language, + $this->log, + $this->user, + $this->user_loader, + BOTS_TABLE, + USER_GROUP_TABLE, + USERS_TABLE, + $this->phpbb_root_path, + $this->php_ext + )); + + $command = $application->find('user:delete_id'); + $this->command_name = $command->getName(); + $this->question = $command->getHelper('question'); + + return new CommandTester($command); + } + + public function test_delete() + { + $command_tester = $this->get_command_tester(); + + $command_tester->setInputs(['yes', '']); + + $command_tester->execute(array( + 'command' => $this->command_name, + 'user_ids' => [3, 4], + '--delete-posts' => false, + )); + + $this->assertNull($this->get_user_id('Test')); + $this->assertNull($this->get_user_id('Test 2')); + $this->assertStringContainsString('CLI_USER_DELETE_ID_SUCCESS', $command_tester->getDisplay()); + } + + public function test_delete_one() + { + $command_tester = $this->get_command_tester(); + + $command_tester->setInputs(['yes', '']); + + $command_tester->execute(array( + 'command' => $this->command_name, + 'user_ids' => [3], + '--delete-posts' => false, + )); + + $this->assertNull($this->get_user_id('Test')); + $this->assertNotNull($this->get_user_id('Test 2')); + $this->assertStringContainsString('CLI_USER_DELETE_ID_SUCCESS', $command_tester->getDisplay()); + } + + public function test_delete_bot() + { + $command_tester = $this->get_command_tester(); + + $this->assertNotNull($this->get_user_id('Test Bot')); + + $command_tester->setInputs(['yes', '']); + + $command_tester->execute(array( + 'command' => $this->command_name, + 'user_ids' => [6], + '--delete-posts' => false, + )); + + $this->assertNull($this->get_user_id('Test Bot')); + $this->assertStringContainsString('CLI_USER_DELETE_ID_SUCCESS', $command_tester->getDisplay()); + } + + public function test_delete_non_user() + { + $command_tester = $this->get_command_tester(); + + $command_tester->setInputs(['yes', '']); + + $command_tester->execute(array( + 'command' => $this->command_name, + 'user_ids' => [999], + '--delete-posts' => false, + )); + + $this->assertStringContainsString('CLI_USER_DELETE_NONE', $command_tester->getDisplay()); + } + + public function test_delete_cancel() + { + $command_tester = $this->get_command_tester(); + + $this->assertEquals(3, $this->get_user_id('Test')); + + $command_tester->setInputs(['no', '']); + + $command_tester->execute(array( + 'command' => $this->command_name, + 'user_ids' => [3, 4], + '--delete-posts' => false, + )); + + $this->assertNotNull($this->get_user_id('Test')); + $this->assertNotNull($this->get_user_id('Test 2')); + } +} diff --git a/tests/console/user/delete_test.php b/tests/console/user/delete_test.php index 88f91afab1f..ea97de08295 100644 --- a/tests/console/user/delete_test.php +++ b/tests/console/user/delete_test.php @@ -15,7 +15,7 @@ use Symfony\Component\Console\Tester\CommandTester; use phpbb\console\command\user\delete; -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_console_user_delete_test extends phpbb_console_user_base { @@ -24,7 +24,6 @@ public function get_command_tester() $application = new Application(); $application->add(new delete( $this->user, - $this->db, $this->language, $this->log, $this->user_loader, @@ -33,7 +32,6 @@ public function get_command_tester() )); $command = $application->find('user:delete'); - $this->command_name = $command->getName(); $this->question = $command->getHelper('question'); return new CommandTester($command); @@ -45,16 +43,15 @@ public function test_delete() $this->assertEquals(3, $this->get_user_id('Test')); - $this->question->setInputStream($this->getInputStream("yes\n")); + $command_tester->setInputs(['yes', '']); $command_tester->execute(array( - 'command' => $this->command_name, 'username' => 'Test', '--delete-posts' => false, )); $this->assertNull($this->get_user_id('Test')); - $this->assertContains('USER_DELETED', $command_tester->getDisplay()); + $this->assertStringContainsString('USER_DELETED', $command_tester->getDisplay()); } public function test_delete_non_user() @@ -63,15 +60,14 @@ public function test_delete_non_user() $this->assertNull($this->get_user_id('Foo')); - $this->question->setInputStream($this->getInputStream("yes\n")); + $command_tester->setInputs(['yes', '']); $command_tester->execute(array( - 'command' => $this->command_name, 'username' => 'Foo', '--delete-posts' => false, )); - $this->assertContains('NO_USER', $command_tester->getDisplay()); + $this->assertStringContainsString('NO_USER', $command_tester->getDisplay()); } public function test_delete_cancel() @@ -80,10 +76,9 @@ public function test_delete_cancel() $this->assertEquals(3, $this->get_user_id('Test')); - $this->question->setInputStream($this->getInputStream("no\n")); + $command_tester->setInputs(['no', '']); $command_tester->execute(array( - 'command' => $this->command_name, 'username' => 'Test', '--delete-posts' => false, )); diff --git a/tests/console/user/fixtures/config.xml b/tests/console/user/fixtures/config.xml index a988ba463f6..eba2eba6374 100644 --- a/tests/console/user/fixtures/config.xml +++ b/tests/console/user/fixtures/config.xml @@ -47,6 +47,14 @@ 0 + + 6 + + Test Bot + Test Bot + + 2 + group_id @@ -59,5 +67,23 @@ 3foobar + + 6 + BOTS + 3 + + +
      + + group_id + user_id + group_leader + user_pending + + 6 + 6 + 0 + 0 +
      diff --git a/tests/console/user/reclean_test.php b/tests/console/user/reclean_test.php index 1bf0b8ef5ad..472a4007ae7 100644 --- a/tests/console/user/reclean_test.php +++ b/tests/console/user/reclean_test.php @@ -15,7 +15,7 @@ use Symfony\Component\Console\Tester\CommandTester; use phpbb\console\command\user\reclean; -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_console_user_reclean_test extends phpbb_console_user_base { @@ -29,7 +29,6 @@ public function get_command_tester() )); $command = $application->find('user:reclean'); - $this->command_name = $command->getName(); return new CommandTester($command); } @@ -38,7 +37,7 @@ public function test_reclean() { $command_tester = $this->get_command_tester(); - $exit_status = $command_tester->execute(array('command' => $this->command_name)); + $exit_status = $command_tester->execute([]); $this->assertSame(0, $exit_status); $result = $this->db->sql_query('SELECT user_id FROM ' . USERS_TABLE . " WHERE username_clean = 'test unclean'"); diff --git a/tests/content_visibility/delete_post_test.php b/tests/content_visibility/delete_post_test.php index 4f978219c25..2d9f32fa3f0 100644 --- a/tests/content_visibility/delete_post_test.php +++ b/tests/content_visibility/delete_post_test.php @@ -11,18 +11,17 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php'; -require_once dirname(__FILE__) . '/../mock/search.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_admin.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_posting.php'; class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/delete_post.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/delete_post.xml'); } - public function delete_post_data() + public static function delete_post_data() { $info_data = array( 'topic_first_post_id' => 1, @@ -45,6 +44,7 @@ public function delete_post_data() 'post_time' => 2, )), false, 'harddelete', + 3, // expected next post id array( array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), //array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), @@ -74,6 +74,7 @@ public function delete_post_data() 'post_time' => 1, )), false, 'harddelete', + 2, // expected next post id array( //array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), @@ -103,6 +104,7 @@ public function delete_post_data() 'post_time' => 3, )), false, 'harddelete', + 2, // expected next post id array( array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), @@ -132,6 +134,7 @@ public function delete_post_data() 'post_time' => 2, )), true, 'soft delete', + 3, // expected next post id array( array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 2, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => 'soft delete'), @@ -161,6 +164,7 @@ public function delete_post_data() 'post_time' => 1, )), true, 'soft delete', + 2, // expected next post id array( array('post_id' => 1, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => 'soft delete'), array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), @@ -190,6 +194,7 @@ public function delete_post_data() 'post_time' => 3, )), true, 'soft delete', + 3, // expected next post id array( array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), @@ -230,6 +235,7 @@ public function delete_post_data() 'post_reported' => false, ), false, 'harddelete', + false, // expected next post id array( ), array( @@ -258,6 +264,7 @@ public function delete_post_data() 'post_reported' => false, ), true, 'soft delete', + false, // expected next post id array( array('post_id' => 4, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => ''), ), @@ -279,25 +286,107 @@ public function delete_post_data() array('user_posts' => 3), ), ), + // Delete actual last post that is unapproved + array( + 3, 3, 6, + array( + 'topic_first_post_id' => 5, + 'topic_last_post_id' => 5, + 'topic_posts_approved' => 1, + 'topic_posts_unapproved' => 1, + 'topic_posts_softdeleted' => 0, + 'topic_visibility' => ITEM_APPROVED, + 'post_time' => 4, + 'post_visibility' => ITEM_UNAPPROVED, + 'post_postcount' => true, + 'poster_id' => 1, + 'post_reported' => false, + ), + false, 'harddelete', + 5, // expected next post id + array( + array('post_id' => 5, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), + // array('post_id' => 6, 'post_visibility' => ITEM_UNAPPROVED, 'post_delete_reason' => ''), + ), + array( + array( + 'topic_visibility' => ITEM_APPROVED, + 'topic_first_post_id' => 5, + 'topic_last_post_id' => 5, + 'topic_posts_approved' => 1, + 'topic_posts_unapproved' => 0, + 'topic_posts_softdeleted' => 0, + 'topic_delete_reason' => '', + ), + ), + array( + array('forum_posts_approved' => 1, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 5), + ), + array( + array('user_posts' => 4), + ), + ), + // Hard delete last approved post + array( + 3, 3, 5, + array( + 'topic_first_post_id' => 5, + 'topic_last_post_id' => 5, + 'topic_posts_approved' => 1, + 'topic_posts_unapproved' => 1, + 'topic_posts_softdeleted' => 0, + 'topic_visibility' => ITEM_APPROVED, + 'post_time' => 4, + 'post_visibility' => ITEM_APPROVED, + 'post_postcount' => true, + 'poster_id' => 1, + 'post_reported' => false, + ), + false, 'harddelete', + 6, // expected next post id + array( + //array('post_id' => 5, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), + array('post_id' => 6, 'post_visibility' => ITEM_UNAPPROVED, 'post_delete_reason' => ''), + ), + array( + array( + 'topic_visibility' => ITEM_APPROVED, + 'topic_first_post_id' => 6, + 'topic_last_post_id' => 5, // can't be updated with no valid data + 'topic_posts_approved' => 0, + 'topic_posts_unapproved' => 1, + 'topic_posts_softdeleted' => 0, + 'topic_delete_reason' => '', + ), + ), + array( + array('forum_posts_approved' => 0, 'forum_posts_unapproved' => 1, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 5), + ), + array( + array('user_posts' => 3), + ), + ), ); } /** * @dataProvider delete_post_data */ - public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason, $expected_posts, $expected_topic, $expected_forum, $expected_user) + public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason, $expected_next_post_id, $expected_posts, $expected_topic, $expected_forum, $expected_user) { - global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx; + global $auth, $cache, $config, $db, $user, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx; $config = new \phpbb\config\config(array( 'num_posts' => 3, 'num_topics' => 1, - 'search_type' => 'phpbb_mock_search', + 'search_type' => 'foo', )); $cache = new phpbb_mock_cache; $db = $this->new_dbal(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $storage = $this->createMock('\phpbb\storage\storage'); + // Create auth mock $auth = $this->createMock('\phpbb\auth\auth'); $auth->expects($this->any()) @@ -309,7 +398,9 @@ public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); - $attachment_delete = new \phpbb\attachment\delete($config, $db, new \phpbb_mock_event_dispatcher(), new \phpbb\filesystem\filesystem(), new \phpbb\attachment\resync($db), $phpbb_root_path); + $user->data['user_id'] = ANONYMOUS; + + $attachment_delete = new \phpbb\attachment\delete($config, $db, new \phpbb_mock_event_dispatcher(), new \phpbb\attachment\resync($db), $storage); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); @@ -319,8 +410,12 @@ public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft // Works as a workaround for tests $phpbb_container->set('attachment.manager', $attachment_delete); - delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason); + $search_backend = $this->createMock(\phpbb\search\backend\search_backend_interface::class); + $search_backend_factory = $this->createMock(\phpbb\search\search_backend_factory::class); + $search_backend_factory->method('get_active')->willReturn($search_backend); + $phpbb_container->set('search.backend_factory', $search_backend_factory); + $this->assertSame($expected_next_post_id, delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason)); $result = $db->sql_query('SELECT post_id, post_visibility, post_delete_reason FROM phpbb_posts WHERE topic_id = ' . $topic_id . ' diff --git a/tests/content_visibility/fixtures/delete_post.xml b/tests/content_visibility/fixtures/delete_post.xml index c29ad230196..5d4e703fece 100644 --- a/tests/content_visibility/fixtures/delete_post.xml +++ b/tests/content_visibility/fixtures/delete_post.xml @@ -39,6 +39,19 @@ + + 3 + 1 + 1 + 0 + 1 + 0 + 0 + 5 + + + + topic_id @@ -82,6 +95,20 @@ 00 + + 3 + 3 + 1 + Approved + 5 + 5 + 0 + 0 + + 1 + 1 + 0 +
      post_id @@ -130,7 +157,6 @@ 0 - 4 1 @@ -143,6 +169,30 @@ 0 + + 5 + 1 + 3 + 3 + 1 + 4 + Approved + 0 + 0 + + + + 6 + 1 + 3 + 3 + 0 + 4 + Unpproved + 0 + 0 + +
      user_id diff --git a/tests/content_visibility/fixtures/get_visibility_sql.xml b/tests/content_visibility/fixtures/get_visibility_sql.xml index 146244263ec..2128064986d 100644 --- a/tests/content_visibility/fixtures/get_visibility_sql.xml +++ b/tests/content_visibility/fixtures/get_visibility_sql.xml @@ -3,17 +3,20 @@
      topic_idforum_id + topic_postertopic_visibilitytopic_title 1 1 0 + 0 Unapproved 2 1 + 0 1 Approved @@ -21,13 +24,22 @@ 312 + 0Softdeleted + + 4 + 1 + 1 + 0 + Unapproved +
      post_idtopic_idforum_id + poster_idpost_visibilitypost_text @@ -35,12 +47,14 @@ 1 1 0 + 0 Unapproved 2 2 1 + 0 1 Approved @@ -48,8 +62,17 @@ 331 + 02Softdeleted + + 4 + 4 + 1 + 1 + 0 + Unapproved +
      diff --git a/tests/content_visibility/get_forums_visibility_sql_test.php b/tests/content_visibility/get_forums_visibility_sql_test.php index fde2b621310..1ae4c5ae8e1 100644 --- a/tests/content_visibility/get_forums_visibility_sql_test.php +++ b/tests/content_visibility/get_forums_visibility_sql_test.php @@ -15,10 +15,10 @@ class phpbb_content_visibility_get_forums_visibility_sql_test extends phpbb_data { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/get_forums_visibility_sql.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/get_forums_visibility_sql.xml'); } - public function get_forums_visibility_sql_data() + public static function get_forums_visibility_sql_data() { return array( array( diff --git a/tests/content_visibility/get_global_visibility_sql_test.php b/tests/content_visibility/get_global_visibility_sql_test.php index eced3aa680d..198556132fb 100644 --- a/tests/content_visibility/get_global_visibility_sql_test.php +++ b/tests/content_visibility/get_global_visibility_sql_test.php @@ -15,10 +15,10 @@ class phpbb_content_visibility_get_global_visibility_sql_test extends phpbb_data { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/get_forums_visibility_sql.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/get_forums_visibility_sql.xml'); } - public function get_global_visibility_sql_data() + public static function get_global_visibility_sql_data() { return array( array( diff --git a/tests/content_visibility/get_visibility_sql_test.php b/tests/content_visibility/get_visibility_sql_test.php index 18802fadbc0..42f36a3c4df 100644 --- a/tests/content_visibility/get_visibility_sql_test.php +++ b/tests/content_visibility/get_visibility_sql_test.php @@ -15,14 +15,17 @@ class phpbb_content_visibility_get_visibility_sql_test extends phpbb_database_te { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/get_visibility_sql.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/get_visibility_sql.xml'); } - public function get_visibility_sql_data() + public static function get_visibility_sql_data() { return array( + // data set 0: display_unapproved_posts=false, moderator, can see all posts array( 'phpbb_posts', + 0, + false, 'post', 1, '', array( array('m_approve', 1, true), @@ -31,10 +34,14 @@ public function get_visibility_sql_data() array('post_id' => 1), array('post_id' => 2), array('post_id' => 3), + array('post_id' => 4), ), ), + // data set 1: display_unapproved_posts=false, normal user, cannot see any unapproved posts array( 'phpbb_posts', + 0, + false, 'post', 1, '', array( ), @@ -42,8 +49,11 @@ public function get_visibility_sql_data() array('post_id' => 2), ), ), + // data set 2: display_unapproved_posts=false, moderator, can see all topics array( 'phpbb_topics', + 0, + false, 'topic', 1, '', array( array('m_approve', 1, true), @@ -52,23 +62,74 @@ public function get_visibility_sql_data() array('topic_id' => 1), array('topic_id' => 2), array('topic_id' => 3), + array('topic_id' => 4), ), ), + // data set 3: display_unapproved_posts=false, normal user, cannot see unapproved posts topic array( 'phpbb_topics', + 0, + false, 'topic', 1, '', array(), array( array('topic_id' => 2), ), ), + // data set 4: display_unapproved_posts=true, guest user, cannot see unapproved posts + array( + 'phpbb_posts', + 1, + true, + 'post', 1, '', + array( + ), + array( + array('post_id' => 2), + ), + ), + // data set 5: display_unapproved_posts=true, guest user, cannot see unapproved posts topic + array( + 'phpbb_topics', + 1, + true, + 'topic', 1, '', + array(), + array( + array('topic_id' => 2), + ), + ), + // data set 6: display_unapproved_posts=true, normal user, can see own unapproved posts + array( + 'phpbb_posts', + 0, + true, + 'post', 1, '', + array(), + array( + array('post_id' => 1), + array('post_id' => 2), + ), + ), + // data set 7: display_unapproved_posts=true, normal user, can see own unapproved posts topic + array( + 'phpbb_topics', + 0, + true, + 'topic', 1, '', + array(), + array( + array('topic_id' => 1), + array('topic_id' => 2), + ), + ), ); } /** * @dataProvider get_visibility_sql_data */ - public function test_get_visibility_sql($table, $mode, $forum_id, $table_alias, $permissions, $expected) + public function test_get_visibility_sql($table, $user_id, $display_unapproved, $mode, $forum_id, $table_alias, $permissions, $expected) { global $cache, $db, $auth, $phpbb_root_path, $phpEx; @@ -84,15 +145,20 @@ public function test_get_visibility_sql($table, $mode, $forum_id, $table_alias, $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); - $config = new phpbb\config\config(array()); + $user->data['user_id'] = $user_id; + $config = new \phpbb\config\config(array( + 'display_unapproved_posts' => $display_unapproved, + )); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $content_visibility = new \phpbb\content_visibility($auth, $config, $phpbb_dispatcher, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); - $result = $db->sql_query('SELECT ' . $mode . '_id + $sql = 'SELECT ' . $mode . '_id FROM ' . $table . ' WHERE ' . $content_visibility->get_visibility_sql($mode, $forum_id, $table_alias) . ' - ORDER BY ' . $mode . '_id ASC'); + ORDER BY ' . $mode . '_id ASC'; + $result = $db->sql_query($sql); $this->assertEquals($expected, $db->sql_fetchrowset($result)); + $db->sql_freeresult($result); } } diff --git a/tests/content_visibility/set_post_visibility_test.php b/tests/content_visibility/set_post_visibility_test.php index 8f629dca627..4191402de73 100644 --- a/tests/content_visibility/set_post_visibility_test.php +++ b/tests/content_visibility/set_post_visibility_test.php @@ -11,17 +11,17 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_admin.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_posting.php'; class phpbb_content_visibility_set_post_visibility_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/set_post_visibility.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/set_post_visibility.xml'); } - public function set_post_visibility_data() + public static function set_post_visibility_data() { return array( array( @@ -30,8 +30,8 @@ public function set_post_visibility_data() 2, time(), 'approve', true, false, array( - array('post_id' => 1, 'post_visibility' => 1, 'post_delete_reason' => 'approve'), - array('post_id' => 2, 'post_visibility' => 1, 'post_delete_reason' => ''), + array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => 'approve'), + array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 3, 'post_visibility' => 2, 'post_delete_reason' => ''), ), array( @@ -44,9 +44,9 @@ public function set_post_visibility_data() 2, time(), 'approve', false, true, array( - array('post_id' => 1, 'post_visibility' => 0, 'post_delete_reason' => ''), - array('post_id' => 2, 'post_visibility' => 1, 'post_delete_reason' => ''), - array('post_id' => 3, 'post_visibility' => 1, 'post_delete_reason' => 'approve'), + array('post_id' => 1, 'post_visibility' => ITEM_UNAPPROVED, 'post_delete_reason' => ''), + array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), + array('post_id' => 3, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => 'approve'), ), array( array('topic_visibility' => 1, 'topic_first_post_id' => 2, 'topic_last_post_id' => 3), @@ -58,7 +58,7 @@ public function set_post_visibility_data() 2, time(), 'deleted', true, true, array( - array('post_id' => 1, 'post_visibility' => 0, 'post_delete_reason' => ''), + array('post_id' => 1, 'post_visibility' => ITEM_UNAPPROVED, 'post_delete_reason' => ''), array('post_id' => 2, 'post_visibility' => 2, 'post_delete_reason' => 'deleted'), array('post_id' => 3, 'post_visibility' => 2, 'post_delete_reason' => ''), ), @@ -72,10 +72,10 @@ public function set_post_visibility_data() 2, time(), 'deleted', true, false, array( - array('post_id' => 4, 'post_visibility' => 0, 'post_delete_reason' => ''), - array('post_id' => 5, 'post_visibility' => 2, 'post_delete_reason' => 'deleted'), - array('post_id' => 6, 'post_visibility' => 1, 'post_delete_reason' => ''), - array('post_id' => 7, 'post_visibility' => 2, 'post_delete_reason' => ''), + array('post_id' => 4, 'post_visibility' => ITEM_UNAPPROVED, 'post_delete_reason' => ''), + array('post_id' => 5, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => 'deleted'), + array('post_id' => 6, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), + array('post_id' => 7, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => ''), ), array( array('topic_visibility' => 1, 'topic_first_post_id' => 6, 'topic_last_post_id' => 6), @@ -87,10 +87,10 @@ public function set_post_visibility_data() 2, time(), 'deleted', false, true, array( - array('post_id' => 4, 'post_visibility' => 0, 'post_delete_reason' => ''), - array('post_id' => 5, 'post_visibility' => 1, 'post_delete_reason' => ''), - array('post_id' => 6, 'post_visibility' => 2, 'post_delete_reason' => 'deleted'), - array('post_id' => 7, 'post_visibility' => 2, 'post_delete_reason' => ''), + array('post_id' => 4, 'post_visibility' => ITEM_UNAPPROVED, 'post_delete_reason' => ''), + array('post_id' => 5, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), + array('post_id' => 6, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => 'deleted'), + array('post_id' => 7, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => ''), ), array( array('topic_visibility' => 1, 'topic_first_post_id' => 5, 'topic_last_post_id' => 5), @@ -102,7 +102,7 @@ public function set_post_visibility_data() 2, time(), 'deleted', true, true, array( - array('post_id' => 8, 'post_visibility' => 2, 'post_delete_reason' => 'deleted'), + array('post_id' => 8, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => 'deleted'), ), array( array('topic_visibility' => 2, 'topic_first_post_id' => 8, 'topic_last_post_id' => 8), @@ -116,7 +116,7 @@ public function set_post_visibility_data() */ public function test_set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $user_id, $time, $reason, $is_starter, $is_latest, $expected, $expected_topic) { - global $cache, $db, $auth, $phpbb_root_path, $phpEx; + global $cache, $db, $auth, $phpbb_dispatcher, $phpbb_root_path, $phpEx; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); @@ -124,7 +124,8 @@ public function test_set_post_visibility($visibility, $post_id, $topic_id, $foru $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); - $config = new phpbb\config\config(array()); + $before_posts = 5; + $config = new phpbb\config\config(['num_posts' => $before_posts]); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $content_visibility = new \phpbb\content_visibility($auth, $config, $phpbb_dispatcher, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); @@ -144,9 +145,17 @@ public function test_set_post_visibility($visibility, $post_id, $topic_id, $foru $this->assertEquals($expected_topic, $db->sql_fetchrowset($result)); $db->sql_freeresult($result); + if ($visibility == ITEM_APPROVED) + { + $this->assertEquals($before_posts + 1, $config['num_posts'], 'Number of posts did not increment as expected'); + } + else if ($visibility == ITEM_DELETED) + { + $this->assertEquals($before_posts - 1, $config['num_posts'], 'Number of posts did not increment as expected'); + } } - public function set_post_soft_deleted_data() + public static function set_post_soft_deleted_data() { return array( array( @@ -169,7 +178,7 @@ public function set_post_soft_deleted_data() */ public function test_set_post_soft_deleted($post_id, $topic_id, $forum_id, $user_id, $time, $reason, $is_starter, $is_latest, $expected) { - global $cache, $db, $auth, $phpbb_root_path, $phpEx; + global $cache, $db, $auth, $phpbb_dispatcher, $phpbb_root_path, $phpEx; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); diff --git a/tests/content_visibility/set_topic_visibility_test.php b/tests/content_visibility/set_topic_visibility_test.php index 3db79c0fe0c..491901cde08 100644 --- a/tests/content_visibility/set_topic_visibility_test.php +++ b/tests/content_visibility/set_topic_visibility_test.php @@ -11,17 +11,17 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_admin.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_posting.php'; class phpbb_content_visibility_set_topic_visibility_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/set_topic_visibility.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/set_topic_visibility.xml'); } - public function set_topic_visibility_data() + public static function set_topic_visibility_data() { return array( array( diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php index 3c732ff49b8..61fd9bf3cb1 100644 --- a/tests/controller/common_helper_route.php +++ b/tests/controller/common_helper_route.php @@ -13,28 +13,40 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface; -abstract class phpbb_controller_common_helper_route extends phpbb_test_case +abstract class phpbb_controller_common_helper_route extends phpbb_database_test_case { - protected $root_path; - private $user; - private $config; - private $template; - private $extension_manager; - private $request; - private $symfony_request; - private $provider; - private $filesystem; - private $phpbb_path_helper; - private $helper; - private $router; - private $routing_helper; - - public function setUp() + protected $root_path; + private $auth; + private $cache; + private $db; + private $dispatcher; + private $language; + private $admin_path; + private $php_ext; + private $user; + private $config; + private $template; + private $extension_manager; + private $request; + private $symfony_request; + private $provider; + private $filesystem; + private $phpbb_path_helper; + private $helper; + private $router; + private $routing_helper; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); + } + + protected function setUp(): void { global $phpbb_dispatcher, $phpbb_root_path, $phpEx; $this->extension_manager = new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'vendor2/foo' => array( 'ext_name' => 'vendor2/foo', @@ -67,14 +79,14 @@ protected function get_script_name() return 'app.php'; } - protected function path_to_app() + protected static function path_to_app() { return ''; } protected function generate_route_objects() { - global $request; + global $request, $phpbb_root_path, $phpEx; $this->request = new phpbb_mock_request(); $this->request->overwrite('SCRIPT_NAME', $this->get_uri(), \phpbb\request\request_interface::SERVER); @@ -99,21 +111,23 @@ protected function generate_route_objects() $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0')); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); - $this->user = new \phpbb\user($lang, '\phpbb\datetime');; + $this->user = new \phpbb\user($lang, '\phpbb\datetime'); $container = new phpbb_mock_container_builder(); $container->setParameter('core.environment', PHPBB_ENVIRONMENT); $cache_path = $phpbb_root_path . 'cache/twig'; + $assets_bag = new \phpbb\template\assets_bag(); $context = new \phpbb\template\context(); $loader = new \phpbb\template\twig\loader(''); $twig = new \phpbb\template\twig\environment( + $assets_bag, $this->config, $this->filesystem, $this->phpbb_path_helper, $cache_path, null, $loader, - new \phpbb\event\dispatcher($container), + new \phpbb\event\dispatcher(), array( 'cache' => false, 'debug' => false, @@ -121,11 +135,11 @@ protected function generate_route_objects() 'autoescape' => false, ) ); - $this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user))); + $this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user))); $twig->setLexer(new \phpbb\template\twig\lexer($twig)); $this->extension_manager = new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'vendor2/foo' => array( 'ext_name' => 'vendor2/foo', @@ -136,45 +150,52 @@ protected function generate_route_objects() ); $loader = new \Symfony\Component\Routing\Loader\YamlFileLoader( - new \phpbb\routing\file_locator(dirname(__FILE__) . '/') + new \phpbb\routing\file_locator(__DIR__ . '/') ); - $resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $this->extension_manager); - $this->router = new phpbb_mock_router($container, $resources_locator, $loader, dirname(__FILE__) . '/', 'php'); + $resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(__DIR__ . '/', PHPBB_ENVIRONMENT, $this->extension_manager); + $this->router = new phpbb_mock_router($container, $resources_locator, $loader, 'php', __DIR__ . '/', true, true); + $this->auth = new \phpbb\auth\auth(); + $this->cache = new \phpbb\cache\driver\dummy(); + $this->db = $this->new_dbal(); + $this->dispatcher = new phpbb_mock_event_dispatcher(); + $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $this->admin_path = 'adm/'; + $this->php_ext = $phpEx; // Set correct current phpBB root path $this->root_path = $this->get_phpbb_root_path(); } - public function helper_url_data_no_rewrite() + public static function helper_url_data_no_rewrite() { return array( - array('controller2', array('t' => 1, 'f' => 2), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller2', array('t' => 1, 'f' => 2), false, false, '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), // Custom sid parameter - array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), // Testing anchors - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), // Anchors and custom sid - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), // Empty parameters should not append the & or ? - array('controller2', array(), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller2', array(), false, false, '/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller3', array('p' => 3), true, false, '/' . $this->path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'), + array('controller2', array(), true, false, '/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), + array('controller2', array(), false, false, '/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), + array('controller3', array('p' => 3), true, false, '/' . static::path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'), // Resolves DI parameters - array('controller4', array(), true, false, '/' . $this->path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), + array('controller4', array(), true, false, '/' . static::path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), ); } @@ -183,42 +204,61 @@ public function helper_url_data_no_rewrite() */ public function test_helper_url_no_rewrite($route, $params, $is_amp, $session_id, $expected, $description) { + $mock_container = new phpbb_mock_container_builder(); + $mock_container->set('cron.task_collection', []); + $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0')); $this->routing_helper = new \phpbb\routing\helper($this->config, $this->router, $this->symfony_request, $this->request, $this->root_path, 'php'); - $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->symfony_request, $this->request, $this->routing_helper); + $this->helper = new phpbb_mock_controller_helper( + $this->auth, + $this->cache, + $this->config, + new \phpbb\cron\manager($mock_container, $this->routing_helper, $this->root_path, 'php', null), + $this->db, + $this->dispatcher, + $this->language, + $this->request, + $this->routing_helper, + $this->symfony_request, + $this->template, + $this->user, + $this->root_path, + $this->admin_path, + $this->php_ext + ); static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id), $description); } - public function helper_url_data_with_rewrite() + public static function helper_url_data_with_rewrite() { return array( - array('controller2', array('t' => 1, 'f' => 2), true, false, '/' . $this->path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller2', array('t' => 1, 'f' => 2), false, false, '/' . $this->path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), // Custom sid parameter - array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), // Testing anchors - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . $this->path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '/' . $this->path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '/' . static::path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), // Anchors and custom sid - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), // Empty parameters should not append the & or ? - array('controller2', array(), true, false, '/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'), - array('controller2', array(), false, false, '/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'), - array('controller3', array('p' => 3), true, false, '/' . $this->path_to_app() . 'foo/bar/p-3', 'no params using empty array'), + array('controller2', array(), true, false, '/' . static::path_to_app() . 'foo/bar', 'no params using empty array'), + array('controller2', array(), false, false, '/' . static::path_to_app() . 'foo/bar', 'no params using empty array'), + array('controller3', array('p' => 3), true, false, '/' . static::path_to_app() . 'foo/bar/p-3', 'no params using empty array'), // Resolves DI parameters - array('controller4', array(), true, false, '/' . $this->path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'), + array('controller4', array(), true, false, '/' . static::path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'), ); } @@ -227,42 +267,61 @@ public function helper_url_data_with_rewrite() */ public function test_helper_url_with_rewrite($route, $params, $is_amp, $session_id, $expected, $description) { + $mock_container = new phpbb_mock_container_builder(); + $mock_container->set('cron.task_collection', []); + $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); $this->routing_helper = new \phpbb\routing\helper($this->config, $this->router, $this->symfony_request, $this->request, $this->root_path, 'php'); - $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->symfony_request, $this->request, $this->routing_helper); + $this->helper = new phpbb_mock_controller_helper( + $this->auth, + $this->cache, + $this->config, + new \phpbb\cron\manager($mock_container, $this->routing_helper, $this->root_path, 'php', null), + $this->db, + $this->dispatcher, + $this->language, + $this->request, + $this->routing_helper, + $this->symfony_request, + $this->template, + $this->user, + $this->root_path, + $this->admin_path, + $this->php_ext + ); static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id), $description); } - public function helper_url_data_absolute() + public static function helper_url_data_absolute() { return array( - array('controller2', array('t' => 1, 'f' => 2), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller2', array('t' => 1, 'f' => 2), false, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), // Custom sid parameter - array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), // Testing anchors - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), // Anchors and custom sid - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), // Empty parameters should not append the & or ? - array('controller2', array(), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller2', array(), false, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller3', array('p' => 3), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'), + array('controller2', array(), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), + array('controller2', array(), false, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), + array('controller3', array('p' => 3), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'), // Resolves DI parameters - array('controller4', array(), true, false, 'http://localhost/' . $this->path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), + array('controller4', array(), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), ); } @@ -271,13 +330,32 @@ public function helper_url_data_absolute() */ public function test_helper_url_absolute($route, $params, $is_amp, $session_id, $expected, $description) { + $mock_container = new phpbb_mock_container_builder(); + $mock_container->set('cron.task_collection', []); + $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0')); $this->routing_helper = new \phpbb\routing\helper($this->config, $this->router, $this->symfony_request, $this->request, $this->root_path, 'php'); - $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->symfony_request, $this->request, $this->routing_helper); + $this->helper = new phpbb_mock_controller_helper( + $this->auth, + $this->cache, + $this->config, + new \phpbb\cron\manager($mock_container, $this->routing_helper, $this->root_path, 'php', null), + $this->db, + $this->dispatcher, + $this->language, + $this->request, + $this->routing_helper, + $this->symfony_request, + $this->template, + $this->user, + $this->root_path, + $this->admin_path, + $this->php_ext + ); static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::ABSOLUTE_URL), $description); } - public function helper_url_data_relative_path() + public static function helper_url_data_relative_path() { return array( array('controller2', array('t' => 1, 'f' => 2), true, false, 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), @@ -315,42 +393,61 @@ public function helper_url_data_relative_path() */ public function test_helper_url_relative_path($route, $params, $is_amp, $session_id, $expected, $description) { + $mock_container = new phpbb_mock_container_builder(); + $mock_container->set('cron.task_collection', []); + $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0')); $this->routing_helper = new \phpbb\routing\helper($this->config, $this->router, $this->symfony_request, $this->request, $this->root_path, 'php'); - $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->symfony_request, $this->request, $this->routing_helper); + $this->helper = new phpbb_mock_controller_helper( + $this->auth, + $this->cache, + $this->config, + new \phpbb\cron\manager($mock_container, $this->routing_helper, $this->root_path, 'php', null), + $this->db, + $this->dispatcher, + $this->language, + $this->request, + $this->routing_helper, + $this->symfony_request, + $this->template, + $this->user, + $this->root_path, + $this->admin_path, + $this->php_ext + ); static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::RELATIVE_PATH), $description); } - public function helper_url_data_network() + public static function helper_url_data_network() { return array( - array('controller2', array('t' => 1, 'f' => 2), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller2', array('t' => 1, 'f' => 2), false, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), // Custom sid parameter - array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), // Testing anchors - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), // Anchors and custom sid - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), // Empty parameters should not append the & or ? - array('controller2', array(), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller2', array(), false, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller3', array('p' => 3), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'), + array('controller2', array(), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), + array('controller2', array(), false, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), + array('controller3', array('p' => 3), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'), // Resolves DI parameters - array('controller4', array(), true, false, '//localhost/' . $this->path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), + array('controller4', array(), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), ); } @@ -359,42 +456,61 @@ public function helper_url_data_network() */ public function test_helper_url_network($route, $params, $is_amp, $session_id, $expected, $description) { + $mock_container = new phpbb_mock_container_builder(); + $mock_container->set('cron.task_collection', []); + $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0')); $this->routing_helper = new \phpbb\routing\helper($this->config, $this->router, $this->symfony_request, $this->request, $this->root_path, 'php'); - $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->symfony_request, $this->request, $this->routing_helper); + $this->helper = new phpbb_mock_controller_helper( + $this->auth, + $this->cache, + $this->config, + new \phpbb\cron\manager($mock_container, $this->routing_helper, $this->root_path, 'php', null), + $this->db, + $this->dispatcher, + $this->language, + $this->request, + $this->routing_helper, + $this->symfony_request, + $this->template, + $this->user, + $this->root_path, + $this->admin_path, + $this->php_ext + ); static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::NETWORK_PATH), $description); } - public function helper_url_data_absolute_with_rewrite() + public static function helper_url_data_absolute_with_rewrite() { return array( - array('controller2', array('t' => 1, 'f' => 2), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller2', array('t' => 1, 'f' => 2), false, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), // Custom sid parameter - array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), // Testing anchors - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), // Anchors and custom sid - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), // Empty parameters should not append the & or ? - array('controller2', array(), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'), - array('controller2', array(), false, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'), - array('controller3', array('p' => 3), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/bar/p-3', 'no params using empty array'), + array('controller2', array(), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar', 'no params using empty array'), + array('controller2', array(), false, false, 'http://localhost/' . static::path_to_app() . 'foo/bar', 'no params using empty array'), + array('controller3', array('p' => 3), true, false, 'http://localhost/' . static::path_to_app() . 'foo/bar/p-3', 'no params using empty array'), // Resolves DI parameters - array('controller4', array(), true, false, 'http://localhost/' . $this->path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'), + array('controller4', array(), true, false, 'http://localhost/' . static::path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'), ); } @@ -403,13 +519,32 @@ public function helper_url_data_absolute_with_rewrite() */ public function test_helper_url_absolute_with_rewrite($route, $params, $is_amp, $session_id, $expected, $description) { + $mock_container = new phpbb_mock_container_builder(); + $mock_container->set('cron.task_collection', []); + $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); $this->routing_helper = new \phpbb\routing\helper($this->config, $this->router, $this->symfony_request, $this->request, $this->root_path, 'php'); - $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->symfony_request, $this->request, $this->routing_helper); + $this->helper = new phpbb_mock_controller_helper( + $this->auth, + $this->cache, + $this->config, + new \phpbb\cron\manager($mock_container, $this->routing_helper, $this->root_path, 'php', null), + $this->db, + $this->dispatcher, + $this->language, + $this->request, + $this->routing_helper, + $this->symfony_request, + $this->template, + $this->user, + $this->root_path, + $this->admin_path, + $this->php_ext + ); static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::ABSOLUTE_URL), $description); } - public function helper_url_data_relative_path_with_rewrite() + public static function helper_url_data_relative_path_with_rewrite() { return array( array('controller2', array('t' => 1, 'f' => 2), true, false, 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), @@ -444,42 +579,61 @@ public function helper_url_data_relative_path_with_rewrite() */ public function test_helper_url_relative_path_with_rewrite($route, $params, $is_amp, $session_id, $expected, $description) { + $mock_container = new phpbb_mock_container_builder(); + $mock_container->set('cron.task_collection', []); + $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); $this->routing_helper = new \phpbb\routing\helper($this->config, $this->router, $this->symfony_request, $this->request, $this->root_path, 'php'); - $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->symfony_request, $this->request, $this->routing_helper); + $this->helper = new phpbb_mock_controller_helper( + $this->auth, + $this->cache, + $this->config, + new \phpbb\cron\manager($mock_container, $this->routing_helper, $this->root_path, 'php', null), + $this->db, + $this->dispatcher, + $this->language, + $this->request, + $this->routing_helper, + $this->symfony_request, + $this->template, + $this->user, + $this->root_path, + $this->admin_path, + $this->php_ext + ); static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::RELATIVE_PATH), $description); } - public function helper_url_data_network_with_rewrite() + public static function helper_url_data_network_with_rewrite() { return array( - array('controller2', array('t' => 1, 'f' => 2), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller2', array('t' => 1, 'f' => 2), false, false, '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '//localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), // Custom sid parameter - array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), // Testing anchors - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), // Anchors and custom sid - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . $this->path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), // Empty parameters should not append the & or ? - array('controller2', array(), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'), - array('controller2', array(), false, false, '//localhost/' . $this->path_to_app() . 'foo/bar', 'no params using empty array'), - array('controller3', array('p' => 3), true, false, '//localhost/' . $this->path_to_app() . 'foo/bar/p-3', 'no params using empty array'), + array('controller2', array(), true, false, '//localhost/' . static::path_to_app() . 'foo/bar', 'no params using empty array'), + array('controller2', array(), false, false, '//localhost/' . static::path_to_app() . 'foo/bar', 'no params using empty array'), + array('controller3', array('p' => 3), true, false, '//localhost/' . static::path_to_app() . 'foo/bar/p-3', 'no params using empty array'), // Resolves DI parameters - array('controller4', array(), true, false, '//localhost/' . $this->path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'), + array('controller4', array(), true, false, '//localhost/' . static::path_to_app() . 'foo/' . PHPBB_ENVIRONMENT, 'di parameter'), ); } @@ -488,13 +642,32 @@ public function helper_url_data_network_with_rewrite() */ public function test_helper_url_network_with_rewrite($route, $params, $is_amp, $session_id, $expected, $description) { + $mock_container = new phpbb_mock_container_builder(); + $mock_container->set('cron.task_collection', []); + $this->config = new \phpbb\config\config(['enable_mod_rewrite' => '1']); $this->routing_helper = new \phpbb\routing\helper($this->config, $this->router, $this->symfony_request, $this->request, $this->root_path, 'php'); - $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->symfony_request, $this->request, $this->routing_helper); + $this->helper = new phpbb_mock_controller_helper( + $this->auth, + $this->cache, + $this->config, + new \phpbb\cron\manager($mock_container, $this->routing_helper, $this->root_path, 'php', null), + $this->db, + $this->dispatcher, + $this->language, + $this->request, + $this->routing_helper, + $this->symfony_request, + $this->template, + $this->user, + $this->root_path, + $this->admin_path, + $this->php_ext + ); static::assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::NETWORK_PATH), $description); } - public function helper_url_data_force_server_vars() + public static function helper_url_data_force_server_vars() { return array( array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_URL, 'http://my_server:443/my/board/app.php/foo'), @@ -521,8 +694,28 @@ public function test_helper_url_force_server_vars($enable_mod_rewrite, $force_se 'server_protocol' => $server_protocol, )); + $mock_container = new phpbb_mock_container_builder(); + $mock_container->set('cron.task_collection', []); + $this->routing_helper = new \phpbb\routing\helper($this->config, $this->router, $this->symfony_request, $this->request, $this->root_path, 'php'); - $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->symfony_request, $this->request, $this->routing_helper); + + $this->helper = new phpbb_mock_controller_helper( + $this->auth, + $this->cache, + $this->config, + new \phpbb\cron\manager($mock_container, $this->routing_helper, $this->root_path, 'php', null), + $this->db, + $this->dispatcher, + $this->language, + $this->request, + $this->routing_helper, + $this->symfony_request, + $this->template, + $this->user, + $this->root_path, + $this->admin_path, + $this->php_ext + ); static::assertEquals($expected, $this->helper->route('controller1', array(), false, false, $type)); } } diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 3bab158ac8a..58e1566a04a 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -21,10 +21,13 @@ class phpbb_controller_controller_test extends phpbb_test_case { - public function setUp() + /** @var phpbb_mock_extension_manager */ + protected $extension_manager; + + protected function setUp(): void { $this->extension_manager = new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'vendor2/foo' => array( 'ext_name' => 'vendor2/foo', @@ -45,10 +48,10 @@ public function test_router_default_loader() $container->setParameter('core.environment', PHPBB_ENVIRONMENT); $loader = new \Symfony\Component\Routing\Loader\YamlFileLoader( - new \phpbb\routing\file_locator(dirname(__FILE__) . '/') + new \phpbb\routing\file_locator(__DIR__ . '/') ); - $resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $this->extension_manager); - $router = new phpbb_mock_router($container, $resources_locator, $loader, dirname(__FILE__) . '/', 'php'); + $resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(__DIR__ . '/', PHPBB_ENVIRONMENT, $this->extension_manager); + $router = new phpbb_mock_router($container, $resources_locator, $loader, 'php', __DIR__ . '/', true, true); $routes = $router->get_routes(); // This will need to be updated if any new routes are defined @@ -85,7 +88,7 @@ public function test_controller_resolver() { $container = $this->get_foo_container(); - $resolver = new \phpbb\controller\resolver($container, dirname(__FILE__) . '/'); + $resolver = new \phpbb\controller\resolver($container, __DIR__ . '/'); $symfony_request = new Request(); $symfony_request->attributes->set('_controller', 'foo.controller:handle'); @@ -99,7 +102,7 @@ public function test_controller_resolver() $this->assertEquals(array(), $resolver->getArguments($symfony_request, $resolver->getController($symfony_request))); } - public function data_get_arguments() + public static function data_get_arguments() { return array( array(array(new foo\controller(), 'handle2'), array('foo', 0)), @@ -107,7 +110,10 @@ public function data_get_arguments() array(new foo\controller(), array(), array()), array(array(new foo\controller(), 'handle_fail'), array(), array(), '\phpbb\controller\exception', 'CONTROLLER_ARGUMENT_VALUE_MISSING'), array('', array(), array(), '\ReflectionException', 'Function () does not exist'), - array(new phpbb\controller\foo, array(), array(), '\ReflectionException', 'Method __invoke does not exist'), + // Before PHP 8: 'Method __invoke does not exist' + // As of PHP 8: 'Method phpbb\controller\foo::__invoke() does not exist' + array(new phpbb\controller\foo, array(), array(), '\ReflectionException', + 'Method ' . (version_compare(PHP_VERSION, '8', '>=') ? 'phpbb\controller\foo::__invoke()' : '__invoke') . ' does not exist'), ); } @@ -118,7 +124,7 @@ public function test_get_arguments($input, $expected, $set_attributes = array(), { $container = $this->get_foo_container(); - $resolver = new \phpbb\controller\resolver($container, dirname(__FILE__) . '/'); + $resolver = new \phpbb\controller\resolver($container, __DIR__ . '/'); $symfony_request = new Request(); foreach ($set_attributes as $name => $value) @@ -128,7 +134,8 @@ public function test_get_arguments($input, $expected, $set_attributes = array(), if (!empty($exception)) { - $this->setExpectedException($exception, $exception_message); + $this->expectException($exception); + $this->expectExceptionMessage($exception_message); } $this->assertEquals($expected, $resolver->getArguments($symfony_request, $input)); diff --git a/tests/controller/helper_route_adm_subdir_test.php b/tests/controller/helper_route_adm_subdir_test.php index a1bf1b88054..9e251ffc9ae 100644 --- a/tests/controller/helper_route_adm_subdir_test.php +++ b/tests/controller/helper_route_adm_subdir_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_helper_route.php'; +require_once __DIR__ . '/common_helper_route.php'; class phpbb_controller_helper_route_adm_subdir_test extends phpbb_controller_common_helper_route { diff --git a/tests/controller/helper_route_adm_test.php b/tests/controller/helper_route_adm_test.php index 6ee394eaaa3..3d1fa55db7b 100644 --- a/tests/controller/helper_route_adm_test.php +++ b/tests/controller/helper_route_adm_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_helper_route.php'; +require_once __DIR__ . '/common_helper_route.php'; class phpbb_controller_helper_route_adm_test extends phpbb_controller_common_helper_route { diff --git a/tests/controller/helper_route_other_app.php b/tests/controller/helper_route_other_app.php index e5513a51808..8e9a9ac0af3 100644 --- a/tests/controller/helper_route_other_app.php +++ b/tests/controller/helper_route_other_app.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_helper_route.php'; +require_once __DIR__ . '/common_helper_route.php'; class phpbb_controller_helper_route_other_app_test extends phpbb_controller_common_helper_route { @@ -30,7 +30,7 @@ protected function get_script_name() return 'app.php'; } - protected function path_to_app() + protected static function path_to_app() { return 'foo/'; } diff --git a/tests/controller/helper_route_root_test.php b/tests/controller/helper_route_root_test.php index 12462e076d7..5162201aaa4 100644 --- a/tests/controller/helper_route_root_test.php +++ b/tests/controller/helper_route_root_test.php @@ -11,9 +11,9 @@ * */ -require_once dirname(__FILE__) . '/common_helper_route.php'; +require_once __DIR__ . '/common_helper_route.php'; -class phpbb_controller_helper_route_test extends phpbb_controller_common_helper_route +class phpbb_controller_helper_route_root_test extends phpbb_controller_common_helper_route { protected function get_phpbb_root_path() { diff --git a/tests/controller/helper_route_slash_test.php b/tests/controller/helper_route_slash_test.php index c781a6943e6..1827bc04156 100644 --- a/tests/controller/helper_route_slash_test.php +++ b/tests/controller/helper_route_slash_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_helper_route.php'; +require_once __DIR__ . '/common_helper_route.php'; class phpbb_controller_helper_route_slash_test extends phpbb_controller_common_helper_route { @@ -22,12 +22,12 @@ protected function get_phpbb_root_path() protected function get_uri() { - return '/phpBB3/app.php'; + return '/phpBB/app.php'; } protected function get_base_uri() { - return '/phpBB3/'; + return '/phpBB/'; } protected function get_script_name() @@ -35,8 +35,8 @@ protected function get_script_name() return 'app.php'; } - protected function path_to_app() + protected static function path_to_app() { - return 'phpBB3/'; + return 'phpBB/'; } } diff --git a/tests/controller/helper_route_unclean_path_test.php b/tests/controller/helper_route_unclean_path_test.php index 80f1a99fffa..b2bc75edf58 100644 --- a/tests/controller/helper_route_unclean_path_test.php +++ b/tests/controller/helper_route_unclean_path_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_helper_route.php'; +require_once __DIR__ . '/common_helper_route.php'; class phpbb_controller_helper_route_unclean_path_test extends phpbb_controller_common_helper_route { diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php index e1699e64868..593d0d1d0c4 100644 --- a/tests/cron/manager_test.php +++ b/tests/cron/manager_test.php @@ -11,16 +11,19 @@ * */ -require_once dirname(__FILE__) . '/includes/cron/task/core/dummy_task.php'; -require_once dirname(__FILE__) . '/includes/cron/task/core/second_dummy_task.php'; -require_once dirname(__FILE__) . '/ext/testext/cron/dummy_task.php'; -require_once dirname(__FILE__) . '/tasks/simple_ready.php'; -require_once dirname(__FILE__) . '/tasks/simple_not_runnable.php'; -require_once dirname(__FILE__) . '/tasks/simple_should_not_run.php'; +require_once __DIR__ . '/includes/cron/task/core/dummy_task.php'; +require_once __DIR__ . '/includes/cron/task/core/second_dummy_task.php'; +require_once __DIR__ . '/ext/testext/cron/dummy_task.php'; +require_once __DIR__ . '/tasks/simple_ready.php'; +require_once __DIR__ . '/tasks/simple_not_runnable.php'; +require_once __DIR__ . '/tasks/simple_should_not_run.php'; class phpbb_cron_manager_test extends \phpbb_test_case { - public function setUp() + protected $manager; + protected $task_name; + + protected function setUp(): void { $this->manager = $this->create_cron_manager(array( new phpbb_cron_task_core_dummy_task(), @@ -81,11 +84,9 @@ private function create_cron_manager($tasks) )); $mock_router = $this->getMockBuilder('\phpbb\routing\router') - ->setMethods(array('setContext', 'generate')) + ->onlyMethods(array('setContext', 'generate')) ->disableOriginalConstructor() ->getMock(); - $mock_router->method('setContext') - ->willReturn(true); $mock_router->method('generate') ->willReturn('foobar'); @@ -101,6 +102,13 @@ private function create_cron_manager($tasks) $phpEx ); - return new \phpbb\cron\manager($tasks, $routing_helper, $phpbb_root_path, $phpEx); + $mock_container = new phpbb_mock_container_builder(); + $task_collection = new \phpbb\di\service_collection($mock_container); + $mock_container->set('cron.task_collection', $task_collection); + + $cron_manager = new \phpbb\cron\manager($mock_container, $routing_helper, $phpbb_root_path, $phpEx, null); + $cron_manager->load_tasks($tasks); + + return $cron_manager; } } diff --git a/tests/cron/wrapper_test.php b/tests/cron/wrapper_test.php new file mode 100644 index 00000000000..315761ca9db --- /dev/null +++ b/tests/cron/wrapper_test.php @@ -0,0 +1,132 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +require_once __DIR__ . '/../template/template_test_case.php'; + +class phpbb_cron_wrapper_test extends phpbb_template_template_test_case +{ + private $task; + private $routing_helper; + private $wrapper; + + protected function setUp(): void + { + global $phpbb_root_path; + + $this->setup_engine([], $phpbb_root_path . 'styles/all/template'); + + global $phpbb_filesystem; + + $phpbb_filesystem = new \phpbb\filesystem\filesystem(); + + $this->task = $this->createMock(\phpbb\cron\task\task::class); + $this->routing_helper = $this->createMock(\phpbb\routing\helper::class); + + $this->wrapper = new \phpbb\cron\task\wrapper( + $this->task, + $this->routing_helper, + $this->template + ); + } + + public function test_generate_template_pagination() + { + $this->task = $this->createMock(\phpbb\cron\task\parametrized::class); + $this->task->expects($this->any()) + ->method('get_parameters') + ->willReturn(['f' => '5']); + $this->task->expects($this->any()) + ->method('get_name') + ->willReturn('test_task'); + $this->routing_helper = $this->createMock(\phpbb\routing\helper::class); + $this->routing_helper->expects($this->any()) + ->method('route') + ->with('phpbb_cron_run', ['cron_type' => 'test_task', 'f' => '5']) + ->willReturn('app.php/cron/foo?f=5'); + + $this->wrapper = new \phpbb\cron\task\wrapper( + $this->task, + $this->routing_helper, + $this->template + ); + + $this->assertEquals('', str_replace(["\n", "\t"], '', $this->wrapper->get_html_tag())); + } + + public function test_is_parametrized_false() + { + $this->assertFalse($this->wrapper->is_parametrized()); + } + + public function test_is_ready() + { + $this->task->method('is_runnable')->willReturn(true); + $this->task->method('should_run')->willReturn(true); + + $this->assertTrue($this->wrapper->is_ready()); + } + + public function test_get_url_non_parametrized() + { + $this->task->method('get_name')->willReturn('test_task'); + $this->routing_helper->expects($this->once()) + ->method('route') + ->with('phpbb_cron_run', ['cron_type' => 'test_task']) + ->willReturn('/cron/url'); + + $this->assertEquals('/cron/url', $this->wrapper->get_url()); + } + + public function test_get_html_tag() + { + $this->template = $this->createMock(\phpbb\template\template::class); + $this->wrapper = new \phpbb\cron\task\wrapper( + $this->task, + $this->routing_helper, + $this->template + ); + + $this->template->expects($this->once()) + ->method('set_filenames'); + $this->template->expects($this->once()) + ->method('assign_var'); + $this->template->expects($this->once()) + ->method('assign_display') + ->willReturn(''); + + $this->assertEquals('', $this->wrapper->get_html_tag()); + } + + public function test_call_forwards_to_task() + { + $this->task = $this->getMockBuilder(\phpbb\cron\task\task::class) + ->disableOriginalConstructor() + ->onlyMethods(['get_name', 'run', 'is_runnable', 'should_run']) + ->addMethods(['some_method']) + ->getMock(); + $this->routing_helper = $this->createMock(\phpbb\routing\helper::class); + + $this->wrapper = new \phpbb\cron\task\wrapper( + $this->task, + $this->routing_helper, + $this->template + ); + $this->task->expects($this->once()) + ->method('some_method') + ->with('arg1', 'arg2') + ->willReturn('result'); + + $result = $this->wrapper->some_method('arg1', 'arg2'); + $this->assertEquals('result', $result); + } +} diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php index 7ecb546768d..8b4b39eb906 100644 --- a/tests/datetime/from_format_test.php +++ b/tests/datetime/from_format_test.php @@ -11,25 +11,61 @@ * */ -require_once dirname(__FILE__) . '/../mock/lang.php'; +require_once __DIR__ . '/../mock/lang.php'; class phpbb_datetime_from_format_test extends phpbb_test_case { - public function from_format_data() + /** @var \phpbb\language\language */ + protected $lang; + + /** @var \phpbb\user */ + protected $user; + + protected function setUp(): void + { + global $phpbb_root_path, $phpEx; + + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $this->lang = new \phpbb\language\language($lang_loader); + + // Set up language data for testing + $reflection_class = new ReflectionClass('\phpbb\language\language'); + // Set default language files loaded flag to true + $common_language_files_loaded_flag = $reflection_class->getProperty('common_language_files_loaded'); + $common_language_files_loaded_flag->setValue($this->lang, true); + // Set up test language data + $lang_array = $reflection_class->getProperty('lang'); + $lang_array->setValue($this->lang, [ + 'datetime' => [ + 'TODAY' => 'Today', + 'TOMORROW' => 'Tomorrow', + 'YESTERDAY' => 'Yesterday', + 'AGO' => [ + 0 => 'less than a minute ago', + 1 => '%d minute ago', + 2 => '%d minutes ago', + ], + ], + ]); + + $this->user = new \phpbb\user($this->lang, '\phpbb\datetime'); + } + + public static function from_format_data() { - return array( - array( + return [ + [ 'UTC', 'Y-m-d', '2012-06-08', - ), + ], - array( + [ 'Europe/Berlin', 'Y-m-d H:i:s', '2012-06-08 14:01:02', - ), - ); + ], + ]; } /** @@ -37,73 +73,66 @@ public function from_format_data() */ public function test_from_format($timezone, $format, $expected) { - global $phpbb_root_path, $phpEx; - - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->timezone = new DateTimeZone($timezone); - $user->lang['datetime'] = array( - 'TODAY' => 'Today', - 'TOMORROW' => 'Tomorrow', - 'YESTERDAY' => 'Yesterday', - 'AGO' => array( - 0 => 'less than a minute ago', - 1 => '%d minute ago', - 2 => '%d minutes ago', - ), - ); - - $timestamp = $user->get_timestamp_from_format($format, $expected, new DateTimeZone($timezone)); - $this->assertEquals($expected, $user->format_date($timestamp, $format, true)); + $this->user->timezone = new DateTimeZone($timezone); + $timestamp = $this->user->get_timestamp_from_format($format, $expected, new DateTimeZone($timezone)); + $this->assertEquals($expected, $this->user->format_date($timestamp, $format, true)); } - - public function relative_format_date_data() + public static function relative_format_date_data() { // If the current time is too close to the testing time, // the relative time will use "x minutes ago" instead of "today ..." // So we use 18:01 in the morning and 06:01 in the afternoon. $testing_time = gmdate('H') <= 12 ? '18:01' : '06:01'; - return array( - array( + return [ + [ gmdate('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time, false, gmdate('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time, - ), - - array( + ], + [ gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time, false, 'Tomorrow ' . $testing_time, - ), - array( + ], + [ gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time, true, gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time, - ), - - array( + ], + [ gmdate('Y-m-d') . ' ' . $testing_time, false, 'Today ' . $testing_time, - ), - array( + ], + [ gmdate('Y-m-d') . ' ' . $testing_time, true, gmdate('Y-m-d') . ' ' . $testing_time, - ), - - array( + ], + [ gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time, false, 'Yesterday ' . $testing_time, - ), - array( + ], + [ gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time, true, gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time, - ), - - array( + ], + [ gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time, false, gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time, - ), - ); + ], + + // Test edge cases: Yesterday 00:00, Today 00:00, Tomorrow 00:00 + [ + gmdate('Y-m-d', strtotime('yesterday')) . ' 00:00', false, + 'Yesterday 00:00', + ], + [ + gmdate('Y-m-d', strtotime('today')) . ' 00:00', false, + 'Today 00:00', + ], + [ + gmdate('Y-m-d', strtotime('tomorrow')) . ' 00:00', false, + 'Tomorrow 00:00', + ], + ]; } /** @@ -111,24 +140,25 @@ public function relative_format_date_data() */ public function test_relative_format_date($timestamp, $forcedate, $expected) { - global $phpbb_root_path, $phpEx; - - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->timezone = new DateTimeZone('UTC'); - $user->lang['datetime'] = array( - 'TODAY' => 'Today', - 'TOMORROW' => 'Tomorrow', - 'YESTERDAY' => 'Yesterday', - 'AGO' => array( - 0 => 'less than a minute ago', - 1 => '%d minute ago', - 2 => '%d minutes ago', - ), - ); - - $timestamp = $user->get_timestamp_from_format('Y-m-d H:i', $timestamp, new DateTimeZone('UTC')); - $this->assertEquals($expected, $user->format_date($timestamp, '|Y-m-d| H:i', $forcedate)); + $this->user->timezone = new DateTimeZone('UTC'); + $timestamp = $this->user->get_timestamp_from_format('Y-m-d H:i', $timestamp, new DateTimeZone('UTC')); + + /* This code is equal to the one from \phpbb\datetime function format() + * If the delta is less than or equal to 1 hour + * and the delta not more than a minute in the past + * and the delta is either greater than -5 seconds + * or timestamp and current time are of the same minute + * format_date() will return relative date format using "... ago" options + */ + $now_ts = strtotime('now'); + $delta = $now_ts - $timestamp; + if ($delta <= 3600 && $delta > -60 && + ($delta >= -5 || (($now_ts/ 60) % 60) == (($timestamp / 60) % 60)) + ) + { + $expected = $this->lang->lang(['datetime', 'AGO'], max(0, (int) floor($delta / 60))); + } + + $this->assertEquals($expected, $this->user->format_date($timestamp, '|Y-m-d| H:i', $forcedate)); } } diff --git a/tests/dbal/auto_increment_test.php b/tests/dbal/auto_increment_test.php index 950a4fc8f7e..74c34c934ff 100644 --- a/tests/dbal/auto_increment_test.php +++ b/tests/dbal/auto_increment_test.php @@ -14,22 +14,26 @@ class phpbb_dbal_auto_increment_test extends phpbb_database_test_case { protected $db; + protected $db_doctrine; protected $tools; protected $table_exists; protected $table_data; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); + $table_prefix = 'prefix_'; $this->db = $this->new_dbal(); + $this->db_doctrine = $this->new_doctrine_dbal(); $factory = new \phpbb\db\tools\factory(); - $this->tools = $factory->get($this->db); + $this->tools = $factory->get($this->db_doctrine); + $this->tools->set_table_prefix($table_prefix); $this->table_data = array( 'COLUMNS' => array( @@ -42,7 +46,7 @@ protected function setUp() $this->table_exists = true; } - protected function tearDown() + protected function tearDown(): void { if ($this->table_exists) { @@ -52,7 +56,7 @@ protected function tearDown() parent::tearDown(); } - static protected function get_default_values() + protected static function get_default_values() { return array( 'c_uint' => 0, @@ -62,7 +66,7 @@ static protected function get_default_values() public function test_auto_increment() { $sql = 'DELETE FROM prefix_table_name'; - $result = $this->db->sql_query($sql); + $this->db->sql_query($sql); $row1 = array_merge(self::get_default_values(), array( 'c_uint' => 1, @@ -72,11 +76,11 @@ public function test_auto_increment() )); $sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row1); - $result = $this->db->sql_query($sql); + $this->db->sql_query($sql); $id1 = $this->db->sql_nextid(); $sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row2); - $result = $this->db->sql_query($sql); + $this->db->sql_query($sql); $id2 = $this->db->sql_nextid(); $this->assertGreaterThan($id1, $id2, 'Auto increment should increase the id value'); diff --git a/tests/dbal/boolean_processor_test.php b/tests/dbal/boolean_processor_test.php index c69f60a1a8b..3352b99c823 100644 --- a/tests/dbal/boolean_processor_test.php +++ b/tests/dbal/boolean_processor_test.php @@ -15,7 +15,7 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/boolean_processor.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/boolean_processor.xml'); } public function test_single_not_like() @@ -153,9 +153,9 @@ public function test_and_of_or_of_and() 'LEFT_JOIN' => array( array( 'FROM' => array( - 'phpbb_banlist' => 'b', + 'phpbb_bans' => 'b', ), - 'ON' => 'u.user_id = b.ban_userid', + 'ON' => 'b.ban_item = ' . $db->cast_expr_to_string('u.user_id'), ), ), 'WHERE' => array('AND', @@ -172,6 +172,7 @@ public function test_and_of_or_of_and() array( array('ug.group_id', '=', 1), array('b.ban_id', 'IS_NOT', NULL), + array('b.ban_mode', '=', "'user'"), ), ), ), @@ -290,9 +291,9 @@ public function test_triple_and_with_is_null() 'LEFT_JOIN' => array( array( 'FROM' => array( - 'phpbb_banlist' => 'b', + 'phpbb_bans' => 'b', ), - 'ON' => 'u.user_id = b.ban_userid', + 'ON' => 'b.ban_item = ' . $db->cast_expr_to_string('u.user_id'), ), ), 'WHERE' => array('AND', diff --git a/tests/dbal/case_test.php b/tests/dbal/case_test.php index 5f1c7d61fad..daa1313e679 100644 --- a/tests/dbal/case_test.php +++ b/tests/dbal/case_test.php @@ -15,7 +15,7 @@ class phpbb_dbal_case_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml'); } public function test_case_int() diff --git a/tests/dbal/concatenate_test.php b/tests/dbal/concatenate_test.php index 00e7e107aa2..b033f3783db 100644 --- a/tests/dbal/concatenate_test.php +++ b/tests/dbal/concatenate_test.php @@ -15,7 +15,7 @@ class phpbb_dbal_concatenate_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml'); } public function test_concatenate_string() diff --git a/tests/dbal/connect_test.php b/tests/dbal/connect_test.php index 3933dab7982..5216312d091 100644 --- a/tests/dbal/connect_test.php +++ b/tests/dbal/connect_test.php @@ -15,12 +15,12 @@ class phpbb_dbal_connect_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); } public function test_failing_connect() { - global $phpbb_root_path, $phpEx, $phpbb_filesystem; + global $phpbb_filesystem; $phpbb_filesystem = new phpbb\filesystem\filesystem(); @@ -31,15 +31,21 @@ public function test_failing_connect() // Failure to connect results in a trigger_error call in dbal. // phpunit converts triggered errors to exceptions. // In particular there should be no fatals here. - try + if ($db->get_sql_layer() === 'mysqli') { - $db->sql_connect($config['dbhost'], 'phpbbogus', 'phpbbogus', 'phpbbogus', $config['dbport']); - $this->assertFalse(true); + $this->setExpectedTriggerError(E_WARNING); } - catch (Exception $e) + else if ($db->get_sql_layer() !== 'sqlite3') { - // should have a legitimate message - $this->assertNotEmpty($e->getMessage()); + $this->setExpectedTriggerError(E_USER_ERROR); + } + + // For SQLite3, connection will be successful anyway as phpBB driver uses SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE flags + $result = $db->sql_connect($config['dbhost'], 'phpbbogus', 'phpbbogus', 'phpbbogus', $config['dbport']); + + if ($db->get_sql_layer() === 'sqlite3') + { + $this->assertTrue($result); } } } diff --git a/tests/dbal/cross_join_test.php b/tests/dbal/cross_join_test.php index be9258c58b6..83c4b03a60c 100644 --- a/tests/dbal/cross_join_test.php +++ b/tests/dbal/cross_join_test.php @@ -15,7 +15,7 @@ class phpbb_dbal_cross_join_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/massmail_crossjoin.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/massmail_crossjoin.xml'); } public function test_cross_join() @@ -36,9 +36,9 @@ public function test_cross_join() 'LEFT_JOIN' => array( array( 'FROM' => array( - 'phpbb_banlist' => 'b', + 'phpbb_bans' => 'b', ), - 'ON' => 'u.user_id = b.ban_userid', + 'ON' => 'b.ban_item = ' . $db->cast_expr_to_string('u.user_id'), ), ), 'WHERE' => 'ug.group_id = 1 diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php index 818d8d8e171..90fa0eca09c 100644 --- a/tests/dbal/db_tools_test.php +++ b/tests/dbal/db_tools_test.php @@ -1,4 +1,7 @@ createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml'); } - protected function setUp() + protected function setUp(): void { + parent::setUp(); + $table_prefix = 'prefix_'; $this->db = $this->new_dbal(); + $this->doctrine_db = $this->new_doctrine_dbal(); $factory = new \phpbb\db\tools\factory(); - $this->tools = $factory->get($this->db); + $this->tools = $factory->get($this->doctrine_db); + $this->tools->set_table_prefix($table_prefix); $this->table_data = array( 'COLUMNS' => array( @@ -77,7 +89,7 @@ protected function setUp() $this->table_exists = true; } - protected function tearDown() + protected function tearDown(): void { if ($this->table_exists) { @@ -99,7 +111,7 @@ public function test_created_and_drop_table() $this->tools->sql_table_drop('prefix_table_name'); } - static protected function get_default_values() + protected static function get_default_values() { return array( 'c_int_size' => 0, @@ -182,10 +194,10 @@ public function test_created_column($column_name, $column_value) // empty table $sql = 'DELETE FROM prefix_table_name'; - $result = $this->db->sql_query($sql); + $this->db->sql_query($sql); $sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row_insert); - $result = $this->db->sql_query($sql); + $this->db->sql_query($sql); $sql = "SELECT * FROM prefix_table_name"; @@ -203,16 +215,15 @@ public function test_created_column($column_name, $column_value) public function test_list_columns() { - $config = $this->get_database_config(); - $table_columns = $this->table_data['COLUMNS']; + $expected_columns = $this->table_data['COLUMNS']; + $found_columns = $this->tools->sql_list_columns('prefix_table_name'); + + ksort($expected_columns); + ksort($found_columns); - if (strpos($config['dbms'], 'mssql') !== false) - { - ksort($table_columns); - } $this->assertEquals( - array_keys($table_columns), - array_values($this->tools->sql_list_columns('prefix_table_name')) + array_keys($expected_columns), + array_values($found_columns) ); } @@ -224,23 +235,25 @@ public function test_column_exists() public function test_column_change_with_index() { + $short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname('table_name'); + // Create column $this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012')); $this->assertTrue($this->tools->sql_column_add('prefix_table_name', 'c_bug_12012', array('DECIMAL', 0))); $this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012')); // Create index over the column - $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012')); + $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012')); $this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'i_bug_12012', array('c_bug_12012', 'c_bool'))); - $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012')); + $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012')); // Change type from int to string $this->assertTrue($this->tools->sql_column_change('prefix_table_name', 'c_bug_12012', array('VCHAR:100', ''))); // Remove the index - $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012')); + $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012')); $this->assertTrue($this->tools->sql_index_drop('prefix_table_name', 'i_bug_12012')); - $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012')); + $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_i_bug_12012')); // Remove the column $this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012')); @@ -250,6 +263,11 @@ public function test_column_change_with_index() public function test_column_change_with_composite_primary() { + if (stripos(get_class($this->db), 'sqlite') !== false) + { + $this->markTestSkipped('Sqlite platform does not support alter primary key.'); + } + // Remove the old primary key $this->assertTrue($this->tools->sql_column_remove('prefix_table_name', 'c_id')); $this->assertTrue($this->tools->sql_column_add('prefix_table_name', 'c_id', array('UINT', 0))); @@ -288,19 +306,21 @@ public function test_column_remove_similar_name() public function test_column_remove_with_index() { + $short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname('table_name'); + // Create column $this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2')); $this->assertTrue($this->tools->sql_column_add('prefix_table_name', 'c_bug_12012_2', array('UINT', 4))); $this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2')); // Create index over the column - $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_2')); + $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_2')); $this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'bug_12012_2', array('c_bug_12012_2', 'c_bool'))); - $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_2')); + $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_2')); - $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_3')); + $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_3')); $this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'bug_12012_3', array('c_bug_12012_2'))); - $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_3')); + $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_bug_12012_3')); // Remove the column $this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2')); @@ -344,11 +364,39 @@ public function test_table_drop() $this->assertFalse($this->tools->sql_table_exists('prefix_test_table')); } + public function test_truncate_table() + { + $this->tools->sql_create_table('truncate_test_table', + ['COLUMNS' => [ + 'foo' => ['UINT', 42], + ]] + ); + + $this->assertTrue($this->tools->sql_table_exists('truncate_test_table')); + + $sql = 'INSERT INTO truncate_test_table(foo) VALUES(19)'; + $this->db->sql_query($sql); + + $sql = 'SELECT * FROM truncate_test_table'; + $result = $this->db->sql_query($sql); + $rowset = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + + $this->assertGreaterThan(0, count($rowset), 'Failed asserting that data exists in truncate_test_table.'); + + $this->tools->sql_truncate_table('truncate_test_table'); + + $result = $this->db->sql_query($sql); + $rowset = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + $this->assertEquals(0, count($rowset), 'Failed asserting that truncate was successful for table.'); + } + public function test_perform_schema_changes_drop_tables() { - $db_tools = $this->getMockBuilder('\phpbb\db\tools\tools') - ->setMethods(array('sql_table_exists', 'sql_table_drop')) - ->setConstructorArgs(array(&$this->db)) + $db_tools = $this->getMockBuilder('\phpbb\db\tools\doctrine') + ->onlyMethods(array('sql_table_exists', 'schema_drop_table')) + ->setConstructorArgs(array($this->doctrine_db)) ->getMock(); // pretend all tables exist @@ -356,11 +404,19 @@ public function test_perform_schema_changes_drop_tables() ->will($this->returnValue(true)); // drop tables - $db_tools->expects($this->exactly(2))->method('sql_table_drop'); - $db_tools->expects($this->at(1))->method('sql_table_drop') - ->with($this->equalTo('dropped_table_1')); - $db_tools->expects($this->at(3))->method('sql_table_drop') - ->with($this->equalTo('dropped_table_2')); + $matcher = $this->exactly(2); + $db_tools->expects($matcher)->method('schema_drop_table') + ->willReturnCallback(function() use ($matcher) { + $args = func_get_args(); + $schema = array_shift($args); + $this->assertInstanceOf(\Doctrine\DBAL\Schema\Schema::class, $schema); + match($matcher->numberOfInvocations()) + { + 1 => $this->assertEquals($args, ['dropped_table_1', true]), + 2 => $this->assertEquals($args, ['dropped_table_2', true]), + }; + } + ); $db_tools->perform_schema_changes(array( 'drop_tables' => array( @@ -372,9 +428,9 @@ public function test_perform_schema_changes_drop_tables() public function test_perform_schema_changes_drop_columns() { - $db_tools = $this->getMockBuilder('\phpbb\db\tools\tools') - ->setMethods(array('sql_column_exists', 'sql_column_remove')) - ->setConstructorArgs(array(&$this->db)) + $db_tools = $this->getMockBuilder('\phpbb\db\tools\doctrine') + ->onlyMethods(array('sql_column_exists', 'schema_column_remove')) + ->setConstructorArgs(array($this->doctrine_db)) ->getMock(); // pretend all columns exist @@ -384,11 +440,18 @@ public function test_perform_schema_changes_drop_columns() ->will($this->returnValue(true)); // drop columns - $db_tools->expects($this->exactly(2))->method('sql_column_remove'); - $db_tools->expects($this->at(1))->method('sql_column_remove') - ->with($this->equalTo('existing_table'), $this->equalTo('dropped_column_1')); - $db_tools->expects($this->at(3))->method('sql_column_remove') - ->with($this->equalTo('existing_table'), $this->equalTo('dropped_column_2')); + $matcher = $this->exactly(2); + $db_tools->expects($matcher)->method('schema_column_remove') + ->willReturnCallback(function() use ($matcher) { + $args = func_get_args(); + $schema = array_shift($args); + $this->assertInstanceOf(\Doctrine\DBAL\Schema\Schema::class, $schema); + match($matcher->numberOfInvocations()) { + 1 => $this->assertEquals($args, ['existing_table', 'dropped_column_1', true]), + 2 => $this->assertEquals($args, ['existing_table', 'dropped_column_2', true]), + }; + } + ); $db_tools->perform_schema_changes(array( 'drop_columns' => array( @@ -402,35 +465,37 @@ public function test_perform_schema_changes_drop_columns() public function test_index_exists() { - $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_simple')); + $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_i_simple')); } public function test_unique_index_exists() { - $this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', 'i_uniq')); + $this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_i_uniq')); } public function test_create_index_against_index_exists() { $this->tools->sql_create_index('prefix_table_name', 'fookey', array('c_timestamp', 'c_decimal')); - $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'fookey')); + $this->assertTrue($this->tools->sql_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_fookey')); } public function test_create_unique_index_against_unique_index_exists() { $this->tools->sql_create_unique_index('prefix_table_name', 'i_uniq_ts_id', array('c_timestamp', 'c_id')); - $this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', 'i_uniq_ts_id')); + $this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', \phpbb\db\doctrine\table_helper::generate_shortname('table_name') . '_i_uniq_ts_id')); } public function test_create_int_default_null() { $this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_bug_13282')); - $this->assertTrue($this->tools->sql_column_add('prefix_table_name', 'c_bug_13282', array('TINT:2'))); + $this->assertTrue($this->tools->sql_column_add('prefix_table_name', 'c_bug_13282', array('TINT:2', null))); $this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_13282')); } public function test_create_index_with_long_name() { + $this->markTestSkipped('Skipped because it does not work anymore; To be checked.'); // TODO + // This constant is being used for checking table prefix. $table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config) @@ -444,34 +509,35 @@ public function test_create_index_with_long_name() if ($this->tools instanceof \phpbb\db\tools\mssql) { $max_length_method = new ReflectionMethod('\phpbb\db\tools\mssql', 'get_max_index_name_length'); - $max_length_method->setAccessible(true); $max_index_length = $max_length_method->invoke($this->tools); } $table_suffix = str_repeat('a', 25 - strlen($table_prefix)); $table_name = $table_prefix . $table_suffix; + $short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname($table_suffix); $this->tools->sql_create_table($table_name, $this->table_data); // Index name and table suffix and table prefix have > maximum index length chars in total. // Index name and table suffix have <= maximum index length chars in total. $long_index_name = str_repeat('i', $max_index_length - strlen($table_suffix)); - $this->assertFalse($this->tools->sql_index_exists($table_name, $long_index_name)); + $this->assertFalse($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $long_index_name)); $this->assertTrue($this->tools->sql_create_index($table_name, $long_index_name, array('c_timestamp'))); - $this->assertTrue($this->tools->sql_index_exists($table_name, $long_index_name)); + $this->assertTrue($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $long_index_name)); // Index name and table suffix have > maximum index length chars in total. $very_long_index_name = str_repeat('i', $max_index_length); - $this->assertFalse($this->tools->sql_index_exists($table_name, $very_long_index_name)); + $this->assertFalse($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $very_long_index_name)); $this->assertTrue($this->tools->sql_create_index($table_name, $very_long_index_name, array('c_timestamp'))); - $this->assertTrue($this->tools->sql_index_exists($table_name, $very_long_index_name)); + $this->assertTrue($this->tools->sql_index_exists($table_name, $short_table_name . '_' . $very_long_index_name)); $this->tools->sql_table_drop($table_name); // Index name has > maximum index length chars - that should not be possible. $too_long_index_name = str_repeat('i', $max_index_length + 1); - $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $too_long_index_name)); - $this->setExpectedTriggerError(E_USER_ERROR); + $this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $short_table_name . '_' . $too_long_index_name)); + $this->setExpectedTriggerError(E_USER_ERROR); // TODO: Do we want to keep this limitation, if yes reimplement the user check + /* https://github.com/phpbb/phpbb/blob/aee5e373bca6cd20d44b99585d3b758276a2d7e6/phpBB/phpbb/db/tools/tools.php#L1488-L1517 */ $this->tools->sql_create_index('prefix_table_name', $too_long_index_name, array('c_timestamp')); } } diff --git a/tests/dbal/ext/foo/bar/acp/acp_test_info.php b/tests/dbal/ext/foo/bar/acp/acp_test_info.php new file mode 100644 index 00000000000..ac92623c3ac --- /dev/null +++ b/tests/dbal/ext/foo/bar/acp/acp_test_info.php @@ -0,0 +1,37 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace foo\bar\acp; + +class acp_test_info +{ + public function module() + { + return array( + 'filename' => '\foo\bar\acp\acp_test_module', + 'title' => 'ACP_NEW_MODULE', + 'modes' => array( + 'mode_1' => array( + 'title' => 'ACP_NEW_MODULE_MODE_1', + 'auth' => '', + 'cat' => array('ACP_NEW_MODULE'), + ), + 'mode_2' => array( + 'title' => 'ACP_NEW_MODULE_MODE_2', + 'auth' => '', + 'cat' => array('ACP_NEW_MODULE'), + ), + ), + ); + } +} diff --git a/phpBB/phpbb/filesystem.php b/tests/dbal/ext/foo/bar/acp/acp_test_module.php similarity index 62% rename from phpBB/phpbb/filesystem.php rename to tests/dbal/ext/foo/bar/acp/acp_test_module.php index 6ac94593313..01ce5c17dce 100644 --- a/phpBB/phpbb/filesystem.php +++ b/tests/dbal/ext/foo/bar/acp/acp_test_module.php @@ -11,11 +11,15 @@ * */ -namespace phpbb; +namespace foo\bar\acp; -/** - * @deprecated 3.2.0-dev (To be removed 4.0.0) use \phpbb\filesystem\filesystem instead - */ -class filesystem extends \phpbb\filesystem\filesystem +class acp_test_module { + var $u_action; + + function main($id, $mode) + { + $this->tpl_name = 'foobar'; + $this->page_title = 'Bertie'; + } } diff --git a/tests/dbal/ext/foo/bar/composer.json b/tests/dbal/ext/foo/bar/composer.json new file mode 100644 index 00000000000..2edfd43d845 --- /dev/null +++ b/tests/dbal/ext/foo/bar/composer.json @@ -0,0 +1,24 @@ +{ + "name": "foo/bar", + "type": "phpbb-extension", + "description": "An example/sample extension to be used for testing purposes in phpBB Development.", + "version": "1.0.0", + "time": "2012-02-15 01:01:01", + "license": "GNU GPL v2", + "authors": [{ + "name": "John Smith", + "username": "JohnSmith27", + "email": "email@phpbb.com", + "homepage": "http://phpbb.com", + "role": "N/A" + }], + "require": { + "php": ">=5.4.7" + }, + "extra": { + "display-name": "phpBB BarFoo Extension", + "soft-require": { + "phpbb/phpbb": "3.2.*@dev" + } + } +} diff --git a/tests/dbal/ext/foo/bar/ucp/ucp_test_info.php b/tests/dbal/ext/foo/bar/ucp/ucp_test_info.php new file mode 100644 index 00000000000..d3489af832d --- /dev/null +++ b/tests/dbal/ext/foo/bar/ucp/ucp_test_info.php @@ -0,0 +1,37 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace foo\bar\ucp; + +class ucp_test_info +{ + public function module() + { + return array( + 'filename' => '\foo\bar\ucp\ucp_test_module', + 'title' => 'UCP_NEW_MODULE', + 'modes' => array( + 'mode_1' => array( + 'title' => 'UCP_NEW_MODULE_MODE_1', + 'auth' => '', + 'cat' => array('UCP_NEW_MODULE'), + ), + 'mode_2' => array( + 'title' => 'UCP_NEW_MODULE_MODE_2', + 'auth' => '', + 'cat' => array('UCP_NEW_MODULE'), + ), + ), + ); + } +} diff --git a/tests/mock/search.php b/tests/dbal/ext/foo/bar/ucp/ucp_test_module.php similarity index 59% rename from tests/mock/search.php rename to tests/dbal/ext/foo/bar/ucp/ucp_test_module.php index f30876b4daf..b06b3238b60 100644 --- a/tests/mock/search.php +++ b/tests/dbal/ext/foo/bar/ucp/ucp_test_module.php @@ -11,17 +11,15 @@ * */ -/** -*/ -class phpbb_mock_search -{ +namespace foo\bar\ucp; - public function __construct($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user) - { - } +class ucp_test_module +{ + var $u_action; - public function index_remove($post_ids, $poster_ids, $forum_ids) + function main($id, $mode) { + $this->tpl_name = 'foobar'; + $this->page_title = 'Bertie'; } } - diff --git a/tests/dbal/fixtures/boolean_processor.xml b/tests/dbal/fixtures/boolean_processor.xml index d31d679f454..9bab747fcf0 100644 --- a/tests/dbal/fixtures/boolean_processor.xml +++ b/tests/dbal/fixtures/boolean_processor.xml @@ -1,10 +1,12 @@ - +
      ban_id - ban_userid + ban_mode + ban_item 1 + user 2
      diff --git a/tests/dbal/fixtures/massmail_crossjoin.xml b/tests/dbal/fixtures/massmail_crossjoin.xml index 1050ba067e1..d453d5e9fde 100644 --- a/tests/dbal/fixtures/massmail_crossjoin.xml +++ b/tests/dbal/fixtures/massmail_crossjoin.xml @@ -1,10 +1,12 @@ - +
      ban_id - ban_userid + ban_mode + ban_item 1 + user 2
      diff --git a/tests/dbal/migration/dummy_order_0.php b/tests/dbal/migration/dummy_order_0.php index 4caea76704a..d0d12ed696d 100644 --- a/tests/dbal/migration/dummy_order_0.php +++ b/tests/dbal/migration/dummy_order_0.php @@ -13,6 +13,13 @@ class phpbb_dbal_migration_dummy_order_0 extends \phpbb\db\migration\migration { + public static function depends_on() + { + return [ + 'phpbb_dbal_migration_dummy_order', + ]; + } + function update_schema() { return array( diff --git a/tests/dbal/migration/dummy_order_1.php b/tests/dbal/migration/dummy_order_1.php index ea512765fa5..ff73291c233 100644 --- a/tests/dbal/migration/dummy_order_1.php +++ b/tests/dbal/migration/dummy_order_1.php @@ -13,6 +13,13 @@ class phpbb_dbal_migration_dummy_order_1 extends \phpbb\db\migration\migration { + public static function depends_on() + { + return [ + 'phpbb_dbal_migration_dummy_order', + ]; + } + function update_schema() { return array( diff --git a/tests/dbal/migration/dummy_order_2.php b/tests/dbal/migration/dummy_order_2.php index a7669b1ac89..58d195873c4 100644 --- a/tests/dbal/migration/dummy_order_2.php +++ b/tests/dbal/migration/dummy_order_2.php @@ -13,6 +13,13 @@ class phpbb_dbal_migration_dummy_order_2 extends \phpbb\db\migration\migration { + public static function depends_on() + { + return [ + 'phpbb_dbal_migration_dummy_order', + ]; + } + function update_schema() { return array( diff --git a/tests/dbal/migration/dummy_order_3.php b/tests/dbal/migration/dummy_order_3.php index 501db09b7eb..8c57f7580e4 100644 --- a/tests/dbal/migration/dummy_order_3.php +++ b/tests/dbal/migration/dummy_order_3.php @@ -13,6 +13,13 @@ class phpbb_dbal_migration_dummy_order_3 extends \phpbb\db\migration\migration { + public static function depends_on() + { + return [ + 'phpbb_dbal_migration_dummy_order', + ]; + } + function update_schema() { return array( diff --git a/tests/dbal/migration/dummy_order_4.php b/tests/dbal/migration/dummy_order_4.php index 77bb5a24b34..d48a735bd38 100644 --- a/tests/dbal/migration/dummy_order_4.php +++ b/tests/dbal/migration/dummy_order_4.php @@ -13,6 +13,13 @@ class phpbb_dbal_migration_dummy_order_4 extends \phpbb\db\migration\migration { + public static function depends_on() + { + return [ + 'phpbb_dbal_migration_dummy_order', + ]; + } + function update_schema() { return array( diff --git a/tests/dbal/migration/dummy_order_5.php b/tests/dbal/migration/dummy_order_5.php index 8f92392a8bb..8e13f69d5e2 100644 --- a/tests/dbal/migration/dummy_order_5.php +++ b/tests/dbal/migration/dummy_order_5.php @@ -13,6 +13,13 @@ class phpbb_dbal_migration_dummy_order_5 extends \phpbb\db\migration\migration { + public static function depends_on() + { + return [ + 'phpbb_dbal_migration_dummy_order', + ]; + } + function update_schema() { return array( diff --git a/tests/dbal/migration/schema.php b/tests/dbal/migration/schema.php index 38663bcc16b..04c20c46cb5 100644 --- a/tests/dbal/migration/schema.php +++ b/tests/dbal/migration/schema.php @@ -22,12 +22,22 @@ function update_schema() ), ), 'add_tables' => array( - $this->table_prefix . 'foobar' => array( - 'COLUMNS' => array( - 'module_id' => array('UINT:3', NULL, 'auto_increment'), - ), + $this->table_prefix . 'foobar' => [ + 'COLUMNS' => [ + 'module_id' => ['UINT:3', NULL, 'auto_increment'], + 'user_id' => ['ULINT', 0], + 'endpoint' => ['VCHAR:220', ''], + 'expiration_time' => ['TIMESTAMP', 0], + 'p256dh' => ['VCHAR:200', ''], + 'auth' => ['VCHAR:100', ''], + ], 'PRIMARY_KEY' => 'module_id', - ), + 'KEYS' => [ + 'i_simple' => ['INDEX', ['user_id', 'endpoint:191']], + 'i_uniq' => ['UNIQUE', ['expiration_time', 'p256dh(100)']], + 'i_auth' => ['INDEX', 'auth'], + ], + ], ), ); } diff --git a/tests/dbal/migration/schema_add_autoincrement.php b/tests/dbal/migration/schema_add_autoincrement.php new file mode 100644 index 00000000000..4e3ecff1838 --- /dev/null +++ b/tests/dbal/migration/schema_add_autoincrement.php @@ -0,0 +1,43 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +class schema_add_autoincrement extends \phpbb\db\migration\migration +{ + function update_schema() + { + return [ + 'add_tables' => [ + $this->table_prefix . 'noid' => [ + 'COLUMNS' => [ + 'text' => ['VCHAR:50', ''], + ], + ], + ], + + 'add_columns' => [ + $this->table_prefix . 'noid' => [ + 'id' => ['UINT:3', null, 'auto_increment'], + ], + ], + ]; + } + + function revert_schema() + { + return [ + 'drop_tables' => [ + $this->table_prefix . 'noid', + ], + ]; + } +} diff --git a/tests/dbal/migration/schema_index.php b/tests/dbal/migration/schema_index.php new file mode 100644 index 00000000000..1ea8eb7c784 --- /dev/null +++ b/tests/dbal/migration/schema_index.php @@ -0,0 +1,65 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +class phpbb_dbal_migration_schema_index extends \phpbb\db\migration\migration +{ + function update_schema() + { + return [ + 'add_tables' => [ + $this->table_prefix . 'foobar1' => [ + 'COLUMNS' => [ + 'user_id' => ['UINT', 0], + 'username' => ['VCHAR:50', 0], + ], + 'KEYS' => [ + 'tstidx_user_id' => ['UNIQUE', 'user_id'], + 'tstidx_username' => ['INDEX', 'username'], + ], + ], + $this->table_prefix . 'foobar2' => [ + 'COLUMNS' => [ + 'ban_userid' => ['ULINT', 0], + 'ban_ip' => ['VCHAR:40', ''], + 'ban_reason' => ['VCHAR:100', ''], + ], + 'KEYS' => [ + 'tstidx_ban_userid' => ['UNIQUE', 'ban_userid'], + 'tstidxban_data' => ['INDEX', ['ban_ip', 'ban_reason']], + ], + ], + ], + + 'rename_index' => [ + $this->table_prefix . 'foobar1' => [ + 'tstidx_user_id' => 'fbr1_user_id', + 'tstidx_username' => 'fbr1_username', + ], + $this->table_prefix . 'foobar2' => [ + 'tstidx_ban_userid' => 'fbr2_ban_userid', + 'tstidxban_data' => 'fbr2_ban_data', + ], + ], + ]; + } + + function revert_schema() + { + return [ + 'drop_tables' => [ + $this->table_prefix . 'foobar1', + $this->table_prefix . 'foobar2', + ], + ]; + } +} diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index a5f587fc710..89e158541a9 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -11,25 +11,30 @@ * */ -require_once dirname(__FILE__) . '/migration/dummy.php'; -require_once dirname(__FILE__) . '/migration/unfulfillable.php'; -require_once dirname(__FILE__) . '/migration/if.php'; -require_once dirname(__FILE__) . '/migration/recall.php'; -require_once dirname(__FILE__) . '/migration/if_params.php'; -require_once dirname(__FILE__) . '/migration/recall_params.php'; -require_once dirname(__FILE__) . '/migration/revert.php'; -require_once dirname(__FILE__) . '/migration/revert_with_dependency.php'; -require_once dirname(__FILE__) . '/migration/revert_table.php'; -require_once dirname(__FILE__) . '/migration/revert_table_with_dependency.php'; -require_once dirname(__FILE__) . '/migration/fail.php'; -require_once dirname(__FILE__) . '/migration/installed.php'; -require_once dirname(__FILE__) . '/migration/schema.php'; +require_once __DIR__ . '/migration/dummy.php'; +require_once __DIR__ . '/migration/unfulfillable.php'; +require_once __DIR__ . '/migration/if.php'; +require_once __DIR__ . '/migration/recall.php'; +require_once __DIR__ . '/migration/if_params.php'; +require_once __DIR__ . '/migration/recall_params.php'; +require_once __DIR__ . '/migration/revert.php'; +require_once __DIR__ . '/migration/revert_with_dependency.php'; +require_once __DIR__ . '/migration/revert_table.php'; +require_once __DIR__ . '/migration/revert_table_with_dependency.php'; +require_once __DIR__ . '/migration/fail.php'; +require_once __DIR__ . '/migration/installed.php'; +require_once __DIR__ . '/migration/schema.php'; +require_once __DIR__ . '/migration/schema_index.php'; +require_once __DIR__ . '/migration/schema_add_autoincrement.php'; class phpbb_dbal_migrator_test extends phpbb_database_test_case { /** @var \phpbb\db\driver\driver_interface */ protected $db; + /** @var \Doctrine\DBAL\Connection */ + protected $doctrine_db; + /** @var \phpbb\db\tools\tools_interface */ protected $db_tools; @@ -39,21 +44,34 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case /** @var \phpbb\config\config */ protected $config; + /** @var \phpbb\extension\manager */ + protected $extension_manager; + + /** @var string */ + protected $table_prefix; + public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/migrator.xml'); } - public function setUp() + protected function setUp(): void { + global $table_prefix; + parent::setUp(); + $this->table_prefix = $table_prefix; $this->db = $this->new_dbal(); + $this->doctrine_db = $this->new_doctrine_dbal(); $factory = new \phpbb\db\tools\factory(); - $this->db_tools = $factory->get($this->db); + $this->db_tools = $factory->get($this->doctrine_db); + $this->db_tools->set_table_prefix($this->table_prefix); $this->config = new \phpbb\config\db($this->db, new phpbb_mock_cache, 'phpbb_config'); + $finder_factory = $this->createMock('\phpbb\finder\factory'); + $tools = array( new \phpbb\db\migration\tool\config($this->config), ); @@ -66,22 +84,23 @@ public function setUp() $this->db, $this->db_tools, 'phpbb_migrations', - dirname(__FILE__) . '/../../phpBB/', + __DIR__ . '/../../phpBB/', 'php', 'phpbb_', + self::get_core_tables(), $tools, new \phpbb\db\migration\helper() ); $container->set('migrator', $this->migrator); - $container->set('dispatcher', new phpbb_mock_event_dispatcher()); + $container->set('event_dispatcher', new phpbb_mock_event_dispatcher()); $this->extension_manager = new \phpbb\extension\manager( $container, $this->db, $this->config, + $finder_factory, 'phpbb_ext', - dirname(__FILE__) . '/../../phpBB/', - 'php', + __DIR__ . '/../../phpBB/', null ); } @@ -91,6 +110,7 @@ public function test_update() $this->migrator->set_migrations(array('phpbb_dbal_migration_dummy')); // schema + $start_time = time(); $this->migrator->update(); $this->assertFalse($this->migrator->finished()); @@ -99,12 +119,13 @@ public function test_update() "SELECT 1 as success FROM phpbb_migrations WHERE migration_name = 'phpbb_dbal_migration_dummy' - AND migration_start_time >= " . (time() - 1) . " + AND migration_start_time >= " . ($start_time - 1) . " AND migration_start_time <= " . (time() + 1), 'Start time set correctly' ); // data + $start_time = time(); $this->migrator->update(); $this->assertTrue($this->migrator->finished()); @@ -120,7 +141,7 @@ public function test_update() FROM phpbb_migrations WHERE migration_name = 'phpbb_dbal_migration_dummy' AND migration_start_time <= migration_end_time - AND migration_end_time >= " . (time() - 1) . " + AND migration_end_time >= " . ($start_time - 1) . " AND migration_end_time <= " . (time() + 1), 'End time set correctly' ); @@ -396,6 +417,64 @@ public function test_schema() $this->assertTrue($this->db_tools->sql_column_exists('phpbb_config', 'test_column1')); $this->assertTrue($this->db_tools->sql_table_exists('phpbb_foobar')); + $short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname('foobar'); + $index_data_row = $this->db_tools->sql_get_table_index_data('phpbb_foobar'); + $this->assertEquals(4, count($index_data_row)); + $this->assertTrue(isset($index_data_row[$short_table_name . '_i_simple'])); + $this->assertTrue(isset($index_data_row[$short_table_name . '_i_uniq'])); + $this->assertTrue(isset($index_data_row[$short_table_name . '_i_auth'])); + + $is_mysql = $this->db->get_sql_layer() === 'mysqli'; // Key 'lengths' option only applies to MySQL indexes + + // MSSQL primary index key has 'clustered' flag, 'nonclustered' otherwise + // See https://learn.microsoft.com/en-us/sql/relational-databases/indexes/clustered-and-nonclustered-indexes-described?view=sql-server-ver17#indexes-and-constraints + $is_mssql = in_array($this->db->get_sql_layer(), ['mssqlnative', 'mssql_odbc']); + + foreach ($index_data_row as $index_name => $index_data) + { + switch ($index_name) + { + case $short_table_name . '_i_simple': + $this->assertEquals(['user_id', 'endpoint'], $index_data['columns']); + $this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']); + $this->assertFalse($index_data['is_primary']); + $this->assertFalse($index_data['is_unique']); + $this->assertTrue($index_data['is_simple']); + $this->assertEquals(2, count($index_data['options']['lengths'])); + $this->assertEmpty($index_data['options']['lengths'][0]); + $this->assertEquals($is_mysql ? 191 : null, $index_data['options']['lengths'][1]); + break; + case $short_table_name . '_i_uniq': + $this->assertEquals(['expiration_time', 'p256dh'], $index_data['columns']); + $this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']); + $this->assertFalse($index_data['is_primary']); + $this->assertTrue($index_data['is_unique']); + $this->assertFalse($index_data['is_simple']); + $this->assertEquals(2, count($index_data['options']['lengths'])); + $this->assertEmpty($index_data['options']['lengths'][0]); + $this->assertEquals($is_mysql ? 100 : null, $index_data['options']['lengths'][1]); + break; + case $short_table_name . '_i_auth': + $this->assertEquals(['auth'], $index_data['columns']); + $this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']); + $this->assertFalse($index_data['is_primary']); + $this->assertFalse($index_data['is_unique']); + $this->assertTrue($index_data['is_simple']); + $this->assertEquals(1, count($index_data['options']['lengths'])); + $this->assertEmpty($index_data['options']['lengths'][0]); + break; + default: // Primary key + $this->assertEquals(['module_id'], $index_data['columns']); + $this->assertEquals($is_mssql ? ['clustered'] : [], $index_data['flags']); + $this->assertTrue($index_data['is_primary']); + $this->assertTrue($index_data['is_unique']); + $this->assertFalse($index_data['is_simple']); + $this->assertEquals(1, count($index_data['options']['lengths'])); + $this->assertEmpty($index_data['options']['lengths'][0]); + break; + } + } + while ($this->migrator->migration_state('phpbb_dbal_migration_schema')) { $this->migrator->revert('phpbb_dbal_migration_schema'); @@ -404,4 +483,106 @@ public function test_schema() $this->assertFalse($this->db_tools->sql_column_exists('phpbb_config', 'test_column1')); $this->assertFalse($this->db_tools->sql_table_exists('phpbb_foobar')); } + + public function test_rename_index() + { + $this->migrator->set_migrations(array('phpbb_dbal_migration_schema_index')); + + while (!$this->migrator->finished()) + { + $this->migrator->update(); + } + + $this->assertTrue($this->db_tools->sql_unique_index_exists('phpbb_foobar1', 'fbr1_user_id')); + $this->assertTrue($this->db_tools->sql_index_exists('phpbb_foobar1', 'fbr1_username')); + $this->assertTrue($this->db_tools->sql_unique_index_exists('phpbb_foobar2', 'fbr2_ban_userid')); + $this->assertTrue($this->db_tools->sql_index_exists('phpbb_foobar2', 'fbr2_ban_data')); + + while ($this->migrator->migration_state('phpbb_dbal_migration_schema_index')) + { + $this->migrator->revert('phpbb_dbal_migration_schema_index'); + } + + $this->assertFalse($this->db_tools->sql_table_exists('phpbb_foobar1')); + $this->assertFalse($this->db_tools->sql_table_exists('phpbb_foobar2')); + } + + public function test_schema_generator(): array + { + global $phpbb_root_path, $phpEx; + + $finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $phpEx); + $finder = $finder_factory->get(); + $migrator_classes = $finder->core_path('phpbb/db/migration/data/')->get_classes(); + + $schema_generator = new \phpbb\db\migration\schema_generator( + $migrator_classes, + $this->config, + $this->db, + $this->db_tools, + $phpbb_root_path, + $phpEx, + 'phpbb_', + self::get_core_tables() + ); + $db_table_schema = $schema_generator->get_schema(); + + $this->assertNotEmpty($db_table_schema); + + return $db_table_schema; + } + + /** + * @depends test_schema_generator + */ + public function test_table_indexes(array $db_table_schema) + { + $table_keys = []; + foreach ($db_table_schema as $table_name => $table_data) + { + if (isset($table_data['KEYS'])) + { + foreach ($table_data['KEYS'] as $key_name => $key_data) + { + $table_keys[$table_name][] = $key_name; + } + } + } + + $this->assertNotEmpty($table_keys); + + $table_names = array_merge(array_keys($db_table_schema), ['phpbb_custom_table']); + $short_table_names = \phpbb\db\doctrine\table_helper::map_short_table_names($table_names, 'phpbb_'); + $this->assertEquals('phpbb_custom_table', array_search(\phpbb\db\doctrine\table_helper::generate_shortname('custom_table'), $short_table_names)); + $this->assertEquals($short_table_names['phpbb_custom_table'], \phpbb\db\doctrine\table_helper::generate_shortname('custom_table')); + + foreach ($table_keys as $table_name => $key_names) + { + $index_prefix = $short_table_names[$table_name] . '_'; + foreach ($key_names as $key_name) + { + $this->assertEquals(0, strpos($key_name, $index_prefix), "$key_name does not contain $index_prefix"); + } + } + } + + public function test_add_autoincrement_column() + { + $this->migrator->set_migrations(['schema_add_autoincrement']); + + while (!$this->migrator->finished()) + { + $this->migrator->update(); + } + + $this->assertTrue($this->db_tools->sql_table_exists('phpbb_noid')); + $this->assertTrue($this->db_tools->sql_column_exists('phpbb_noid', 'id')); + + while ($this->migrator->migration_state('schema_add_autoincrement')) + { + $this->migrator->revert('schema_add_autoincrement'); + } + + $this->assertFalse($this->db_tools->sql_table_exists('phpbb_noid')); + } } diff --git a/tests/dbal/migrator_tool_config_test.php b/tests/dbal/migrator_tool_config_test.php index 13e0c13e3ce..853b33b1179 100644 --- a/tests/dbal/migrator_tool_config_test.php +++ b/tests/dbal/migrator_tool_config_test.php @@ -13,7 +13,13 @@ class phpbb_dbal_migrator_tool_config_test extends phpbb_test_case { - public function setup() + /** @var \phpbb\config\config */ + protected $config; + + /** @var \phpbb\db\migration\tool\tool_interface */ + protected $tool; + + protected function setUp(): void { $this->config = new \phpbb\config\config(array()); diff --git a/tests/dbal/migrator_tool_config_text_test.php b/tests/dbal/migrator_tool_config_text_test.php index b271c2d62ec..d680b963d72 100644 --- a/tests/dbal/migrator_tool_config_text_test.php +++ b/tests/dbal/migrator_tool_config_text_test.php @@ -13,14 +13,18 @@ class phpbb_dbal_migrator_tool_config_text_test extends phpbb_database_test_case { + protected $db; + protected $config_text; + protected $tool; + public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_config_text.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/migrator_config_text.xml'); } - public function setup() + protected function setUp(): void { - parent::setup(); + parent::setUp(); $this->db = $this->new_dbal(); $this->config_text = new \phpbb\config\db_text($this->db, 'phpbb_config_text'); diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php index 43c93630a6d..db63394b945 100644 --- a/tests/dbal/migrator_tool_module_test.php +++ b/tests/dbal/migrator_tool_module_test.php @@ -11,41 +11,52 @@ * */ +require_once __DIR__ . '/ext/foo/bar/acp/acp_test_info.php'; +require_once __DIR__ . '/ext/foo/bar/ucp/ucp_test_info.php'; + class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case { + protected $db; + protected $cache; + protected $user; + protected $tool; + public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_module.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/migrator_module.xml'); } - public function setup() + protected function setUp(): void { // Need global $db, $user for delete_module function in acp_modules global $phpbb_root_path, $phpEx, $skip_add_log, $db, $user, $phpbb_log; - parent::setup(); + parent::setUp(); // Disable the logs $skip_add_log = true; $db = $this->db = $this->new_dbal(); - $this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\dummy(), new \phpbb\config\config(array()), $this->db, $phpbb_root_path, $phpEx); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\dummy(), new \phpbb\config\config(array()), $this->db, $phpbb_dispatcher, $phpbb_root_path, $phpEx); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = $this->user = new \phpbb\user($lang, '\phpbb\datetime'); $cache = new phpbb_mock_cache; - $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $auth = $this->createMock('\phpbb\auth\auth'); $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + // Correctly set the root path for this test to this directory, so the classes can be found + $phpbb_root_path = __DIR__ . '/'; + $phpbb_extension_manager = new phpbb_mock_extension_manager($phpbb_root_path); $module_manager = new \phpbb\module\module_manager($cache, $this->db, $phpbb_extension_manager, MODULES_TABLE, $phpbb_root_path, $phpEx); - $this->tool = new \phpbb\db\migration\tool\module($this->db, $this->cache, $this->user, $module_manager, $phpbb_root_path, $phpEx, 'phpbb_modules'); + $this->tool = new \phpbb\db\migration\tool\module($this->db, $this->user, $module_manager, 'phpbb_modules'); } - public function exists_data_acp() + public static function exists_data_acp() { return array( // Test the existing category @@ -178,7 +189,7 @@ public function test_exists_acp($parent, $module, $lazy, $expected) $this->assertEquals($expected, $this->tool->exists('acp', $parent, $module, $lazy)); } - public function exists_data_ucp() + public static function exists_data_ucp() { return array( // Test the existing category @@ -403,6 +414,35 @@ public function test_add() $this->fail($e); } $this->assertEquals(true, $this->tool->exists('ucp', 'UCP_NEW_SUBCAT', 'UCP_NEW_MODULE')); + + // Test adding new UCP module the automatic way, single mode + try + { + $this->tool->add('ucp', 'UCP_NEW_CAT', array( + 'module_basename' => '\foo\bar\ucp\ucp_test_module', + 'modes' => array('mode_1'), + )); + } + catch (Exception $e) + { + $this->fail($e); + } + $this->assertEquals(true, $this->tool->exists('ucp', 'UCP_NEW_CAT', 'UCP_NEW_MODULE_MODE_1')); + $this->assertEquals(false, $this->tool->exists('ucp', 'UCP_NEW_CAT', 'UCP_NEW_MODULE_MODE_2')); + + // Test adding new ACP module the automatic way, all modes + try + { + $this->tool->add('acp', 'ACP_NEW_CAT', array( + 'module_basename' => '\foo\bar\acp\acp_test_module', + )); + } + catch (Exception $e) + { + $this->fail($e); + } + $this->assertEquals(true, $this->tool->exists('acp', 'ACP_NEW_CAT', 'ACP_NEW_MODULE_MODE_1')); + $this->assertEquals(true, $this->tool->exists('acp', 'ACP_NEW_CAT', 'ACP_NEW_MODULE_MODE_2')); } public function test_remove() diff --git a/tests/dbal/migrator_tool_permission_role_test.php b/tests/dbal/migrator_tool_permission_role_test.php new file mode 100644 index 00000000000..3bebfe238d3 --- /dev/null +++ b/tests/dbal/migrator_tool_permission_role_test.php @@ -0,0 +1,239 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +class phpbb_dbal_migrator_tool_permission_role_test extends phpbb_database_test_case +{ + /** @var \phpbb\auth\auth */ + protected $auth; + + /** @var \includes\acp\auth\auth_admin */ + protected $auth_admin; + + /** @var \phpbb\db\migration\tool\permission */ + protected $tool; + + /** @var \phpbb\db\driver\driver_interface */ + protected $db; + + /** @var \phpbb\cache\service */ + protected $cache; + + public $group_ids = [ + 'REGISTERED' => 2, + 'GLOBAL_MODERATORS' => 4, + 'ADMINISTRATORS' => 5, + ]; + + public $role_ids = [ + 'ROLE_ADMIN_STANDARD' => 1, + 'ROLE_USER_FULL' => 5, + 'ROLE_MOD_FULL' => 10, + ]; + + public $new_roles = [ + [ + 'ROLE_ADMIN_NEW', + 'a_', + 'A new admin role', + 'a_new', + ], + [ + 'ROLE_MODERATOR_NEW', + 'm_', + 'A new mod role', + 'm_new', + ], + [ + 'ROLE_USER_NEW', + 'u_', + 'A new user role', + 'u_new', + ], + ]; + + public $new_role_ids = []; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__.'/fixtures/migrator_permission.xml'); + } + + protected function setUp(): void + { + // Global $db and $cache are needed in acp/auth.php constructor + global $phpbb_root_path, $phpEx, $db, $cache; + + parent::setup(); + + $db = $this->db = $this->new_dbal(); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $cache = $this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\dummy(), new \phpbb\config\config(array()), $this->db, $phpbb_dispatcher, $phpbb_root_path, $phpEx); + $this->auth = new \phpbb\auth\auth(); + + // Initialize this auth_admin instance later after adding new auth options via this->tool->add() + if (!class_exists('auth_admin')) + { + include($phpbb_root_path . 'includes/acp/auth.' . $phpEx); + } + + $this->tool = new \phpbb\db\migration\tool\permission($this->db, $this->cache, $this->auth, $phpbb_root_path, $phpEx); + + $this->new_roles_add(); + } + + public function new_roles_add() + { + foreach ($this->new_roles as $new_role_data) + { + $role_name = $new_role_data[0]; + $role_type = $new_role_data[1]; + $role_description = $new_role_data[2]; + $role_auth_option = $new_role_data[3]; + + $this->tool->add($role_auth_option); + $this->new_role_ids[$role_name] = $this->tool->role_add($role_name, $role_type, $role_description); + } + + // Initialize external auth_admin instance here to keep acl_options array in sync with the one from the permission tool + $this->auth_admin = new \auth_admin(); + } + + public static function data_test_new_role_exists() + { + return [ + ['ROLE_ADMIN_NEW', true], + ['ROLE_MODERATOR_NEW', true], + ['ROLE_USER_NEW', true], + ]; + } + + /** + * @dataProvider data_test_new_role_exists + */ + public function test_permission_new_role_exists($role_name, $expected) + { + $this->assertEquals($expected, (bool) $this->tool->role_exists($role_name)); + } + + public static function data_test_permission_assign_new_roles() + { + return [ + [ + 'group', + 0, + 'ADMINISTRATORS', + ['a_new' => true], + 'ROLE_ADMIN_NEW', + ], + [ + 'group', + 0, + 'GLOBAL_MODERATORS', + ['m_new' => true], + 'ROLE_MODERATOR_NEW', + ], + [ + 'group', + 0, + 'REGISTERED', + ['u_new' => true], + 'ROLE_USER_NEW', + ], + ]; + } + + /** + * @dataProvider data_test_permission_assign_new_roles + */ + public function test_permission_assign_new_roles($ug_type, $forum_id, $group_name, $auth, $role_name, $clear_prefetch = true) + { + $auth_option = key($auth); + $group_id = (int) $this->group_ids[$group_name]; + $role_id = (int) $this->new_role_ids[$role_name]; + $expected = current($auth); + + // Set auth options for each role + $this->tool->permission_set($role_name, $auth_option, 'role', true); + + // Assign roles to groups + $this->auth_admin->acl_set($ug_type, $forum_id, $group_id, $auth, $role_id, $clear_prefetch); + + // Test if role based group permissions assigned correctly + $new_perm_state = $this->auth->acl_group_raw_data($group_id, $auth_option); + $this->assertEquals($expected, !empty($new_perm_state), "$auth_option is " . ($expected ? 'empty' : 'not empty') . " for $group_name"); + } + + /** + * @dataProvider data_test_permission_assign_new_roles + * @depends test_permission_new_role_exists + * @depends test_permission_assign_new_roles + */ + public function test_permission_new_role_remove($ug_type, $forum_id, $group_name, $auth, $role_name) + { + $auth_option = key($auth); + $group_id = (int) $this->group_ids[$group_name]; + $role_id = (int) $this->new_role_ids[$role_name]; + + $sql = 'SELECT agt.auth_role_id + FROM ' . ACL_GROUPS_TABLE . ' agt, ' . ACL_ROLES_TABLE . ' art + WHERE agt.auth_role_id = art.role_id + AND art.role_id = ' . $role_id; + + // Set auth options for each role + $this->tool->permission_set($role_name, $auth_option, 'role', true); + + // Assign roles to groups + $this->auth_admin->acl_set($ug_type, $forum_id, $group_id, $auth, $role_id); + + // Check if the role is assigned to the group + $result = $this->db->sql_query($sql); + $this->assertEquals($role_id, $this->db->sql_fetchfield('auth_role_id')); + $this->db->sql_freeresult($result); + + $this->tool->role_remove($role_name); + $this->assertFalse((bool) $this->tool->role_exists($role_name)); + + // Check if the role is unassigned + $result = $this->db->sql_query($sql); + $this->assertFalse($this->db->sql_fetchfield('auth_role_id')); + $this->db->sql_freeresult($result); + } + + public function test_copied_permission_set() + { + $sql = 'SELECT rdt.auth_setting + FROM ' . ACL_OPTIONS_TABLE. ' ot, ' . ACL_ROLES_DATA_TABLE . ' rdt + WHERE rdt.role_id = ' . $this->role_ids['ROLE_ADMIN_STANDARD'] . " + AND auth_option = 'u_copied_permission' + AND ot.auth_option_id = rdt.auth_option_id"; + + // Add new local 'u_copied_permission' copied from 'u_test' + // It should be added to the ROLE_ADMIN_STANDARD role automatically similar to 'u_test' permission + $this->tool->add('u_copied_permission', false, 'u_test'); + $this->assertEquals(true, $this->tool->exists('u_copied_permission', false)); + + // Copied permission setting should be equal to what it was copied from + $result = $this->db->sql_query($sql); + $this->assertEquals(0, $this->db->sql_fetchfield('auth_setting')); + $this->db->sql_freeresult($result); + + // Set new permission for copied auth option for the role + $this->tool->permission_set('ROLE_ADMIN_STANDARD', 'u_copied_permission', 'role', true); + + // Copied permission setting should be updated + $result = $this->db->sql_query($sql); + $this->assertEquals(1, $this->db->sql_fetchfield('auth_setting')); + $this->db->sql_freeresult($result); + } + +} diff --git a/tests/dbal/migrator_tool_permission_test.php b/tests/dbal/migrator_tool_permission_test.php index d84f6a68ff4..c4e74f23d47 100644 --- a/tests/dbal/migrator_tool_permission_test.php +++ b/tests/dbal/migrator_tool_permission_test.php @@ -13,6 +13,18 @@ class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case { + /** @var \phpbb\auth\auth */ + protected $auth; + + /** @var \phpbb\db\driver\driver_interface */ + protected $db; + + /** @var \phpbb\cache\service */ + protected $cache; + + /** @var \phpbb\db\migration\tool\permission */ + protected $tool; + public $group_ids = array( 'REGISTERED' => 2, 'GLOBAL_MODERATORS' => 4, @@ -21,24 +33,25 @@ class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_permission.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/migrator_permission.xml'); } - public function setup() + protected function setUp(): void { // Global $db and $cache are needed in acp/auth.php constructor global $phpbb_root_path, $phpEx, $db, $cache; - parent::setup(); + parent::setUp(); $db = $this->db = $this->new_dbal(); - $cache = $this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\dummy(), new \phpbb\config\config(array()), $this->db, $phpbb_root_path, $phpEx); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $cache = $this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\dummy(), new \phpbb\config\config(array()), $this->db, $phpbb_dispatcher, $phpbb_root_path, $phpEx); $this->auth = new \phpbb\auth\auth(); $this->tool = new \phpbb\db\migration\tool\permission($this->db, $this->cache, $this->auth, $phpbb_root_path, $phpEx); } - public function exists_data() + public static function exists_data() { return array( array( @@ -163,7 +176,7 @@ public function test_reverse() $this->assertFalse($this->tool->exists('global_test', true)); } - public function test_permission_set_data() + public static function data_test_permission_set() { return array( array( @@ -188,7 +201,7 @@ public function test_permission_set_data() } /** - * @dataProvider test_permission_set_data + * @dataProvider data_test_permission_set */ public function test_permission_set($group_name, $auth_option, $type, $has_permission) { @@ -218,4 +231,22 @@ public function test_permission_set($group_name, $auth_option, $type, $has_permi break; } } + + public static function data_test_permission_role_exists() + { + return array( + array('ROLE_MOD_FULL', true), + array('ROLE_USER_FULL', true), + array('ROLE_ADMIN_STANDARD', true), + array('ROLE_DOES_NOT_EXIST', false), + ); + } + + /** + * @dataProvider data_test_permission_role_exists + */ + public function test_permission_role_exists($role_name, $expected) + { + $this->assertEquals($expected, $this->tool->role_exists($role_name)); + } } diff --git a/tests/dbal/order_lower_test.php b/tests/dbal/order_lower_test.php index b101d28c7dd..472ca1b84ff 100644 --- a/tests/dbal/order_lower_test.php +++ b/tests/dbal/order_lower_test.php @@ -15,7 +15,7 @@ class phpbb_dbal_order_lower_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/styles.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/styles.xml'); } public function test_order_lower() diff --git a/tests/dbal/schema_test.php b/tests/dbal/schema_test.php index 59965655ad1..6b418a70a59 100644 --- a/tests/dbal/schema_test.php +++ b/tests/dbal/schema_test.php @@ -15,7 +15,7 @@ class phpbb_dbal_schema_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml'); } public function test_config_value_multibyte() @@ -26,7 +26,7 @@ public function test_config_value_multibyte() $sql = "INSERT INTO phpbb_config (config_name, config_value) VALUES ('name', '$value')"; - $result = $db->sql_query($sql); + $db->sql_query($sql); $sql = "SELECT config_value FROM phpbb_config diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php index 0dac66fc463..2318a549116 100644 --- a/tests/dbal/select_test.php +++ b/tests/dbal/select_test.php @@ -15,10 +15,10 @@ class phpbb_dbal_select_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/three_users.xml'); } - public function return_on_error_select_data() + public static function return_on_error_select_data() { return array( array('phpbb_users', "username_clean = 'bertie'", array(array('username_clean' => 'bertie'))), @@ -45,7 +45,7 @@ public function test_return_on_error_select($table, $where, $expected) $this->assertEquals($expected, $db->sql_fetchrowset($result)); } - public function fetchrow_data() + public static function fetchrow_data() { return array( array('', array(array('username_clean' => 'barfoo'), @@ -96,7 +96,7 @@ public function test_fetchrowset($where, $expected) $db->sql_freeresult($result); } - public function fetchfield_data() + public static function fetchfield_data() { return array( array('', array('barfoo', 'foobar', 'bertie')), @@ -126,7 +126,7 @@ public function test_fetchfield($where, $expected) $this->assertEquals($expected, $ary); } - static public function fetchfield_seek_data() + public static function fetchfield_seek_data() { return array( array(1, 'foobar'), @@ -152,7 +152,7 @@ public function test_fetchfield_seek($rownum, $expected) $this->assertEquals($expected, $field); } - static public function query_limit_data() + public static function query_limit_data() { return array( array(0, 0, array(array('username_clean' => 'barfoo'), @@ -193,7 +193,7 @@ public function test_query_limit($total, $offset, $expected) $this->assertEquals($expected, $ary); } - public function like_expression_data() + public static function like_expression_data() { // * = any_char; # = one_char return array( @@ -230,7 +230,7 @@ public function test_like_expression($like_expression, $expected) $db->sql_freeresult($result); } - public function not_like_expression_data() + public static function not_like_expression_data() { // * = any_char; # = one_char return array( @@ -290,7 +290,7 @@ public function test_not_like_expression($like_expression, $expected) $db->sql_freeresult($result); } - public function in_set_data() + public static function in_set_data() { return array( array('user_id', 3, false, false, array(array('username_clean' => 'bertie'))), @@ -364,7 +364,7 @@ public function test_in_set($field, $array, $negate, $allow_empty_set, $expected $db->sql_freeresult($result); } - public function build_array_data() + public static function build_array_data() { return array( array(array('username_clean' => 'barfoo'), array(array('username_clean' => 'barfoo'))), diff --git a/tests/dbal/sql_affected_rows_test.php b/tests/dbal/sql_affected_rows_test.php index 07d73183584..e957f2c3963 100644 --- a/tests/dbal/sql_affected_rows_test.php +++ b/tests/dbal/sql_affected_rows_test.php @@ -16,7 +16,7 @@ class phpbb_dbal_sql_affected_rows_test extends phpbb_database_test_case /** @var \phpbb\db\driver\driver_interface */ protected $db; - public function setUp() + protected function setUp(): void { parent::setUp(); $this->db = $this->new_dbal(); @@ -24,7 +24,7 @@ public function setUp() public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); } public function test_update() diff --git a/tests/dbal/sql_insert_buffer_test.php b/tests/dbal/sql_insert_buffer_test.php index eae0abceba4..c1ab9ce05b6 100644 --- a/tests/dbal/sql_insert_buffer_test.php +++ b/tests/dbal/sql_insert_buffer_test.php @@ -16,7 +16,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case protected $db; protected $buffer; - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -27,7 +27,7 @@ public function setUp() public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); } public function test_multi_insert_disabled_insert_and_flush() diff --git a/tests/dbal/write_sequence_test.php b/tests/dbal/write_sequence_test.php index a2d59217972..d3f170eaba4 100644 --- a/tests/dbal/write_sequence_test.php +++ b/tests/dbal/write_sequence_test.php @@ -15,7 +15,7 @@ class phpbb_dbal_write_sequence_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/three_users.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/three_users.xml'); } static public function write_sequence_data() diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php index 4fa5cc37a29..79fbffd1dc8 100644 --- a/tests/dbal/write_test.php +++ b/tests/dbal/write_test.php @@ -15,10 +15,10 @@ class phpbb_dbal_write_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml'); } - public function build_array_insert_data() + public static function build_array_insert_data() { return array( array(array( @@ -73,6 +73,67 @@ public function test_delete() $db->sql_freeresult($result); } + public function test_delete_rollback() + { + $db = $this->new_dbal(); + + $is_myisam = false; + if ($db->get_sql_layer() === 'mysqli') + { + $table_status = $db->get_table_status('phpbb_config'); + $is_myisam = isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM'; + } + + $db->sql_transaction('begin'); + + $sql = "DELETE FROM phpbb_config + WHERE config_name = 'config1'"; + $db->sql_query($sql); + + // Rollback and check that nothing was changed + $db->sql_transaction('rollback'); + + $sql = 'SELECT * + FROM phpbb_config'; + $result = $db->sql_query($sql); + $rows = $db->sql_fetchrowset($result); + $db->sql_freeresult($result); + + if (!$is_myisam) + { + $this->assertEquals(2, count($rows)); + $this->assertEquals('config1', $rows[0]['config_name']); + } + else + { + // Rollback does not work on MyISAM + $this->assertEquals(1, count($rows)); + $this->assertEquals('config2', $rows[0]['config_name']); + + // Restore deleted config value on MyISAM + $sql = "INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('config1', 'foo', 0)"; + $db->sql_query($sql); + } + + $db->sql_transaction('begin'); + + $sql = "DELETE FROM phpbb_config + WHERE config_name = 'config1'"; + $db->sql_query($sql); + + // Commit and check that data was actually changed + $db->sql_transaction('commit'); + + $sql = 'SELECT * + FROM phpbb_config'; + $result = $db->sql_query($sql); + $rows = $db->sql_fetchrowset($result); + $db->sql_freeresult($result); + + $this->assertEquals(1, count($rows)); + $this->assertEquals('config2', $rows[0]['config_name']); + } + public function test_multiple_insert() { $db = $this->new_dbal(); @@ -106,7 +167,7 @@ public function test_multiple_insert() $db->sql_freeresult($result); } - public function update_data() + public static function update_data() { return array( array( diff --git a/tests/di/container_cache_directory_test.php b/tests/di/container_cache_directory_test.php new file mode 100644 index 00000000000..75ca88584a0 --- /dev/null +++ b/tests/di/container_cache_directory_test.php @@ -0,0 +1,125 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace +{ + class container_cache_directory_test extends \phpbb_test_case //phpbb_di_container_test + { + protected $config_php; + + /** + * @var \phpbb\di\container_builder + */ + protected $builder; + protected $phpbb_root_path; + protected $filename; + + public function setUp(): void + { + $this->phpbb_root_path = __DIR__ . '/'; + $this->config_php = new \phpbb\config_php_file($this->phpbb_root_path . 'fixtures/', 'php'); + + $this->filename = $this->phpbb_root_path . '../tmp/container.php'; + if (is_file($this->filename)) + { + unlink($this->filename); + } + + parent::setUp(); + } + + public function test_cache_directory_can_be_overridden() + { + $new_cache_directory = $this->phpbb_root_path . 'fixtures/overwrite-cache-directory/test/'; + + // This is how one overrides the cache directory. + // The file cache driver will now write to a new directory. + $_SERVER['PHPBB____core__cache_dir'] = $new_cache_directory; + + $this->builder = new phpbb_mock_phpbb_di_container_builder($this->phpbb_root_path . 'fixtures/', 'php'); + $this->builder->with_config($this->config_php); + $container = $this->builder->get_container(); + + $this->assertEquals($container->getParameter('core.cache_dir'), $new_cache_directory); + } + + /** + * By default autoload_xxx.php and container_xxx.php files + * will also be written to the default cache directory. + * This test demonstrates the default behavior. + */ + public function test_container_and_autoload_cache() + { + $default_cache_directory = $this->phpbb_root_path . 'fixtures/cache/test/'; + + // Make sure our test directory will be empty. + if (is_dir($default_cache_directory)) + { + array_map('unlink', glob($default_cache_directory . '/*')); + } + else + { + mkdir($default_cache_directory, 0777, true); + } + + // Use the normal container_builder + $builder = new \phpbb\di\container_builder($this->phpbb_root_path . 'fixtures/', 'php'); + $builder->with_config($this->config_php); + + $container = $builder->get_container(); + + $files_written_to_cache = array_map('basename', glob($default_cache_directory . '/*')); + + $this->assertNotEmpty(preg_grep('/autoload_.+.php/', $files_written_to_cache), 'There should be an autoload file in the cache directory.'); + $this->assertNotEmpty(preg_grep('/container_.+.php/', $files_written_to_cache), 'There should be an container file in the cache directory.'); + + // Cleanup the cache directory to prevent class redeclaration errors. + array_map('unlink', glob($default_cache_directory . '/*')); + } + + /** + * The desired behavior: When we have a custom cache directory + * the autoload and container cache files are also written to the custom cache directory. + */ + public function test_autoload_and_container_cache_are_written_to_overriden_cache_directory() + { + $new_cache_directory = $this->phpbb_root_path . 'fixtures/overwrite-cache-directory/test/'; + + $_SERVER['PHPBB____core__cache_dir'] = $new_cache_directory; + + // Make sure our test directory will be empty. + if (is_dir($new_cache_directory)) + { + array_map('unlink', glob($new_cache_directory . '/*')); + } + else + { + mkdir($new_cache_directory, 0777, true); + } + + // Use the normal container_builder + $builder = new \phpbb\di\container_builder($this->phpbb_root_path . 'fixtures/', 'php'); + $builder->with_config($this->config_php); + + $container = $builder->get_container(); + + $files_written_to_cache = array_map('basename', glob($new_cache_directory."/*")); + + $this->assertNotEmpty(preg_grep('/autoload_.+.php/', $files_written_to_cache), 'There should be an autoload file in the cache directory.'); + $this->assertNotEmpty(preg_grep('/container_.+.php/', $files_written_to_cache), 'There should be an container file in the cache directory.'); + + array_map('unlink', glob($new_cache_directory . '/*')); + + } + } +} diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php index 1fd2cbd7eee..36ff57a43df 100644 --- a/tests/di/create_container_test.php +++ b/tests/di/create_container_test.php @@ -13,9 +13,9 @@ namespace { - require_once dirname(__FILE__) . '/fixtures/ext/vendor/enabled_4/di/extension.php'; + require_once __DIR__ . '/fixtures/ext/vendor/enabled_4/di/extension.php'; - class phpbb_di_container_test extends \phpbb_test_case + class phpbb_di_create_container_test extends \phpbb_test_case { protected $config_php; @@ -26,9 +26,9 @@ class phpbb_di_container_test extends \phpbb_test_case protected $phpbb_root_path; protected $filename; - public function setUp() + protected function setUp(): void { - $this->phpbb_root_path = dirname(__FILE__) . '/'; + $this->phpbb_root_path = __DIR__ . '/'; $this->config_php = new \phpbb\config_php_file($this->phpbb_root_path . 'fixtures/', 'php'); $this->builder = new phpbb_mock_phpbb_di_container_builder($this->phpbb_root_path . 'fixtures/', 'php'); $this->builder->with_config($this->config_php); @@ -52,7 +52,7 @@ public function test_default_container() $this->assertTrue($container->hasParameter('core')); // Checks compile_container - $this->assertTrue($container->isFrozen()); + $this->assertTrue($container->isCompiled()); // Checks inject_config $this->assertTrue($container->hasParameter('core.table_prefix')); @@ -73,8 +73,21 @@ public function test_default_container() // Checks the construction of a dumped container $container = $this->builder->get_container(); - $this->assertInstanceOf('phpbb_cache_container', $container); - $this->assertTrue($container->isFrozen()); + $this->assertEquals('phpbb_cache_container', $container::class); + $this->assertInstanceOf('Symfony\Component\DependencyInjection\Container', $container); + $this->assertTrue($container->isCompiled()); + } + + public function test_tables_mapping() + { + $this->builder->without_cache(); + $container = $this->builder->get_container(); + $this->assertTrue($container->hasParameter('tables')); + $tables = $container->getParameter('tables'); + $this->assertGreaterThan(0, count($tables)); + $this->assertTrue($container->hasParameter('tables.foo_bar')); + $this->assertTrue(isset($tables['foo_bar'])); + $this->assertEquals($tables['acl_groups'], 'phpbb_some_other'); } public function test_without_cache() @@ -88,9 +101,10 @@ public function test_without_cache() // Checks the construction of a dumped container $container = $this->builder->get_container(); - $this->assertNotInstanceOf('phpbb_cache_container', $container); + $this->assertNotEquals('phpbb_cache_container', $container::class); + $this->assertEquals('Symfony\Component\DependencyInjection\ContainerBuilder', $container::class); $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); - $this->assertTrue($container->isFrozen()); + $this->assertTrue($container->isCompiled()); } public function test_without_extensions() @@ -115,7 +129,7 @@ public function test_without_compiled_container() $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); // Checks compile_container - $this->assertFalse($container->isFrozen()); + $this->assertFalse($container->isCompiled()); } public function test_with_config_path() @@ -150,10 +164,10 @@ public function __construct() public function all_enabled($phpbb_relative = true) { return array( - 'vendor/enabled' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled/', - 'vendor/enabled-2' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled-2/', - 'vendor/enabled-3' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled-3/', - 'vendor/enabled_4' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled_4/', + 'vendor/enabled' => __DIR__ . '/fixtures/ext/vendor/enabled/', + 'vendor/enabled-2' => __DIR__ . '/fixtures/ext/vendor/enabled-2/', + 'vendor/enabled-3' => __DIR__ . '/fixtures/ext/vendor/enabled-3/', + 'vendor/enabled_4' => __DIR__ . '/fixtures/ext/vendor/enabled_4/', ); } } diff --git a/tests/di/fixtures/config.php b/tests/di/fixtures/config.php index 1e9207d924d..956001ef589 100644 --- a/tests/di/fixtures/config.php +++ b/tests/di/fixtures/config.php @@ -1,7 +1,7 @@ set('foo', new StdClass); diff --git a/tests/di/service_collection_test.php b/tests/di/service_collection_test.php index 5815b4367d6..7fc3e94e418 100644 --- a/tests/di/service_collection_test.php +++ b/tests/di/service_collection_test.php @@ -18,7 +18,7 @@ class phpbb_service_collection_test extends \phpbb_test_case */ protected $service_collection; - public function setUp() + protected function setUp(): void { $container = new phpbb_mock_container_builder(); $container->set('foo', new StdClass); @@ -56,14 +56,16 @@ public function test_get_by_class() public function test_get_by_class_many_services_exception() { - $this->setExpectedException('RuntimeException', 'More than one service definitions found for class "bar_class" in collection.'); + $this->expectException('RuntimeException'); + $this->expectExceptionMessage('DI_MULTIPLE_SERVICE_DEFINITIONS'); $this->service_collection->get_by_class('bar_class'); } public function test_get_by_class_no_service_exception() { - $this->setExpectedException('RuntimeException', 'No service found for class "baz_class" in collection.'); + $this->expectException('RuntimeException'); + $this->expectExceptionMessage('DI_SERVICE_NOT_FOUND'); $this->service_collection->get_by_class('baz_class'); } diff --git a/tests/diff/diff_files_test.php b/tests/diff/diff_files_test.php new file mode 100644 index 00000000000..b7e3a47ca08 --- /dev/null +++ b/tests/diff/diff_files_test.php @@ -0,0 +1,129 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +include_once(__DIR__ . '/../../phpBB/includes/diff/diff.php'); +include_once(__DIR__ . '/../../phpBB/includes/diff/engine.php'); + +class diff_files_test extends phpbb_test_case +{ + /** + * @var string + */ + protected $filename; + + /** + * @var phpbb_mock_container_builder + */ + protected $old_path; + + /** + * @var \phpbb\install\helper\config + */ + protected $new_path; + + /** + * @var string + */ + protected $path; + + /** + * @var array + */ + protected $update_files = []; + + protected function setUp(): void + { + $this->filename = 'test_files_diff.php'; + $this->path = __DIR__ . '/fixtures/'; + $this->old_path = $this->path . 'install/update/old/'; + $this->new_path = $this->path . 'install/update/new/'; + $this->update_files = [ + $this->filename, + ]; + } + + public function test_diff_files() + { + foreach ($this->update_files as $key => $filename) + { + $merge_conflicts = $file_contents = []; + + $file_to_diff = $this->old_path . $filename; + $file_contents[0] = file_get_contents($file_to_diff); + $this->assertNotFalse($file_contents[0], "File $file_to_diff is empty"); + + $filenames = [ + $this->path . $filename, + $this->new_path . $filename + ]; + + foreach ($filenames as $file_to_diff) + { + $file_contents[] = file_get_contents($file_to_diff); + $this->assertNotFalse($file_contents[count($file_contents) - 1], "File $file_to_diff is empty"); + } + + $diff = new \diff3($file_contents[0], $file_contents[1], $file_contents[2]); + + $file_is_merged = $diff->merged_output() === $file_contents[1]; + + // Handle conflicts + if ($diff->get_num_conflicts() !== 0) + { + // Check if current file content is merge of new or original file + $tmp = [ + 'file1' => $file_contents[1], + 'file2' => implode("\n", $diff->merged_new_output()), + ]; + + $diff2 = new \diff($tmp['file1'], $tmp['file2']); + $empty = $diff2->is_empty(); + + if (!$empty) + { + unset($tmp, $diff2); + + // We check if the user merged with his output + $tmp = [ + 'file1' => $file_contents[1], + 'file2' => implode("\n", $diff->merged_orig_output()), + ]; + + $diff2 = new \diff($tmp['file1'], $tmp['file2']); + $empty = $diff2->is_empty(); + } + + unset($diff2); + + if (!$empty && in_array($filename, $merge_conflicts)) + { + $merge_conflicts[] = $filename; + } + else + { + $file_is_merged = true; + } + } + + if ($file_is_merged) + { + unset($this->update_files[$key]); + } + + unset($file_contents); + unset($diff); + } + + $this->assertEquals([], $this->update_files); + } +} diff --git a/tests/diff/fixtures/install/update/new/test_files_diff.php b/tests/diff/fixtures/install/update/new/test_files_diff.php new file mode 100644 index 00000000000..6daabbe92e8 --- /dev/null +++ b/tests/diff/fixtures/install/update/new/test_files_diff.php @@ -0,0 +1,3 @@ + -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_download.php'; - -class phpbb_download_http_byte_range_test extends phpbb_test_case -{ - public function test_find_range_request() - { - // Missing 'bytes=' prefix - $GLOBALS['request'] = new phpbb_mock_request(); - $GLOBALS['request']->set_header('Range', 'bztes='); - $this->assertEquals(false, phpbb_find_range_request()); - unset($GLOBALS['request']); - - $GLOBALS['request'] = new phpbb_mock_request(); - $_ENV['HTTP_RANGE'] = 'bztes='; - $this->assertEquals(false, phpbb_find_range_request()); - unset($_ENV['HTTP_RANGE']); - - $GLOBALS['request'] = new phpbb_mock_request(); - $GLOBALS['request']->set_header('Range', 'bytes=0-0,123-125'); - $this->assertEquals(array('0-0', '123-125'), phpbb_find_range_request()); - unset($GLOBALS['request']); - } - - /** - * @dataProvider parse_range_request_data() - */ - public function test_parse_range_request($request_array, $filesize, $expected) - { - $this->assertEquals($expected, phpbb_parse_range_request($request_array, $filesize)); - } - - public function parse_range_request_data() - { - return array( - // Valid request - array( - array('3-4'), - 10, - array( - 'byte_pos_start' => 3, - 'byte_pos_end' => 4, - 'bytes_requested' => 2, - 'bytes_total' => 10, - ), - ), - - // Get the beginning - array( - array('-5'), - 10, - array( - 'byte_pos_start' => 0, - 'byte_pos_end' => 5, - 'bytes_requested' => 6, - 'bytes_total' => 10, - ), - ), - - // Get the end - array( - array('5-'), - 10, - array( - 'byte_pos_start' => 5, - 'byte_pos_end' => 9, - 'bytes_requested' => 5, - 'bytes_total' => 10, - ), - ), - - // Overlong request - array( - array('3-20'), - 10, - array( - 'byte_pos_start' => 3, - 'byte_pos_end' => 9, - 'bytes_requested' => 7, - 'bytes_total' => 10, - ), - ), - - // Multiple, contiguous range - array( - array('10-20', '21-30'), - 125, - array( - 'byte_pos_start' => 10, - 'byte_pos_end' => 30, - 'bytes_requested' => 21, - 'bytes_total' => 125, - ) - ), - - // We don't do multiple, non-contiguous range - array( - array('0-0', '120-125'), - 125, - false, - ), - ); - } -} diff --git a/tests/download/http_user_agent_test.php b/tests/download/http_user_agent_test.php deleted file mode 100644 index bfee265addc..00000000000 --- a/tests/download/http_user_agent_test.php +++ /dev/null @@ -1,134 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_download.php'; - -class phpbb_download_http_user_agent_test extends phpbb_test_case -{ - public function user_agents_check_greater_ie_version() - { - return array( - // user agent - // IE version - // expected - array( - 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)', - 7, - true, - ), - array( - 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)', - 7, - true, - ), - array( - 'Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; GTB7.4; InfoPath.2; SV1; .NET CLR 3.3.69573; WOW64; en-US)', - 7, - true, - ), - array( - 'Mozilla/5.0 (Windows; U; MSIE 7.0; Windows NT 6.0; en-US)', - 7, - false, - ), - array( - 'Mozilla/4.0 (compatible; MSIE 6.1; Windows XP; .NET CLR 1.1.4322; .NET CLR 2.0.50727)', - 7, - false, - ), - array( - 'Mozilla/4.0 (compatible; MSIE 6.01; Windows NT 6.0)', - 7, - false, - ), - array( - 'Mozilla/5.0 (Windows; U; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 2.0.50727)', - 7, - false, - ), - array( - 'Mozilla/5.0 (Windows NT 6.2; Win64; x64;) Gecko/20100101 Firefox/20.0', - 7, - false, - ), - array( - 'Mozilla/5.0 (Windows NT 6.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1464.0 Safari/537.36', - 7, - false, - ), - array( - 'Googlebot-Image/1.0', - 7, - false, - ), - array( - 'Googlebot/2.1 ( http://www.google.com/bot.html)', - 7, - false, - ), - array( - 'Lynx/2.8.3dev.9 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/0.9.6', - 7, - false, - ), - array( - 'Links (0.9x; Linux 2.4.7-10 i686)', - 7, - false, - ), - array( - 'Opera/9.60 (Windows NT 5.1; U; de) Presto/2.1.1', - 7, - false, - ), - array( - 'Mozilla/4.0 (compatible; MSIE 5.0; Windows NT;)', - 7, - false, - ), - array( - 'Mozilla/4.0 (compatible; MSIE 5.0; Windows NT 4.0) Opera 6.01 [en]', - 7, - false, - ), - array( - 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 9.24', - 7, - false, - ), - array( - 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)', - 8, - true, - ), - array( - 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)', - 9, - true, - ), - array( - 'Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; GTB7.4; InfoPath.2; SV1; .NET CLR 3.3.69573; WOW64; en-US)', - 10, - false, - ), - ); - } - - /** - * @dataProvider user_agents_check_greater_ie_version - */ - public function test_is_greater_ie_version($user_agent, $version, $expected) - { - $this->assertEquals($expected, phpbb_is_greater_ie_version($user_agent, $version)); - } -} diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php index 245c2c3a588..10447f363b8 100644 --- a/tests/email/email_parsing_test.php +++ b/tests/email/email_parsing_test.php @@ -19,7 +19,10 @@ class phpbb_email_parsing_test extends phpbb_test_case /** @var \ReflectionProperty */ protected $reflection_template_property; - public function setUp() + /** @var \phpbb\messenger\method\email */ + protected $email; + + protected function setUp(): void { global $phpbb_container, $config, $phpbb_root_path, $phpEx, $request, $user; @@ -52,9 +55,10 @@ public function setUp() $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); + $user->data['user_lang'] = 'en'; $phpbb_container->set('user', $user); $extension_manager = new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'vendor2/foo' => array( 'ext_name' => 'vendor2/foo', @@ -65,22 +69,20 @@ public function setUp() ); $phpbb_container->set('ext.manager', $extension_manager); - $context = new \phpbb\template\context(); - $twig_extension = new \phpbb\template\twig\extension($context, $lang); - $phpbb_container->set('template.twig.extensions.phpbb', $twig_extension); - - $twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); - $twig_extensions_collection->add('template.twig.extensions.phpbb'); - $phpbb_container->set('template.twig.extensions.collection', $twig_extensions_collection); + $assets_bag = new \phpbb\template\assets_bag(); + $phpbb_container->set('assets.bag', $assets_bag); + $context = new \phpbb\template\context(); + $dispatcher = new \phpbb\event\dispatcher(); $twig = new \phpbb\template\twig\environment( + $assets_bag, $config, $filesystem, $phpbb_path_helper, $cache_path, null, new \phpbb\template\twig\loader(''), - new \phpbb\event\dispatcher($phpbb_container), + $dispatcher, array( 'cache' => false, 'debug' => false, @@ -88,22 +90,65 @@ public function setUp() 'autoescape' => false, ) ); - $twig->addExtension($twig_extension); - $phpbb_container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig)); + $twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang); + $phpbb_container->set('template.twig.extensions.phpbb', $twig_extension); - if (!class_exists('messenger')) - { - include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - } + $twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); + $twig_extensions_collection->add('template.twig.extensions.phpbb'); + $phpbb_container->set('template.twig.extensions.collection', $twig_extensions_collection); - $this->messenger = new \messenger(); + $twig->addExtension($twig_extension); + $twig_lexer = new \phpbb\template\twig\lexer($twig); + $phpbb_container->set('template.twig.lexer', $twig_lexer); + $phpbb_container->set('dispatcher', $dispatcher); + $phpbb_container->set('language', $lang); + $phpbb_container->set('request', $request); + + $db = $this->getMockBuilder('\phpbb\db\driver\mysqli') + ->disableOriginalConstructor() + ->getMock(); + $auth = $this->createMock('\phpbb\auth\auth'); + $log = new \phpbb\log\log($db, $user, $auth, $dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $phpbb_container->set('log', $log); + $phpbb_container->setParameter('core.root_path', $phpbb_root_path); + $phpbb_container->setParameter('core.php_ext', $phpEx); + + $core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'; + $phpbb_container->setParameter('core.cache_dir', $core_cache_dir); + + $core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx; + $phpbb_container->setParameter('core.messenger_queue_file', $core_messenger_queue_file); + + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $messenger_method_collection->add('messenger.method.email'); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + + $messenger_queue = new \phpbb\messenger\queue($config, $dispatcher, $messenger_method_collection, $core_messenger_queue_file); + $phpbb_container->set('messenger.queue', $messenger_queue); + + $this->email = new \phpbb\messenger\method\email( + $assets_bag, + $config, + $dispatcher, + $lang, + $messenger_queue, + $phpbb_path_helper, + $request, + $twig_extensions_collection, + $twig_lexer, + $user, + $phpbb_root_path, + $cache_path, + $extension_manager, + $log + ); + $phpbb_container->set('messenger.method.email', $this->email); - $reflection = new ReflectionObject($this->messenger); + $reflection = new ReflectionObject($this->email); $this->reflection_template_property = $reflection->getProperty('template'); - $this->reflection_template_property->setAccessible(true); } - public function email_parsing_data() + public static function email_parsing_data() { return array( array('Author username', 'Any forum', 'The topic title', 'Dear user'), @@ -118,11 +163,11 @@ public function test_email_parsing($author_name, $forum_name, $topic_title, $use { global $config, $phpEx, $user; - $this->messenger->set_addresses($user->data); + $this->email->set_addresses($user->data); - $this->messenger->assign_vars(array( - 'EMAIL_SIG' => str_replace('
      ', "\n", "-- \n" . htmlspecialchars_decode($config['board_email_sig'])), - 'SITENAME' => htmlspecialchars_decode($config['sitename']), + $this->email->assign_vars(array( + 'EMAIL_SIG' => str_replace('
      ', "\n", "-- \n" . html_entity_decode($config['board_email_sig'], ENT_COMPAT)), + 'SITENAME' => html_entity_decode($config['sitename'], ENT_COMPAT), 'AUTHOR_NAME' => $author_name, 'FORUM_NAME' => $forum_name, @@ -132,18 +177,18 @@ public function test_email_parsing($author_name, $forum_name, $topic_title, $use 'U_FORUM' => generate_board_url() . "/viewforum.{$phpEx}?f=1", 'U_STOP_WATCHING_FORUM' => generate_board_url() . "/viewforum.{$phpEx}?uid=2&f=1&unwatch=forum", )); - $this->messenger->template('newtopic_notify', $user->data['user_lang'], '', ''); + $this->email->template('newtopic_notify', $user->data['user_lang'], '', ''); - $reflection_template = $this->reflection_template_property->getValue($this->messenger); + $reflection_template = $this->reflection_template_property->getValue($this->email); $msg = trim($reflection_template->assign_display('body')); - $this->assertContains($author_name, $msg); - $this->assertContains($forum_name, $msg); - $this->assertContains($topic_title, $msg); - $this->assertContains($username, $msg); - $this->assertContains(htmlspecialchars_decode($config['sitename']), $msg); - $this->assertContains(str_replace('
      ', "\n", "-- \n" . htmlspecialchars_decode($config['board_email_sig'])), $msg); - $this->assertNotContains('EMAIL_SIG', $msg); - $this->assertNotContains('U_STOP_WATCHING_FORUM', $msg); + $this->assertStringContainsString($author_name, $msg); + $this->assertStringContainsString($forum_name, $msg); + $this->assertStringContainsString($topic_title, $msg); + $this->assertStringContainsString($username, $msg); + $this->assertStringContainsString(html_entity_decode($config['sitename'], ENT_COMPAT), $msg); + $this->assertStringContainsString(str_replace('
      ', "\n", "-- \n" . html_entity_decode($config['board_email_sig'], ENT_COMPAT)), $msg); + $this->assertStringNotContainsString('EMAIL_SIG', $msg); + $this->assertStringNotContainsString('U_STOP_WATCHING_FORUM', $msg); } } diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php index 8ed89bbe52b..cb8984a3a1d 100644 --- a/tests/error_collector_test.php +++ b/tests/error_collector_test.php @@ -13,7 +13,7 @@ class phpbb_error_collector_test extends phpbb_test_case { - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -24,11 +24,12 @@ public function setUp() public function test_collection() { - $collector = new \phpbb\error_collector(E_ALL | E_STRICT); // php set_error_handler() default + $collector = new \phpbb\error_collector(E_ALL | E_NOTICE); // php set_error_handler() default $collector->install(); // Cause a warning - 1/0; $line = __LINE__; + // Division by zero was promoted to fatal error and throws DivisionByZeroError exception in PHP 8+ + version_compare(PHP_VERSION, '8', '>=') ? '1b'['0xFF'] : 1/0; $line = __LINE__; $collector->uninstall(); @@ -39,7 +40,7 @@ public function test_collection() // Unfortunately $error_contents will contain the full path here, // because the tests directory is outside of phpbb root path. - $this->assertStringStartsWith('Errno 2: Division by zero at ', $error_contents); + $this->assertStringStartsWith(version_compare(PHP_VERSION, '8', '>=') ? 'Errno 2: Illegal string offset "0xFF" at ' : 'Errno 2: Division by zero at ', $error_contents); $this->assertStringEndsWith(" line $line", $error_contents); } @@ -49,16 +50,18 @@ public function test_collection_with_mask() $collector->install(); // Cause a warning - 1/0; $line = __LINE__; + // Division by zero was promoted to fatal error and throws DivisionByZeroError exception in PHP 8+ + version_compare(PHP_VERSION, '8', '>=') ? '1b'['0xFF'] : 1/0; $line = __LINE__; - // Cause a notice - $array = array(0 => 'value'); - $value = $array[1]; $line2 = __LINE__; + // Cause a "Notice: date_default_timezone_set(): Timezone ID 'ThisTimeZoneDoesNotExist' is invalid" + // https://github.com/php/php-src/blob/880faa39e8c648bdc3aad7aeca170755c6557831/ext/date/php_date.c#L5205 + date_default_timezone_set('ThisTimeZoneDoesNotExist'); $line2 = __LINE__; $collector->uninstall(); // The notice should not be collected - $this->assertEmpty($collector->errors[1]); + $this->assertFalse(isset($collector->errors[1]), 'Notice should not be added to errors'); + $this->assertEquals(count($collector->errors), 1); list($errno, $msg_text, $errfile, $errline) = $collector->errors[0]; $error_contents = $collector->format_errors(); @@ -67,7 +70,7 @@ public function test_collection_with_mask() // Unfortunately $error_contents will contain the full path here, // because the tests directory is outside of phpbb root path. - $this->assertStringStartsWith('Errno 2: Division by zero at ', $error_contents); + $this->assertStringStartsWith(version_compare(PHP_VERSION, '8', '>=') ? 'Errno 2: Illegal string offset "0xFF" at ' : 'Errno 2: Division by zero at ', $error_contents); $this->assertStringEndsWith(" line $line", $error_contents); } } diff --git a/tests/event/dispatcher_test.php b/tests/event/dispatcher_test.php index da28d24daa4..deebfc657c0 100644 --- a/tests/event/dispatcher_test.php +++ b/tests/event/dispatcher_test.php @@ -15,7 +15,7 @@ class phpbb_event_dispatcher_test extends phpbb_test_case { public function test_trigger_event() { - $dispatcher = new \phpbb\event\dispatcher(new phpbb_mock_container_builder()); + $dispatcher = new \phpbb\event\dispatcher(); $dispatcher->addListener('core.test_event', function (\phpbb\event\data $event) { $event['foo'] = $event['foo'] . '2'; diff --git a/tests/event/exception_listener_test.php b/tests/event/exception_listener_test.php index fbae9e25b7f..b9526e9a5dc 100644 --- a/tests/event/exception_listener_test.php +++ b/tests/event/exception_listener_test.php @@ -11,9 +11,9 @@ * */ -class exception_listener extends phpbb_test_case +class exception_listener_test extends phpbb_test_case { - public function phpbb_exception_data() + public static function phpbb_exception_data() { return array( array( @@ -81,10 +81,11 @@ public function test_phpbb_exception($is_ajax, $exception, $expected) $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); + $user = new \phpbb\user($lang, '\phpbb\datetime'); - $exception_listener = new \phpbb\event\kernel_exception_subscriber($template, $lang); + $exception_listener = new \phpbb\event\kernel_exception_subscriber($template, $lang, $user); - $event = new \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent($this->createMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, \Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST, $exception); + $event = new \Symfony\Component\HttpKernel\Event\ExceptionEvent($this->createMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, \Symfony\Component\HttpKernel\HttpKernelInterface::MAIN_REQUEST, $exception); $exception_listener->on_kernel_exception($event); $response = $event->getResponse(); @@ -94,7 +95,7 @@ public function test_phpbb_exception($is_ajax, $exception, $expected) if (isset($expected['content'])) { - $this->assertContains($expected['content'], $response->getContent()); + $this->assertStringContainsString($expected['content'], $response->getContent()); } } } diff --git a/tests/event/export_php_test.php b/tests/event/export_php_test.php index 21bbb0620a4..4412b6d0bd0 100644 --- a/tests/event/export_php_test.php +++ b/tests/event/export_php_test.php @@ -16,7 +16,7 @@ class phpbb_event_export_php_test extends phpbb_test_case /** @var \phpbb\event\php_exporter */ protected $exporter; - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -28,7 +28,7 @@ static public function crawl_php_file_data() { global $phpbb_root_path; $exporter = new \phpbb\event\php_exporter($phpbb_root_path); - $files = $exporter->get_recursive_file_list($phpbb_root_path); + $files = $exporter->get_recursive_file_list(); $data_provider = array(); foreach ($files as $file) diff --git a/tests/event/fixtures/extra_description.test b/tests/event/fixtures/extra_description.test index ce8f97ce896..e93a1044acc 100644 --- a/tests/event/fixtures/extra_description.test +++ b/tests/event/fixtures/extra_description.test @@ -3,7 +3,7 @@ /** * Description * -* NOTE: This will not be exported +* NOTE: This will also be exported * * @event extra_description.dispatch * @since 3.1.0-b2 diff --git a/tests/event/fixtures/normal_events.md.test b/tests/event/fixtures/normal_events.md.test index 47921c4e572..a045bd42ddf 100644 --- a/tests/event/fixtures/normal_events.md.test +++ b/tests/event/fixtures/normal_events.md.test @@ -18,3 +18,19 @@ acp_bbcodes_actions_prepend2 * Changed: 3.1.0-a5 Moved up * Changed: 3.1.0-a6 Moved down * Purpose: desc2 + +acp_bbcodes_actions_prepend2_deprecated +=== +* Location: adm/style/acp_bbcodes.html +* Since: 3.1.0-a4 +* Deprecated: 3.1.0-a6 +* Changed: 3.1.0-a5 Moved up +* Changed: 3.1.0-a6 Moved down +* Purpose: desc2 + +acp_bbcodes_actions_prepend_deprecated +=== +* Location: adm/style/acp_bbcodes.html +* Since: 3.1.0-a5 +* Deprecated: 3.1.0-a6 +* Purpose: desc2 diff --git a/tests/event/md_exporter_test.php b/tests/event/md_exporter_test.php index 2eeb48ea054..ee86c2f1612 100644 --- a/tests/event/md_exporter_test.php +++ b/tests/event/md_exporter_test.php @@ -24,6 +24,7 @@ static public function crawl_eventsmd_data() 'adm' => array('acp_bbcodes.html'), ), 'since' => '3.1.0-a3', + 'deprecated' => '', 'changed' => array( '3.1.0-a4' => '', ), @@ -36,6 +37,7 @@ static public function crawl_eventsmd_data() 'adm' => array('acp_bbcodes.html'), ), 'since' => '3.1.0-a5', + 'deprecated' => '', 'changed' => array(), 'description' => 'desc2' . "\n", ), @@ -46,12 +48,38 @@ static public function crawl_eventsmd_data() 'adm' => array('acp_bbcodes.html'), ), 'since' => '3.1.0-a4', + 'deprecated' => '', 'changed' => array( '3.1.0-a5' => 'Moved up', '3.1.0-a6' => 'Moved down', ), 'description' => 'desc2' . "\n", ), + 'acp_bbcodes_actions_prepend2_deprecated' => array( + 'event' => 'acp_bbcodes_actions_prepend2_deprecated', + 'files' => array( + 'prosilver' => array(), + 'adm' => array('acp_bbcodes.html'), + ), + 'since' => '3.1.0-a4', + 'deprecated' => '3.1.0-a6', + 'changed' => array( + '3.1.0-a5' => 'Moved up', + '3.1.0-a6' => 'Moved down', + ), + 'description' => 'desc2' . "\n", + ), + 'acp_bbcodes_actions_prepend_deprecated' => array( + 'event' => 'acp_bbcodes_actions_prepend_deprecated', + 'files' => array( + 'prosilver' => array(), + 'adm' => array('acp_bbcodes.html'), + ), + 'since' => '3.1.0-a5', + 'deprecated' => '3.1.0-a6', + 'changed' => array(), + 'description' => 'desc2' . "\n", + ), )), array('normal_events.md.test', '3.1.0-a5', '3.1.0-a5', array( 'acp_bbcodes_actions_prepend' => array( @@ -61,6 +89,7 @@ static public function crawl_eventsmd_data() 'adm' => array('acp_bbcodes.html'), ), 'since' => '3.1.0-a5', + 'deprecated' => '', 'changed' => array(), 'description' => 'desc2' . "\n", ), @@ -71,12 +100,38 @@ static public function crawl_eventsmd_data() 'adm' => array('acp_bbcodes.html'), ), 'since' => '3.1.0-a4', + 'deprecated' => '', 'changed' => array( '3.1.0-a5' => 'Moved up', '3.1.0-a6' => 'Moved down', ), 'description' => 'desc2' . "\n", ), + 'acp_bbcodes_actions_prepend2_deprecated' => array( + 'event' => 'acp_bbcodes_actions_prepend2_deprecated', + 'files' => array( + 'prosilver' => array(), + 'adm' => array('acp_bbcodes.html'), + ), + 'since' => '3.1.0-a4', + 'deprecated' => '3.1.0-a6', + 'changed' => array( + '3.1.0-a5' => 'Moved up', + '3.1.0-a6' => 'Moved down', + ), + 'description' => 'desc2' . "\n", + ), + 'acp_bbcodes_actions_prepend_deprecated' => array( + 'event' => 'acp_bbcodes_actions_prepend_deprecated', + 'files' => array( + 'prosilver' => array(), + 'adm' => array('acp_bbcodes.html'), + ), + 'since' => '3.1.0-a5', + 'deprecated' => '3.1.0-a6', + 'changed' => array(), + 'description' => 'desc2' . "\n", + ), )), ); } @@ -91,7 +146,7 @@ static public function crawl_eventsmd_data() */ public function test_crawl_eventsmd($file, $min_version, $max_version, $events) { - $exporter = new \phpbb\event\md_exporter(dirname(__FILE__) . '/fixtures/', null, $min_version, $max_version); + $exporter = new \phpbb\event\md_exporter(__DIR__ . '/fixtures/', null, $min_version, $max_version); $this->assertSame(count($events), $exporter->crawl_eventsmd($file, 'adm')); $this->assertEquals($events, $exporter->get_events()); } @@ -126,7 +181,7 @@ static public function crawl_template_file_data() ); foreach ($styles as $path => $filter) { - $files = $exporter->get_recursive_file_list($phpbb_root_path . $path, $path); + $files = $exporter->get_recursive_file_list($phpbb_root_path . $path); foreach ($files as $file) { $data_provider[] = array($filter, $path . $file); diff --git a/tests/event/php_exporter_test.php b/tests/event/php_exporter_test.php index 07929065c3a..f7b244544e9 100644 --- a/tests/event/php_exporter_test.php +++ b/tests/event/php_exporter_test.php @@ -16,10 +16,10 @@ class phpbb_event_php_exporter_test extends phpbb_test_case /** @var \phpbb\event\php_exporter */ protected $exporter; - public function setUp() + protected function setUp(): void { parent::setUp(); - $this->exporter = new \phpbb\event\php_exporter(dirname(__FILE__) . '/fixtures/'); + $this->exporter = new \phpbb\event\php_exporter(__DIR__ . '/fixtures/'); } static public function crawl_php_file_data() @@ -57,7 +57,7 @@ static public function crawl_php_file_data() 'file' => 'extra_description.test', 'arguments' => array(), 'since' => '3.1.0-b2', - 'description' => 'Description', + 'description' => 'Description

      NOTE: This will also be exported', ), ), ), @@ -169,10 +169,10 @@ static public function validate_since_throws_data() /** * @dataProvider validate_since_throws_data - * @expectedException LogicException */ public function test_validate_since_throws($since) { + $this->expectException('LogicException'); $this->exporter->validate_since($since); } @@ -203,7 +203,6 @@ static public function validate_event_throws_data() /** * @dataProvider validate_event_throws_data - * @expectedException LogicException */ public function test_validate_event_throws($event_name, $event, $exception_code) { @@ -240,10 +239,10 @@ static public function validate_vars_docblock_array_throws_data() /** * @dataProvider validate_vars_docblock_array_throws_data - * @expectedException LogicException */ public function test_validate_vars_docblock_array_throws($vars_array, $vars_docblock) { + $this->expectException('LogicException'); $this->exporter->validate_vars_docblock_array($vars_array, $vars_docblock); } @@ -282,10 +281,10 @@ static public function get_dispatch_name_throws_data() /** * @dataProvider get_dispatch_name_throws_data - * @expectedException LogicException */ public function test_get_dispatch_name_throws($event_line) { + $this->expectException('LogicException'); $this->exporter->set_content(array($event_line)); $this->exporter->get_event_name(0, true); } @@ -328,10 +327,10 @@ static public function get_trigger_event_name_throws_data() /** * @dataProvider get_trigger_event_name_throws_data - * @expectedException LogicException */ public function test_get_trigger_event_name_throws($event_line) { + $this->expectException('LogicException'); $this->exporter->set_content(array($event_line)); $this->exporter->get_event_name(0, false); } @@ -353,11 +352,11 @@ static public function get_vars_from_array_data() array( "\t/**", "\t*/", - "\t\$vars = array('_Strange123', 'phpBB3_Test');", + "\t\$vars = array('_Strange123', 'phpBB_Test');", "\t\$this->dispatcher->dispatch('test');", ), 3, - array('_Strange123', 'phpBB3_Test'), + array('_Strange123', 'phpBB_Test'), ), ); } @@ -459,7 +458,6 @@ static public function get_vars_from_array_throws_data() /** * @dataProvider get_vars_from_array_throws_data - * @expectedException LogicException */ public function test_get_vars_from_array_throws($lines, $event_line, $exception_code) { @@ -545,7 +543,6 @@ static public function get_vars_from_docblock_throws_data() /** * @dataProvider get_vars_from_docblock_throws_data - * @expectedException LogicException */ public function test_get_vars_from_docblock_throws($lines, $event_line, $exception_code) { @@ -649,7 +646,6 @@ static public function find_since_throws_data() /** * @dataProvider find_since_throws_data - * @expectedException LogicException */ public function test_find_since_throws($lines, $event_line, $exception_code) { @@ -751,7 +747,6 @@ static public function find_description_throws_data() /** * @dataProvider find_description_throws_data - * @expectedException LogicException */ public function test_find_description_throws($lines, $event_line, $exception_code) { diff --git a/tests/extension/ext/vendor5/foo/composer.json b/tests/extension/ext/vendor5/foo/composer.json new file mode 100644 index 00000000000..0fa052e1881 --- /dev/null +++ b/tests/extension/ext/vendor5/foo/composer.json @@ -0,0 +1,23 @@ +{ + "name": "vendor5/foo", + "type": "phpbb-extension", + "description": "An example/sample extension to be used for testing purposes in phpBB Development.", + "version": "1.0.0", + "time": "2012-02-15 01:01:01", + "license": "GPL-2.0", + "authors": [{ + "name": "John Smith", + "email": "email@phpbb.com", + "homepage": "http://phpbb.com", + "role": "N/A" + }], + "require": { + "php": ">=5.3" + }, + "extra": { + "display-name": "phpBB Bar Extension", + "soft-require": { + "phpbb/phpbb": "3.3.*@dev" + } + } +} diff --git a/tests/extension/ext/vendor5/foo/ext.php b/tests/extension/ext/vendor5/foo/ext.php new file mode 100644 index 00000000000..6bf03f001cb --- /dev/null +++ b/tests/extension/ext/vendor5/foo/ext.php @@ -0,0 +1,19 @@ +getMethod('get_migration_file_list'); - self::$reflection_method_get_migration_file_list->setAccessible(true); } - public function setUp() + protected function setUp(): void { $container = new phpbb_mock_container_builder(); $migrator = new phpbb_mock_migrator(); $container->set('migrator', $migrator); $this->extension_manager = new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'vendor2/foo' => array( 'ext_name' => 'vendor2/foo', @@ -58,7 +57,7 @@ public function setUp() $container); } - public function data_test_suffix_get_classes() + public static function data_test_suffix_get_classes() { return array( array( diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php index 02c70fd503d..066cc9b84d2 100644 --- a/tests/extension/finder_test.php +++ b/tests/extension/finder_test.php @@ -15,13 +15,13 @@ class phpbb_extension_finder_test extends phpbb_test_case { /** @var \phpbb\extension\manager */ protected $extension_manager; - /** @var \phpbb\finder */ + /** @var \phpbb\finder\finder */ protected $finder; - public function setUp() + protected function setUp(): void { $this->extension_manager = new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'vendor2/foo' => array( 'ext_name' => 'vendor2/foo', @@ -57,7 +57,7 @@ public function test_suffix_get_classes() ); } - public function set_extensions_data() + public static function set_extensions_data() { return array( array( @@ -106,7 +106,7 @@ public function test_get_directories() sort($dirs); $this->assertEquals(array( - dirname(__FILE__) . '/ext/vendor2/foo/type/', + __DIR__ . '/ext/vendor2/foo/type/', ), $dirs); } @@ -118,9 +118,9 @@ public function test_prefix_get_directories() sort($dirs); $this->assertEquals(array( - dirname(__FILE__) . '/ext/vendor2/foo/sub/type/', - dirname(__FILE__) . '/ext/vendor2/foo/type/', - dirname(__FILE__) . '/ext/vendor2/foo/typewrong/', + __DIR__ . '/ext/vendor2/foo/sub/type/', + __DIR__ . '/ext/vendor2/foo/type/', + __DIR__ . '/ext/vendor2/foo/typewrong/', ), $dirs); } @@ -224,7 +224,7 @@ public function test_find_from_extension() { $files = $this->finder ->extension_directory('/type') - ->find_from_extension('vendor2/foo', dirname(__FILE__) . '/ext/vendor2/foo/'); + ->find_from_extension('vendor2/foo', __DIR__ . '/ext/vendor2/foo/'); $classes = $this->finder->get_classes_from_files($files); sort($classes); @@ -243,7 +243,7 @@ public function test_find_from_extension() public function test_get_classes_create_cache() { $cache = new phpbb_mock_cache; - $finder = new \phpbb\finder(dirname(__FILE__) . '/', $cache, 'php', '_custom_cache_name'); + $finder = new \phpbb\finder\finder($cache, false, __DIR__ . '/', 'php', '_custom_cache_name'); $finder->set_extensions(array_keys($this->extension_manager->all_enabled())); $files = $finder->suffix('_class.php')->get_files(); @@ -282,13 +282,15 @@ public function test_cached_get_files() 'is_dir' => false, ); - $finder = new \phpbb\finder( - dirname(__FILE__) . '/', + $finder = new \phpbb\finder\finder( new phpbb_mock_cache(array( '_ext_finder' => array( md5(serialize($query)) => array('file_name' => 'extension'), ), - )) + )), + false, + __DIR__ . '/', + '_ext_finder' ); $finder->set_extensions(array_keys($this->extension_manager->all_enabled())); @@ -299,7 +301,7 @@ public function test_cached_get_files() sort($classes); $this->assertEquals( - array(dirname(__FILE__) . '/file_name'), + array(__DIR__ . '/file_name'), $classes ); } diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php index a1765775d82..e659d37a515 100644 --- a/tests/extension/manager_test.php +++ b/tests/extension/manager_test.php @@ -11,10 +11,10 @@ * */ -require_once dirname(__FILE__) . '/ext/vendor2/bar/ext.php'; -require_once dirname(__FILE__) . '/ext/vendor2/foo/ext.php'; -require_once dirname(__FILE__) . '/ext/vendor3/foo/ext.php'; -require_once dirname(__FILE__) . '/ext/vendor/moo/ext.php'; +require_once __DIR__ . '/ext/vendor2/bar/ext.php'; +require_once __DIR__ . '/ext/vendor2/foo/ext.php'; +require_once __DIR__ . '/ext/vendor3/foo/ext.php'; +require_once __DIR__ . '/ext/vendor/moo/ext.php'; class phpbb_extension_manager_test extends phpbb_database_test_case { @@ -23,10 +23,10 @@ class phpbb_extension_manager_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/extensions.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/extensions.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -36,7 +36,7 @@ protected function setUp() public function test_all_available() { // barfoo and vendor3/bar should not listed due to missing composer.json. barfoo also has incorrect dir structure. - $this->assertEquals(array('vendor/moo', 'vendor2/bar', 'vendor2/foo', 'vendor3/foo', 'vendor4/bar'), array_keys($this->extension_manager->all_available())); + $this->assertEquals(array('vendor/moo', 'vendor2/bar', 'vendor2/foo', 'vendor3/foo', 'vendor4/bar', 'vendor5/foo'), array_keys($this->extension_manager->all_available())); } public function test_all_enabled() @@ -95,7 +95,10 @@ public function test_enable() $this->assertEquals(array('vendor2/foo'), array_keys($this->extension_manager->all_enabled())); $this->extension_manager->enable('vendor2/bar'); - $this->assertEquals(array('vendor2/bar', 'vendor2/foo'), array_keys($this->extension_manager->all_enabled())); + + // We should see the extension as being disabled + $this->assertEquals(array('vendor2/bar', 'vendor2/foo'), array_keys($this->create_extension_manager()->all_enabled())); + $this->assertEquals(array('vendor/moo', 'vendor2/bar', 'vendor2/foo'), array_keys($this->extension_manager->all_configured())); $this->assertEquals(4, vendor2\bar\ext::$state); @@ -119,7 +122,9 @@ public function test_disable() $this->assertEquals(array('vendor2/foo'), array_keys($this->extension_manager->all_enabled())); $this->extension_manager->disable('vendor2/foo'); - $this->assertEquals(array(), array_keys($this->extension_manager->all_enabled())); + + $this->assertEquals([], array_keys($this->extension_manager->all_enabled())); + $this->assertEquals(array('vendor/moo', 'vendor2/foo'), array_keys($this->extension_manager->all_configured())); $this->assertTrue(vendor2\foo\ext::$disabled); @@ -147,14 +152,18 @@ public function test_enabled_no_cache() protected function create_extension_manager($with_cache = true) { + $phpbb_root_path = __DIR__ . './../../phpBB/'; + $php_ext = 'php'; + $table_prefix = 'phpbb_'; $config = new \phpbb\config\config(array('version' => PHPBB_VERSION)); $db = $this->new_dbal(); + $db_doctrine = $this->new_doctrine_dbal(); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $factory = new \phpbb\db\tools\factory(); - $db_tools = $factory->get($db); - $phpbb_root_path = __DIR__ . './../../phpBB/'; - $php_ext = 'php'; - $table_prefix = 'phpbb_'; + $finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $php_ext); + $db_tools = $factory->get($db_doctrine); + $db_tools->set_table_prefix($table_prefix); $container = new phpbb_mock_container_builder(); @@ -167,6 +176,7 @@ protected function create_extension_manager($with_cache = true) $phpbb_root_path, $php_ext, $table_prefix, + self::get_core_tables(), array(), new \phpbb\db\migration\helper() ); @@ -176,10 +186,10 @@ protected function create_extension_manager($with_cache = true) $container, $db, $config, + $finder_factory, 'phpbb_ext', - dirname(__FILE__) . '/', - $php_ext, - ($with_cache) ? new \phpbb\cache\service(new phpbb_mock_cache(), $config, $db, $phpbb_root_path, $php_ext) : null + __DIR__ . '/', + ($with_cache) ? new \phpbb\cache\service(new phpbb_mock_cache(), $config, $db, $phpbb_dispatcher, $phpbb_root_path, $php_ext) : null ); } } diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php index 5887fd974d7..b1468f3f9d7 100644 --- a/tests/extension/metadata_manager_test.php +++ b/tests/extension/metadata_manager_test.php @@ -19,6 +19,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case protected $cache; protected $config; protected $db; + protected $db_doctrine; protected $db_tools; protected $table_prefix; protected $phpbb_root_path; @@ -29,25 +30,29 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/extensions.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/extensions.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); + $this->table_prefix = 'phpbb_'; $this->config = new \phpbb\config\config(array( 'version' => '3.1.0', )); $this->db = $this->new_dbal(); + $this->db_doctrine = $this->new_doctrine_dbal(); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $factory = new \phpbb\db\tools\factory(); - $this->db_tools = $factory->get($this->db); - $this->phpbb_root_path = dirname(__FILE__) . '/'; + $this->db_tools = $factory->get($this->db_doctrine); + $this->db_tools->set_table_prefix($this->table_prefix); + $finder_factory = $this->createMock('\phpbb\finder\factory'); + $this->phpbb_root_path = __DIR__ . '/'; $this->phpEx = 'php'; - $this->cache = new \phpbb\cache\service(new phpbb_mock_cache(), $this->config, $this->db, $this->phpbb_root_path, $this->phpEx); + $this->cache = new \phpbb\cache\service(new phpbb_mock_cache(), $this->config, $this->db, $phpbb_dispatcher, $this->phpbb_root_path, $this->phpEx); - $this->table_prefix = 'phpbb_'; $container = new phpbb_mock_container_builder(); $cache_path = $this->phpbb_root_path . 'cache/twig'; @@ -62,14 +67,17 @@ protected function setUp() $this->phpbb_root_path, $this->phpEx ); + $log = new \phpbb\log\dummy(); + $assets_bag = new \phpbb\template\assets_bag(); $twig = new \phpbb\template\twig\environment( + $assets_bag, $this->config, $filesystem, $phpbb_path_helper, $cache_path, null, $loader, - new \phpbb\event\dispatcher($container), + $phpbb_dispatcher, array( 'cache' => false, 'debug' => false, @@ -87,6 +95,7 @@ protected function setUp() $this->phpbb_root_path, 'php', $this->table_prefix, + self::get_core_tables(), array(), new \phpbb\db\migration\helper() ); @@ -96,9 +105,9 @@ protected function setUp() $container, $this->db, $this->config, + $finder_factory, 'phpbb_ext', $this->phpbb_root_path, - $this->phpEx, $this->cache ); @@ -109,7 +118,7 @@ protected function setUp() $lang = new \phpbb\language\language($lang_loader); $this->user = new \phpbb\user($lang, '\phpbb\datetime'); - $this->template = new phpbb\template\twig\twig($phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user))); + $this->template = new phpbb\template\twig\twig($phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user))); $twig->setLexer(new \phpbb\template\twig\lexer($twig)); } @@ -154,7 +163,7 @@ public function test_foo() $this->assertEquals($metadata, $json); } - public function validator_non_existing_data() + public static function validator_non_existing_data() { return array( array('name'), @@ -214,7 +223,7 @@ public function test_validator_non_existing_authors() } } - public function validator_invalid_data() + public static function validator_invalid_data() { return array( array('name', 'asdf'), @@ -272,7 +281,7 @@ public function test_validator_valid() } } - public function validator_requirements_data() + public static function validator_requirements_data() { return array( array( diff --git a/tests/extension/modules_test.php b/tests/extension/modules_test.php index 20b71e28128..65e4fcdd333 100644 --- a/tests/extension/modules_test.php +++ b/tests/extension/modules_test.php @@ -11,12 +11,12 @@ * */ -require_once dirname(__FILE__) . '/ext/vendor2/foo/acp/a_info.php'; -require_once dirname(__FILE__) . '/ext/vendor2/foo/mcp/a_info.php'; -require_once dirname(__FILE__) . '/ext/vendor2/foo/acp/fail_info.php'; -require_once dirname(__FILE__) . '/ext/vendor2/bar/acp/a_info.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/acp/acp_modules.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_module.php'; +require_once __DIR__ . '/ext/vendor2/foo/acp/a_info.php'; +require_once __DIR__ . '/ext/vendor2/foo/mcp/a_info.php'; +require_once __DIR__ . '/ext/vendor2/foo/acp/fail_info.php'; +require_once __DIR__ . '/ext/vendor2/bar/acp/a_info.php'; +require_once __DIR__ . '/../../phpBB/includes/acp/acp_modules.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_module.php'; class phpbb_extension_modules_test extends phpbb_test_case { @@ -24,12 +24,12 @@ class phpbb_extension_modules_test extends phpbb_test_case protected $finder; protected $module_manager; - public function setUp() + protected function setUp(): void { global $phpbb_extension_manager; $this->extension_manager = new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'vendor2/foo' => array( 'ext_name' => 'vendor2/foo', @@ -49,7 +49,7 @@ public function setUp() $this->createMock('\phpbb\db\driver\driver_interface'), $this->extension_manager, MODULES_TABLE, - dirname(__FILE__) . '/', + __DIR__ . '/', 'php' ); } @@ -61,7 +61,7 @@ public function test_get_module_infos() // $this->markTestIncomplete('Modules no speak namespace! Going to get rid of db modules altogether and fix this test after.'); // Correctly set the root path for this test to this directory, so the classes can be found - $phpbb_root_path = dirname(__FILE__) . '/'; + $phpbb_root_path = __DIR__ . '/'; // Find acp module info files $acp_modules = $this->module_manager->get_module_infos('acp'); @@ -174,7 +174,7 @@ public function test_get_module_infos() ), $acp_modules); } - public function module_auth_test_data() + public static function module_auth_test_data() { return array( // module_auth, expected result @@ -193,7 +193,7 @@ public function test_modules_auth($module_auth, $expected) global $phpbb_extension_manager, $phpbb_dispatcher; $phpbb_extension_manager = $this->extension_manager = new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'vendor2/foo' => array( 'ext_name' => 'vendor2/foo', diff --git a/tests/feed/attachments_base_test.php b/tests/feed/attachments_base_test.php index 3d66c906ada..34a577a0f98 100644 --- a/tests/feed/attachments_base_test.php +++ b/tests/feed/attachments_base_test.php @@ -11,25 +11,22 @@ * */ -require_once(dirname(__FILE__) . '/attachments_mock_feed.php'); +require_once(__DIR__ . '/attachments_mock_feed.php'); class phpbb_feed_attachments_base_test extends phpbb_database_test_case { - protected $filesystem; - /** @var \phpbb_feed_attachments_mock_feed */ protected $attachments_mocks_feed; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/../extension/fixtures/extensions.xml'); + return $this->createXMLDataSet(__DIR__ . '/../extension/fixtures/extensions.xml'); } - public function setUp() + protected function setUp(): void { global $phpbb_root_path, $phpEx; - $this->filesystem = new \phpbb\filesystem(); $config = new \phpbb\config\config(array()); $path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( @@ -48,10 +45,10 @@ public function setUp() $container = new phpbb_mock_container_builder(); $this->get_test_case_helpers()->set_s9e_services($container); $container->set('feed.quote_helper', new \phpbb\feed\quote_helper($user, $phpbb_root_path, 'php')); - $feed_helper = new \phpbb\feed\helper($config, $container, $path_helper, $container->get('text_formatter.renderer'), $user); $db = $this->new_dbal(); $cache = new \phpbb_mock_cache(); $auth = new \phpbb\auth\auth(); + $feed_helper = new \phpbb\feed\helper($auth, $config, $container, $path_helper, $container->get('text_formatter.renderer'), $user); $content_visibility = new \phpbb\content_visibility( $auth, $config, @@ -79,7 +76,7 @@ public function setUp() ); } - public function data_fetch_attachments() + public static function data_fetch_attachments() { return array( array(array(0), array(0)), @@ -98,7 +95,7 @@ public function test_fetch_attachments($post_ids, $topic_ids, $expected_exceptio if ($expected_exception !== false) { - $this->setExpectedException($expected_exception); + $this->expectException($expected_exception); $this->attachments_mocks_feed->get_sql(); } diff --git a/tests/feed/http_auth_subscriber_test.php b/tests/feed/http_auth_subscriber_test.php new file mode 100644 index 00000000000..5e1c11b07c7 --- /dev/null +++ b/tests/feed/http_auth_subscriber_test.php @@ -0,0 +1,479 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case +{ + /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\auth\auth */ + protected $auth; + + /** @var \PHPUnit\Framework\MockObject\MockObject|config */ + protected $config; + + /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\language\language */ + protected $language; + + /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\request\request_interface */ + protected $request; + + /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\user */ + protected $user; + + /** @var http_auth_subscriber */ + protected $subscriber; + + protected function setUp(): void + { + parent::setUp(); + + $this->auth = $this->getMockBuilder('\phpbb\auth\auth') + ->disableOriginalConstructor() + ->getMock(); + $this->auth->method('login') + ->willReturnMap([ + ['valid_user', 'valid_password', false, true, false, ['status' => LOGIN_SUCCESS]], + ['invalid_user', 'invalid_password', false, true, false, ['status' => LOGIN_ERROR_USERNAME]], + ['attempts_user', 'valid_password', false, true, false, ['status' => LOGIN_ERROR_ATTEMPTS]], + ]); + + $this->config = new config(array( + 'feed_http_auth' => 1, + 'sitename' => 'Test Site', + )); + + $this->language = $this->getMockBuilder('\phpbb\language\language') + ->disableOriginalConstructor() + ->getMock(); + $this->language->method('lang') + ->willReturnMap([ + ['NOT_AUTHORISED', 'NOT_AUTHORISED'], + ['LOGIN_ERROR_ATTEMPTS', 'LOGIN_ERROR_ATTEMPTS'] + ]); + + $this->request = $this->getMockBuilder('\phpbb\request\request_interface') + ->getMock(); + + $this->user = $this->getMockBuilder('\phpbb\user') + ->disableOriginalConstructor() + ->getMock(); + + $this->user->data = array('is_registered' => false); + + $this->subscriber = new http_auth_subscriber( + $this->auth, + $this->config, + $this->language, + $this->request, + $this->user + ); + } + + public function test_subscriber_events() + { + $events = http_auth_subscriber::getSubscribedEvents(); + $this->assertArrayHasKey(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, $events); + } + + public function test_non_feed_route_skipped() + { + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('not_a_feed_route'); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') + ->onlyMethods(['getRequest', 'setResponse']) + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + } + + public function test_insecure_connection_skipped() + { + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(false); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + } + + public function test_http_auth_disabled() + { + $this->config['feed_http_auth'] = 0; + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->never()) + ->method('get'); + + $request->expects($this->never()) + ->method('isSecure'); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->never()) + ->method('getRequest'); + + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + } + + public function test_user_already_logged_in() + { + $this->user->data = array('is_registered' => true); + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + } + + public function test_no_credentials() + { + $this->user->data = ['is_registered' => false]; + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + /** @var Response $response */ + $response = null; + $event->expects($this->once()) + ->method('setResponse') + ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) + ->willReturnCallback(function ($newResponse) use (&$response) { + $response = $newResponse; + }); + + $this->subscriber->on_kernel_request($event); + + $this->assertEquals(Response::HTTP_UNAUTHORIZED, $response->getStatusCode()); + $this->assertEquals('NOT_AUTHORISED', $response->getContent()); + $this->assertTrue($response->headers->has('WWW-Authenticate')); + } + + public function test_valid_credentials() + { + $this->user->data = ['is_registered' => false]; + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $this->request->method('is_set') + ->willReturnMap([ + ['PHP_AUTH_USER', request_interface::SERVER, true], + ['PHP_AUTH_PW', request_interface::SERVER, true], + ]); + + $this->request->method('server') + ->willReturnMap([ + ['PHP_AUTH_USER', '', 'valid_user'], + ['PHP_AUTH_PW', '', 'valid_password'], + ]); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + /** @var Response $response */ + $response = null; + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + + $this->assertNull($response); + } + + public function test_valid_credentials_base64() + { + $this->user->data = ['is_registered' => false]; + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $this->request->method('is_set') + ->willReturnMap([ + ['Authorization', request_interface::SERVER, true], + ]); + + $this->request->method('server') + ->willReturnMap([ + ['Authorization', '', 'Basic dmFsaWRfdXNlcjp2YWxpZF9wYXNzd29yZA=='], + ]); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + /** @var Response $response */ + $response = null; + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + + $this->assertNull($response); + } + + public function test_too_many_attempts() + { + $this->user->data = ['is_registered' => false]; + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $this->request->method('is_set') + ->willReturnMap([ + ['PHP_AUTH_USER', request_interface::SERVER, true], + ['PHP_AUTH_PW', request_interface::SERVER, true], + ]); + + $this->request->method('server') + ->willReturnMap([ + ['PHP_AUTH_USER', '', 'attempts_user'], + ['PHP_AUTH_PW', '', 'valid_password'], + ]); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + /** @var Response $response */ + $response = null; + $event->expects($this->once()) + ->method('setResponse') + ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) + ->willReturnCallback(function ($newResponse) use (&$response) { + $response = $newResponse; + }); + + $this->subscriber->on_kernel_request($event); + + $this->assertEquals(Response::HTTP_UNAUTHORIZED, $response->getStatusCode()); + $this->assertEquals('LOGIN_ERROR_ATTEMPTS', $response->getContent()); + $this->assertFalse($response->headers->has('WWW-Authenticate')); + } + + public function test_wrong_credentials() + { + $this->user->data = ['is_registered' => false]; + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $this->request->method('is_set') + ->willReturnMap([ + ['PHP_AUTH_USER', request_interface::SERVER, true], + ['PHP_AUTH_PW', request_interface::SERVER, true], + ]); + + $this->request->method('server') + ->willReturnMap([ + ['PHP_AUTH_USER', '', 'invalid_user'], + ['PHP_AUTH_PW', '', 'invalid_password'], + ]); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + /** @var Response $response */ + $response = null; + $event->expects($this->once()) + ->method('setResponse') + ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) + ->willReturnCallback(function ($newResponse) use (&$response) { + $response = $newResponse; + }); + + $this->subscriber->on_kernel_request($event); + + $this->assertEquals(Response::HTTP_UNAUTHORIZED, $response->getStatusCode()); + $this->assertEquals('NOT_AUTHORISED', $response->getContent()); + $this->assertTrue($response->headers->has('WWW-Authenticate')); + } +} diff --git a/tests/files/type_foo.php b/tests/files/type_foo.php index 95940b9d2f0..ab39039ca30 100644 --- a/tests/files/type_foo.php +++ b/tests/files/type_foo.php @@ -13,7 +13,7 @@ namespace phpbb\files\types; -class foo extends \phpbb\files\types\remote +class foo extends \phpbb\files\types\upload { static public $tempnam_path; } diff --git a/tests/files/types_base_test.php b/tests/files/types_base_test.php index 3b1cf68d509..2f18313eb4e 100644 --- a/tests/files/types_base_test.php +++ b/tests/files/types_base_test.php @@ -13,8 +13,7 @@ class phpbb_files_types_base_test extends phpbb_test_case { - private $path; - + /** @var \phpbb\filesystem\filesystem */ private $filesystem; /** @var \Symfony\Component\DependencyInjection\ContainerInterface */ @@ -32,10 +31,7 @@ class phpbb_files_types_base_test extends phpbb_test_case /** @var \phpbb\request\request_interface */ protected $request; - /** @var string phpBB root path */ - protected $phpbb_root_path; - - protected function setUp() + protected function setUp(): void { global $phpbb_root_path, $phpEx; @@ -45,7 +41,7 @@ protected function setUp() $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); $this->php_ini = new \bantu\IniGetWrapper\IniGetWrapper; - $this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx); + $this->container = new phpbb_mock_container_builder(); $this->container->set('files.filespec', new \phpbb\files\filespec( $this->filesystem, $this->language, @@ -56,12 +52,9 @@ protected function setUp() 'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(), )))); $this->factory = new \phpbb\files\factory($this->container); - - $this->path = __DIR__ . '/fixture/'; - $this->phpbb_root_path = $phpbb_root_path; } - public function data_check_upload_size() + public static function data_check_upload_size() { return array( array('foo', '500KB', array()), @@ -79,6 +72,7 @@ public function test_check_upload_size($filename, $max_filesize, $expected) $php_ini->expects($this->any()) ->method('getString') ->willReturn($max_filesize); + $upload = new \phpbb\files\upload($this->factory, $this->language, $php_ini, $this->request); $type_form = new \phpbb\files\types\local($this->factory, $this->language, $php_ini, $this->request); $file = $this->getMockBuilder('\phpbb\files\filespec') ->disableOriginalConstructor() @@ -86,6 +80,7 @@ public function test_check_upload_size($filename, $max_filesize, $expected) $file->expects($this->any()) ->method('get') ->willReturn($filename); + $type_form->set_upload($upload); $type_form->check_upload_size($file); $this->assertSame($expected, $file->error); diff --git a/tests/files/types_form_test.php b/tests/files/types_form_test.php index 25d79f61175..f46be3a715f 100644 --- a/tests/files/types_form_test.php +++ b/tests/files/types_form_test.php @@ -13,8 +13,7 @@ class phpbb_files_types_form_test extends phpbb_test_case { - private $path; - + /** @var \phpbb\filesystem\filesystem */ private $filesystem; /** @var \Symfony\Component\DependencyInjection\ContainerInterface */ @@ -38,7 +37,7 @@ class phpbb_files_types_form_test extends phpbb_test_case /** @var string phpBB root path */ protected $phpbb_root_path; - protected function setUp() + protected function setUp(): void { global $phpbb_root_path, $phpEx; @@ -51,7 +50,7 @@ protected function setUp() $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); $this->php_ini = new \bantu\IniGetWrapper\IniGetWrapper; - $this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx); + $this->container = new phpbb_mock_container_builder(); $this->container->set('files.filespec', new \phpbb\files\filespec( $this->filesystem, $this->language, @@ -69,11 +68,10 @@ protected function setUp() ->method('handle_upload') ->willReturn(array()); - $this->path = __DIR__ . '/fixture/'; $this->phpbb_root_path = $phpbb_root_path; } - public function data_upload_form() + public static function data_upload_form() { return array( array( @@ -160,7 +158,7 @@ public function test_upload_form($upload, $expected, $plupload = array()) ->willReturn($plupload); $type_form = new \phpbb\files\types\form($this->factory, $this->language, $this->php_ini, $this->plupload, $this->request); - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_allowed_extensions(array('png')); $type_form->set_upload($upload); diff --git a/tests/files/types_local_test.php b/tests/files/types_local_test.php index 67e4c571f52..9cdbb50ced7 100644 --- a/tests/files/types_local_test.php +++ b/tests/files/types_local_test.php @@ -13,8 +13,7 @@ class phpbb_files_types_local_test extends phpbb_test_case { - private $path; - + /** @var \phpbb\filesystem\filesystem */ private $filesystem; /** @var \Symfony\Component\DependencyInjection\ContainerInterface */ @@ -38,7 +37,7 @@ class phpbb_files_types_local_test extends phpbb_test_case /** @var string phpBB root path */ protected $phpbb_root_path; - protected function setUp() + protected function setUp(): void { global $phpbb_root_path, $phpEx; @@ -51,7 +50,7 @@ protected function setUp() $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); $this->php_ini = new \bantu\IniGetWrapper\IniGetWrapper; - $this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx); + $this->container = new phpbb_mock_container_builder(); $this->container->set('files.filespec', new \phpbb\files\filespec( $this->filesystem, $this->language, @@ -69,7 +68,6 @@ protected function setUp() ->method('handle_upload') ->willReturn(array()); - $this->path = __DIR__ . '/fixture/'; $this->phpbb_root_path = $phpbb_root_path; } @@ -98,12 +96,13 @@ public function test_upload_init_error() $this->assertInstanceOf('\phpbb\files\filespec', $file); } - public function data_upload_form() + public static function data_upload_form() { return array( array( 'foo', array( + 'realname' => null, 'tmp_name' => 'foo', 'size' => 500, 'type' => 'image/png', @@ -112,13 +111,17 @@ public function data_upload_form() ), array( 'none', - false, + array( + 'realname' => null, + 'size' => null, + 'type' => null, + ), array('PHP_SIZE_OVERRUN'), ), array( 'tests/upload/fixture/png', array( - 'realname' => 'foo.png', + 'realname' => 'foo.png', 'size' => 500, 'type' => 'image/png', 'local_mode' => true, @@ -143,17 +146,15 @@ public function test_upload_form($filename, $upload_ary, $expected) 'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(), ))); $filespec_local = new ReflectionProperty($filespec, 'local'); - $filespec_local->setAccessible(true); $filespec_local->setValue($filespec, true); $this->container->set('files.filespec', $filespec); $this->factory = new \phpbb\files\factory($this->container); $type_local = new \phpbb\files\types\local($this->factory, $this->language, $this->php_ini, $this->request); - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_allowed_extensions(array('png')); $type_local->set_upload($upload); - $file = $type_local->upload($filename, $upload_ary); $this->assertSame($expected, $file->error); $this->assertInstanceOf('\phpbb\files\filespec', $file); diff --git a/tests/files/types_remote_test.php b/tests/files/types_remote_test.php deleted file mode 100644 index 85ec2a528b2..00000000000 --- a/tests/files/types_remote_test.php +++ /dev/null @@ -1,132 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -require_once dirname(__FILE__) . '/type_foo.php'; - -class phpbb_files_types_remote_test extends phpbb_test_case -{ - private $path; - - private $filesystem; - - /** @var \phpbb\config\config */ - protected $config; - - /** @var \Symfony\Component\DependencyInjection\ContainerInterface */ - protected $container; - - /** @var \phpbb\files\factory */ - protected $factory; - - /** @var \bantu\IniGetWrapper\IniGetWrapper */ - protected $php_ini; - - /** @var \phpbb\language\language */ - protected $language; - - /** @var \phpbb\request\request_interface */ - protected $request; - - /** @var string phpBB root path */ - protected $phpbb_root_path; - - protected function setUp() - { - global $config, $phpbb_root_path, $phpEx; - - $config = new \phpbb\config\config(array()); - $this->config = $config; - $this->config->set('remote_upload_verify', 0); - $this->request = $this->createMock('\phpbb\request\request'); - - $this->filesystem = new \phpbb\filesystem\filesystem(); - $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); - $this->php_ini = new \bantu\IniGetWrapper\IniGetWrapper; - - $this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx); - $this->container->set('files.filespec', new \phpbb\files\filespec( - $this->filesystem, - $this->language, - $this->php_ini, - new \FastImageSize\FastImageSize(), - $phpbb_root_path, - new \phpbb\mimetype\guesser(array( - 'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(), - )))); - $this->factory = new \phpbb\files\factory($this->container); - - $this->path = __DIR__ . '/fixture/'; - $this->phpbb_root_path = $phpbb_root_path; - } - - public function test_upload_fsock_fail() - { - $type_remote = new \phpbb\files\types\remote($this->config, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); - $upload->set_allowed_extensions(array('png')); - $type_remote->set_upload($upload); - - $file = $type_remote->upload('https://bärföö.com/foo.png'); - - $this->assertSame(array('NOT_UPLOADED'), $file->error); - } - - public function data_get_max_file_size() - { - return array( - array('', 'http://phpbb.com/foo/bar.png'), - array('2k', 'http://phpbb.com/foo/bar.png'), - array('500k', 'http://phpbb.com/foo/bar.png'), - array('500M', 'http://phpbb.com/foo/bar.png'), - array('500m', 'http://phpbb.com/foo/bar.png'), - array('500k', 'http://google.com/?.png', array('DISALLOWED_EXTENSION', 'DISALLOWED_CONTENT')), - array('1', 'http://google.com/?.png', array('WRONG_FILESIZE')), - array('500g', 'http://phpbb.com/foo/bar.png'), - array('foobar', 'http://phpbb.com/foo/bar.png'), - array('-5k', 'http://phpbb.com/foo/bar.png'), - ); - } - - /** - * @dataProvider data_get_max_file_size - */ - public function test_get_max_file_size($max_file_size, $link, $expected = array('URL_NOT_FOUND')) - { - $php_ini = $this->createMock('\bantu\IniGetWrapper\IniGetWrapper', array('getString')); - $php_ini->expects($this->any()) - ->method('getString') - ->willReturn($max_file_size); - $type_remote = new \phpbb\files\types\remote($this->config, $this->factory, $this->language, $php_ini, $this->request, $this->phpbb_root_path); - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); - $upload->set_allowed_extensions(array('png')); - $type_remote->set_upload($upload); - - $file = $type_remote->upload($link); - - $this->assertSame($expected, $file->error); - } - - public function test_upload_wrong_path() - { - $type_remote = new \phpbb\files\types\foo($this->config, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); - $upload->set_allowed_extensions(array('png')); - $type_remote->set_upload($upload); - $type_remote::$tempnam_path = $this->phpbb_root_path . 'cache/wrong/path'; - - $file = $type_remote->upload('http://google.com/?.png'); - - $this->assertSame(array('NOT_UPLOADED'), $file->error); - $type_remote::$tempnam_path = ''; - } -} diff --git a/tests/files/upload_test.php b/tests/files/upload_test.php index a9c2dca9d99..beee220fd84 100644 --- a/tests/files/upload_test.php +++ b/tests/files/upload_test.php @@ -13,8 +13,7 @@ class phpbb_files_upload_test extends phpbb_test_case { - private $path; - + /** @var \phpbb\filesystem\filesystem */ private $filesystem; /** @var \Symfony\Component\DependencyInjection\ContainerInterface */ @@ -32,10 +31,7 @@ class phpbb_files_upload_test extends phpbb_test_case /** @var \phpbb\request\request_interface */ protected $request; - /** @var string phpBB root path */ - protected $phpbb_root_path; - - protected function setUp() + protected function setUp(): void { // Global $config required by unique_id global $config, $phpbb_root_path, $phpEx; @@ -54,7 +50,7 @@ protected function setUp() $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); $this->php_ini = new \bantu\IniGetWrapper\IniGetWrapper; - $this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx); + $this->container = new phpbb_mock_container_builder(); $this->container->set('files.filespec', new \phpbb\files\filespec( $this->filesystem, $this->language, @@ -65,14 +61,11 @@ protected function setUp() 'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(), )))); $this->factory = new \phpbb\files\factory($this->container); - - $this->path = __DIR__ . '/fixture/'; - $this->phpbb_root_path = $phpbb_root_path; } public function test_reset_vars() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_max_filesize(500); $this->assertEquals(500, $upload->max_filesize); $upload->reset_vars(); @@ -81,15 +74,14 @@ public function test_reset_vars() public function test_set_disallowed_content() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $disallowed_content = new ReflectionProperty($upload, 'disallowed_content'); - $disallowed_content->setAccessible(true); $upload->set_disallowed_content(array('foo')); $this->assertEquals(array('foo'), $disallowed_content->getValue($upload)); $upload->set_disallowed_content(array('foo', 'bar', 'meh')); $this->assertEquals(array('foo', 'bar', 'meh'), $disallowed_content->getValue($upload)); - $upload->set_disallowed_content(''); + $upload->set_disallowed_content(false); $this->assertEquals(array('foo', 'bar', 'meh'), $disallowed_content->getValue($upload)); $this->assertINstanceOf('\phpbb\files\upload', $upload->set_disallowed_content(array())); $this->assertEquals(array(), $disallowed_content->getValue($upload)); @@ -99,11 +91,11 @@ public function test_set_disallowed_content() public function test_is_valid() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $this->assertFalse($upload->is_valid('foobar')); } - public function data_internal_error() + public static function data_internal_error() { return array( array(UPLOAD_ERR_INI_SIZE, 'PHP_SIZE_OVERRUN'), @@ -122,7 +114,7 @@ public function data_internal_error() */ public function test_assign_internal_error($error_code, $expected) { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $this->assertSame($expected, $upload->assign_internal_error($error_code)); } } diff --git a/tests/filesystem/clean_path_test.php b/tests/filesystem/clean_path_test.php index d2dec424b40..8ed5519f31d 100644 --- a/tests/filesystem/clean_path_test.php +++ b/tests/filesystem/clean_path_test.php @@ -15,13 +15,13 @@ class phpbb_filesystem_clean_path_test extends phpbb_test_case { protected $filesystem; - public function setUp() + protected function setUp(): void { parent::setUp(); $this->filesystem = new \phpbb\filesystem\filesystem(); } - public function clean_path_data() + public static function clean_path_data() { return array( array('foo', 'foo'), diff --git a/tests/filesystem/helper_clean_path_test.php b/tests/filesystem/helper_clean_path_test.php index fd9ed605c89..cfaf1df5cb7 100644 --- a/tests/filesystem/helper_clean_path_test.php +++ b/tests/filesystem/helper_clean_path_test.php @@ -16,12 +16,12 @@ class phpbb_filesystem_helper_clean_path_test extends phpbb_test_case { - public function setUp() + protected function setUp(): void { parent::setUp(); } - public function clean_path_data() + public static function clean_path_data() { yield ['foo', 'foo']; yield ['foo/bar', 'foo/bar']; diff --git a/tests/filesystem/helper_is_absolute_test.php b/tests/filesystem/helper_is_absolute_test.php index e7562bfaee6..d3d05921c94 100644 --- a/tests/filesystem/helper_is_absolute_test.php +++ b/tests/filesystem/helper_is_absolute_test.php @@ -16,12 +16,12 @@ class phpbb_filesystem_helper_is_absolute_test extends phpbb_test_case { - public function setUp() + protected function setUp(): void { parent::setUp(); } - static public function is_absolute_data() + public static function is_absolute_data() { // Empty yield ['', false]; diff --git a/tests/filesystem/helper_realpath_test.php b/tests/filesystem/helper_realpath_test.php index ce85439504b..448b2665bca 100644 --- a/tests/filesystem/helper_realpath_test.php +++ b/tests/filesystem/helper_realpath_test.php @@ -17,20 +17,19 @@ class phpbb_filesystem_helper_realpath_test extends phpbb_test_case { protected static $filesystem_helper_phpbb_own_realpath; - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); self::$filesystem_helper_phpbb_own_realpath = new ReflectionMethod('\phpbb\filesystem\helper', 'phpbb_own_realpath'); - self::$filesystem_helper_phpbb_own_realpath->setAccessible(true); } - public function setUp() + protected function setUp(): void { parent::setUp(); } - public function realpath_resolve_absolute_without_symlinks_data() + public static function realpath_resolve_absolute_without_symlinks_data() { // Constant data yield [__DIR__, __DIR__]; @@ -42,7 +41,7 @@ public function realpath_resolve_absolute_without_symlinks_data() yield [__FILE__ . '../', false]; } - public function realpath_resolve_relative_without_symlinks_data() + public static function realpath_resolve_relative_without_symlinks_data() { if (!function_exists('getcwd')) { diff --git a/tests/filesystem/is_absolute_test.php b/tests/filesystem/is_absolute_test.php index 7a50989b742..684fc386849 100644 --- a/tests/filesystem/is_absolute_test.php +++ b/tests/filesystem/is_absolute_test.php @@ -16,14 +16,14 @@ class phpbb_filesystem_is_absolute_test extends phpbb_test_case /** @var \phpbb\filesystem\filesystem_interface */ protected $filesystem; - public function setUp() + protected function setUp(): void { parent::setUp(); $this->filesystem = new \phpbb\filesystem\filesystem(); } - static public function is_absolute_data() + public static function is_absolute_data() { return array( // Empty diff --git a/tests/filesystem/realpath_test.php b/tests/filesystem/realpath_test.php index d994935f949..75e34ea2401 100644 --- a/tests/filesystem/realpath_test.php +++ b/tests/filesystem/realpath_test.php @@ -13,28 +13,27 @@ class phpbb_filesystem_realpath_test extends phpbb_test_case { - static protected $filesystem_own_realpath; + protected static $filesystem_own_realpath; /** @var \phpbb\filesystem\filesystem_interface */ protected $filesystem; - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); $reflection_class = new ReflectionClass('\phpbb\filesystem\filesystem'); self::$filesystem_own_realpath = $reflection_class->getMethod('phpbb_own_realpath'); - self::$filesystem_own_realpath->setAccessible(true); } - public function setUp() + protected function setUp(): void { parent::setUp(); $this->filesystem = new \phpbb\filesystem\filesystem(); } - public function realpath_resolve_absolute_without_symlinks_data() + public static function realpath_resolve_absolute_without_symlinks_data() { return array( // Constant data @@ -42,13 +41,14 @@ public function realpath_resolve_absolute_without_symlinks_data() array(__DIR__ . '/../filesystem/../filesystem', __DIR__), array(__DIR__ . '/././', __DIR__), array(__DIR__ . '/non_existent', false), + array(null, getcwd()), array(__FILE__, __FILE__), array(__FILE__ . '../', false), ); } - public function realpath_resolve_relative_without_symlinks_data() + public static function realpath_resolve_relative_without_symlinks_data() { if (!function_exists('getcwd')) { diff --git a/tests/functional/acp_attachments_test.php b/tests/functional/acp_attachments_test.php index 8e810a508a7..b4de2f2beec 100644 --- a/tests/functional/acp_attachments_test.php +++ b/tests/functional/acp_attachments_test.php @@ -1,78 +1,121 @@ - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ /** * @group functional */ class phpbb_functional_acp_attachments_test extends phpbb_functional_test_case { - public function data_imagick_path_linux() + private $path; + + protected function setUp(): void { - return array( - array('/usr/bin', 'Configuration updated successfully'), - array('/usr/foobar', 'The entered path “/usr/foobar” does not exist.'), - array('/usr/bin/which', 'The entered path “/usr/bin/which” is not a directory.'), - ); + parent::setUp(); + $this->path = __DIR__ . '/fixtures/files/'; + $this->add_lang('posting'); } - /** - * @dataProvider data_imagick_path_linux - */ - public function test_imagick_path_linux($imagick_path, $expected) + protected function tearDown(): void { - if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux') + $iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/'); + foreach ($iterator as $fileinfo) { - $this->markTestSkipped('Unable to test linux specific paths on other OS.'); - } + if ( + $fileinfo->isDot() + || $fileinfo->isDir() + || $fileinfo->getFilename() === 'index.htm' + || $fileinfo->getFilename() === '.htaccess' + ) + { + continue; + } - $this->login(); - $this->admin_login(); + unlink($fileinfo->getPathname()); + } + } - $crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid); + private function upload_file($filename, $mimetype) + { + $crawler = self::request( + 'GET', + 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid + ); - $form = $crawler->selectButton('Submit')->form(array('config[img_imagick]' => $imagick_path)); + $file_form_data = array_merge(['add_file' => $this->lang('ADD_FILE')], $this->get_hidden_fields($crawler, 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid)); - $crawler = self::submit($form); - $this->assertContains($expected, $crawler->filter('#main')->text()); - } + $file = array( + 'tmp_name' => $this->path . $filename, + 'name' => $filename, + 'type' => $mimetype, + 'size' => filesize($this->path . $filename), + 'error' => UPLOAD_ERR_OK, + ); - public function data_imagick_path_windows() - { - return array( - array('C:\Windows', 'Configuration updated successfully'), - array('C:\Windows\foobar1', 'The entered path “C:\Windows\foobar1” does not exist.'), - array('C:\Windows\explorer.exe', 'The entered path “C:\Windows\explorer.exe” is not a directory.'), + $crawler = self::$client->request( + 'POST', + 'posting.php?mode=reply&t=1&sid=' . $this->sid, + $file_form_data, + array('fileupload' => $file) ); + + return $crawler; } - /** - * @dataProvider data_imagick_path_windows - */ - public function test_imagick_path_windows($imagick_path, $expected) + public function test_orphaned_attachments() { - if (strtolower(substr(PHP_OS, 0, 3)) !== 'win') - { - $this->markTestSkipped('Unable to test windows specific paths on other OS.'); - } - $this->login(); + $this->add_lang(['common', 'acp/common', 'acp/attachments']); + $crawler = $this->upload_file('valid.jpg', 'image/jpeg'); + + // Ensure there was no error message rendered + $this->assertStringNotContainsString('

      ' . $this->lang('INFORMATION') . '

      ', $this->get_content()); + + // Also the file name should be in the first row of the files table + $this->assertEquals('valid.jpg', $crawler->filter('span.file-name > a')->text()); + + // Get attach id, the link looks similar to ./download/attachment/3 + $attach_link = $crawler->filter('span.file-name > a')->attr('href'); + $matches = []; + preg_match('/\/([0-9]+)\/valid\.jpg$/', $attach_link, $matches); + $attach_id = (int) $matches[1]; + + // Set file time older than 3 hours to consider it orphan + $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' + SET filetime = filetime - ' . 4*60*60 . ' + WHERE attach_id = ' . (int) $attach_id; + $this->db->sql_query($sql); + $this->admin_login(); + $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_attachments&mode=orphan'); + $this->assertContainsLang('ACP_ORPHAN_ATTACHMENTS_EXPLAIN', $this->get_content()); + $this->assertStringContainsString('valid.jpg', $crawler->filter('tbody a')->text()); - $crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + "post_id[$attach_id]" => 99999, // Random + ]); + $form["add[$attach_id]"]->tick(); + $crawler = self::submit($form); - $form = $crawler->selectButton('Submit')->form(array('config[img_imagick]' => $imagick_path)); + $this->assertContainsLang('UPLOADING_FILES', $this->get_content()); + $this->assertStringContainsString($this->lang('UPLOADING_FILE_TO', 'valid.jpg', 99999), $this->get_content()); + $this->assertStringContainsString($this->lang('UPLOAD_POST_NOT_EXIST', 'valid.jpg', 99999), $crawler->filter('span[class="error"]')->text()); + // Delete the file + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + $form["delete[$attach_id]"]->tick(); $crawler = self::submit($form); - $this->assertContains($expected, $crawler->filter('#main')->text()); + + $this->assertContainsLang('NOTIFY', $crawler->filter('.successbox')->text()); + $this->assertStringContainsString(strip_tags($this->lang('LOG_ATTACH_ORPHAN_DEL', 'valid.jpg')), $crawler->filter('.successbox > p')->text()); } } diff --git a/tests/functional/acp_bbcodes_test.php b/tests/functional/acp_bbcodes_test.php index 58681dfa076..07ef3b444c1 100644 --- a/tests/functional/acp_bbcodes_test.php +++ b/tests/functional/acp_bbcodes_test.php @@ -24,8 +24,9 @@ public function test_htmlspecialchars() // Create the BBCode $crawler = self::request('GET', 'adm/index.php?i=acp_bbcodes&sid=' . $this->sid . '&mode=bbcodes&action=add'); $form = $crawler->selectButton('Submit')->form(array( - 'bbcode_match' => '[mod="{TEXT1}"]{TEXT2}[/mod]', - 'bbcode_tpl' => '
      {TEXT1}
      {TEXT2}
      ' + 'bbcode_match' => '[mod="{TEXT1}"]{TEXT2}[/mod]', + 'bbcode_tpl' => '
      {TEXT1}
      {TEXT2}
      ', + 'bbcode_font_icon' => 'user', )); self::submit($form); @@ -38,9 +39,77 @@ public function test_htmlspecialchars() $crawler = self::submit($form); $html = $crawler->filter('#preview')->html(); - $this->assertContains('
      a
      ', $html); - $this->assertContains('
      b
      ', $html); - $this->assertContains('
      c
      ', $html); - $this->assertContains('
      d
      ', $html); + $this->assertStringContainsString('
      a
      ', $html); + $this->assertStringContainsString('
      b
      ', $html); + $this->assertStringContainsString('
      c
      ', $html); + $this->assertStringContainsString('
      d
      ', $html); + } + + /** + * @dataProvider get_bbcode_error_tests + */ + public function test_bbcode_error($match, $tpl, $icon, $error) + { + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?i=acp_bbcodes&sid=' . $this->sid . '&mode=bbcodes&action=add'); + $form = $crawler->selectButton('Submit')->form([ + 'bbcode_match' => $match, + 'bbcode_tpl' => $tpl, + 'bbcode_font_icon' => $icon, + ]); + $crawler = self::submit($form); + + $text = $crawler->filter('.errorbox')->text(); + $this->assertStringContainsString($error, $text); + } + + public static function get_bbcode_error_tests() + { + return [ + [ + 'XXX', + '', + '', + 'BBCode is constructed in an invalid form' + ], + [ + '[x]{TEXT}[/x]', + '{TEXT}', + '', + 'unsafe' + ], + 'icon name too long' => [ + '[mod2="{TEXT1}"]{TEXT2}[/mod2]', + '
      {TEXT1}
      {TEXT2}
      ', + str_repeat('a', 65), + 'is too long', + ], + 'icon name invalid' => [ + '[mod2="{TEXT1}"]{TEXT2}[/mod2]', + '
      {TEXT1}
      {TEXT2}
      ', + 'Not a valid icon name', + 'is invalid', + ], + 'icon name invalid double dash' => [ + '[mod2="{TEXT1}"]{TEXT2}[/mod2]', + '
      {TEXT1}
      {TEXT2}
      ', + 'us--er', + 'is invalid', + ], + 'icon name invalid trailing dash' => [ + '[mod2="{TEXT1}"]{TEXT2}[/mod2]', + '
      {TEXT1}
      {TEXT2}
      ', + 'user-', + 'is invalid', + ], + ]; } } diff --git a/tests/functional/acp_groups_test.php b/tests/functional/acp_groups_test.php index 9dfdc93474b..3c6d228e879 100644 --- a/tests/functional/acp_groups_test.php +++ b/tests/functional/acp_groups_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_groups_test_case.php'; +require_once __DIR__ . '/common_groups_test_case.php'; /** * @group functional @@ -25,7 +25,7 @@ protected function get_url() return 'adm/index.php?i=groups&mode=manage&action=edit'; } - public function acp_group_test_data() + public static function acp_group_test_data() { return array( 'both_yes' => array( @@ -105,7 +105,7 @@ public function test_acp_groups_teampage($group_id, $tick_legend, $tick_teampage } } $crawler = self::submit($form); - $this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text()); + $this->assertStringContainsString($this->lang('GROUP_UPDATED'), $crawler->text()); $form = $this->get_group_manage_form($group_id); if (!isset($tick_legend) && !isset($tick_teampage)) @@ -117,8 +117,26 @@ public function test_acp_groups_teampage($group_id, $tick_legend, $tick_teampage else { $this->form_data = $form->getValues(); - $this->assertEquals($tick_legend, $this->form_data['group_legend']); - $this->assertEquals($tick_teampage, $this->form_data['group_teampage']); + // form_data[] values can be bool or null if not ticked, $tick_* value can be bool or null if not set. + // Cast both to the same type to correctly compare the values. + $this->assertEquals((bool) $tick_legend, (bool) ($this->form_data['group_legend'] ?? false)); + $this->assertEquals((bool) $tick_teampage, (bool) ($this->form_data['group_teampage'] ?? false)); } } + + public function test_acp_groups_create_existing_name() + { + $this->group_manage_login(); + + $crawler = self::request('GET', 'adm/index.php?i=groups&mode=manage&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'group_name' => 'Guests', // 'Guests' is the group name already in use for predefined Guests group + ]); + + $crawler = self::submit($form); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + $crawler = self::submit($form); // Just submit the form with selected group name + + $this->assertStringContainsString($this->lang('GROUP_NAME_TAKEN'), $crawler->text()); + } } diff --git a/tests/functional/acp_main_test.php b/tests/functional/acp_main_test.php new file mode 100644 index 00000000000..2caa3bbae26 --- /dev/null +++ b/tests/functional/acp_main_test.php @@ -0,0 +1,69 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_acp_main_test extends phpbb_functional_test_case +{ + public function test_acp_database_size() + { + $this->add_lang(['acp/common', 'acp/board']); + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid); + $this->assertContainsLang('WELCOME_PHPBB', $this->get_content()); + $this->assertContainsLang('ADMIN_INTRO', $this->get_content()); + $this->assertContainsLang('DATABASE_SIZE', $crawler->filter('tbody > tr')->eq(2)->filter('td[class="tabled"]')->eq(0)->text()); + $this->assertNotContainsLang('NOT_AVAILABLE', $crawler->filter('tbody > tr')->eq(2)->filter('td[class="tabled"]')->eq(1)->text()); + } + + public function test_all_acp_module_links() + { + $this->add_lang('common'); + $this->login(); + $this->admin_login(); + + // Browse ACP main page + $crawler = self::request('GET', 'index.php'); + $crawler = self::$client->click($crawler->selectLink($this->lang('ACP_SHORT'))->link()); + + // Get all ACP module URLs array + $acp_modules = $crawler->filter('.tabs a')->each( + function ($node, $i) + { + return $node->link(); + } + ); + + // Browse all ACP modules and get their mode URLs array + $acp_submodules = []; + foreach ($acp_modules as $module) + { + $crawler = self::$client->click($module); + $acp_submodules = array_merge($acp_submodules, $crawler->filter('.menu-block > ul a')->each( + function ($node, $i) + { + return $node->link(); + } + )); + } + + // Browse all ACP submodules' modes + foreach ($acp_submodules as $acp_submodule) + { + self::$client->click($acp_submodule); + } + } +} diff --git a/tests/functional/acp_permissions_test.php b/tests/functional/acp_permissions_test.php index 0a40e76057f..355dd1a21db 100644 --- a/tests/functional/acp_permissions_test.php +++ b/tests/functional/acp_permissions_test.php @@ -16,7 +16,7 @@ */ class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case { - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -31,24 +31,24 @@ public function test_permissions_tab() // XXX hardcoded id $crawler = self::request('GET', 'adm/index.php?i=16&sid=' . $this->sid); // these language strings are html - $this->assertContains($this->lang('ACP_PERMISSIONS_EXPLAIN'), $this->get_content()); + $this->assertStringContainsString($this->lang('ACP_PERMISSIONS_EXPLAIN'), $this->get_content()); } public function test_select_user() { // User permissions $crawler = self::request('GET', 'adm/index.php?i=acp_permissions&icat=16&mode=setting_user_global&sid=' . $this->sid); - $this->assertContains($this->lang('ACP_USERS_PERMISSIONS_EXPLAIN'), $this->get_content()); + $this->assertStringContainsString($this->lang('ACP_USERS_PERMISSIONS_EXPLAIN'), $this->get_content()); // Select admin $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); $data = array('username[0]' => 'admin'); $form->setValues($data); $crawler = self::submit($form); - $this->assertContains($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text()); + $this->assertStringContainsString($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text()); } - public function permissions_data() + public static function permissions_data() { return array( // description @@ -92,12 +92,13 @@ public function permissions_data() public function test_change_permission($description, $permission_type, $permission, $mode, $object_name, $object_id) { // Get the form - $crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=$mode&${object_name}[0]=$object_id&type=$permission_type&sid=" . $this->sid); - $this->assertContains($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text()); + $crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=$mode&{$object_name}[0]=$object_id&type=$permission_type&sid=" . $this->sid); + $this->assertStringContainsString($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text()); // XXX globals for \phpbb\auth\auth, refactor it later global $db, $cache; $db = $this->get_db(); + $cache = new phpbb_mock_null_cache; $auth = new \phpbb\auth\auth; @@ -115,7 +116,7 @@ public function test_change_permission($description, $permission_type, $permissi $data = array("setting[$object_id][0][$permission]" => '0'); $form->setValues($data); $crawler = self::submit($form); - $this->assertContains($this->lang('AUTH_UPDATED'), $crawler->text()); + $this->assertStringContainsString($this->lang('AUTH_UPDATED'), $crawler->text()); // check acl again $auth = new \phpbb\auth\auth; @@ -124,4 +125,51 @@ public function test_change_permission($description, $permission_type, $permissi $auth->acl($user_data); $this->assertEquals(0, $auth->acl_get($permission)); } + + public function test_forum_permissions_misc() + { + // Open forum moderators permissions page + $crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=setting_mod_local&sid=" . $this->sid); + + // Select "Your first forum" + $form = $crawler->filter('#select_victim')->form(['forum_id' => [2]]); + $crawler = self::submit($form); + + // Select "Global moderators" + $form = $crawler->filter('#add_groups')->form(['group_id' => [4]]); + $crawler = self::submit($form); + + // Check that global permissions are not displayed + $this->add_lang('acp/permissions_phpbb'); + $page_text = $crawler->text(); + $this->assertNotContainsLang('ACL_M_BAN', $page_text); + $this->assertNotContainsLang('ACL_M_PM_REPORT', $page_text); + $this->assertNotContainsLang('ACL_M_WARN', $page_text); + + // Check that other permissions exist + $this->assertContainsLang('ACL_M_EDIT', $page_text); + $this->assertContainsLang('ACL_M_MOVE', $page_text); + } + + public function test_tracing_user_based_permissions() + { + $this->create_user('newlyregistereduser'); + + // Open user-based permissions masks page + $crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=view_user_global&sid=" . $this->sid); + + // Select newlyregistereduser + $form = $crawler->filter('#add_user')->form(['username' => ['newlyregistereduser']]); + $crawler = self::submit($form); + + // Test 1st "Yes" permission tracing result match + $trace_link_yes = $crawler->filter('td.yes')->eq(0)->siblings()->filter('th > a.trace')->link(); + $crawler_trace_yes = self::$client->click($trace_link_yes); + $this->assertEquals(1, $crawler_trace_yes->filter('tr.row2 > td.yes')->count()); + + // Test 1st "Never" permission tracing result match + $trace_link_never = $crawler->filter('td.never')->eq(0)->siblings()->filter('th > a.trace')->link(); + $crawler_trace_never = self::$client->click($trace_link_never); + $this->assertEquals(1, $crawler_trace_never->filter('tr.row2 > td.never')->count()); + } } diff --git a/tests/functional/acp_post_settings_test.php b/tests/functional/acp_post_settings_test.php new file mode 100644 index 00000000000..6d03d4c8534 --- /dev/null +++ b/tests/functional/acp_post_settings_test.php @@ -0,0 +1,61 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_acp_post_settings_test extends phpbb_functional_test_case +{ + public function test_allowed_schemes_links() + { + $this->add_lang(['acp/common', 'acp/board']); + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=post&sid=' . $this->sid); + $this->assertContainsLang('ACP_POST_SETTINGS_EXPLAIN', $this->get_content()); + + // Test trailing comma - invalid + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[allowed_schemes_links]' => 'http,https,ftp,' + ]); + $crawler = self::submit($form); + $this->assertContainsLang('WARNING', $crawler->filter('div[class="errorbox"] > h3')->text()); + $this->assertStringContainsString($this->lang('CSV_INVALID', $this->lang('ALLOWED_SCHEMES_LINKS')), $crawler->filter('div[class="errorbox"] > p')->text()); + + // Test trailing comma and invalid scheme - invalid + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[allowed_schemes_links]' => 'http,https,2ftp,' + ]); + $crawler = self::submit($form); + $this->assertContainsLang('WARNING', $crawler->filter('div[class="errorbox"] > h3')->text()); + $this->assertStringContainsString($this->lang('CSV_INVALID', $this->lang('ALLOWED_SCHEMES_LINKS')), $crawler->filter('div[class="errorbox"] > p')->text()); + $this->assertStringContainsString($this->lang('URL_SCHEME_INVALID', $this->lang('ALLOWED_SCHEMES_LINKS'), '2ftp'), $crawler->filter('div[class="errorbox"] > p')->text()); + + // Test empty setting - valid + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[allowed_schemes_links]' => '' + ]); + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); + + // Restore default setting - 'http,https,ftp' + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=post&sid=' . $this->sid); + $this->assertContainsLang('ACP_POST_SETTINGS_EXPLAIN', $this->get_content()); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[allowed_schemes_links]' => 'http,https,ftp' + ]); + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); + } +} diff --git a/tests/functional/acp_profile_field_test.php b/tests/functional/acp_profile_field_test.php index 88df782faae..7413c34980f 100644 --- a/tests/functional/acp_profile_field_test.php +++ b/tests/functional/acp_profile_field_test.php @@ -16,7 +16,7 @@ */ class phpbb_functional_acp_profile_field_test extends phpbb_functional_test_case { - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -25,21 +25,23 @@ public function setUp() $this->add_lang('acp/profile'); } - public function data_add_profile_field() + public static function data_add_profile_field() { return array( - array('bool', 'profilefields.type.bool', + array('profilefields.type.bool', array( + 'field_ident' => 'bool', + 'lang_name' => 'bool', 'lang_options[0]' => 'foo', 'lang_options[1]' => 'bar', ), - array(), ), - array('dropdown', 'profilefields.type.dropdown', + array('profilefields.type.dropdown', array( + 'field_ident' => 'dropdown', + 'lang_name' => 'dropdown', 'lang_options' => "foo\nbar\nbar\nfoo", ), - array(), ), ); } @@ -47,13 +49,12 @@ public function data_add_profile_field() /** * @dataProvider data_add_profile_field */ - public function test_add_profile_field($name, $type, $page1_settings, $page2_settings) + public function test_add_profile_field($type, $page1_settings) { // Custom profile fields page $crawler = self::request('GET', 'adm/index.php?i=acp_profile&mode=profile&sid=' . $this->sid); // these language strings are html $form = $crawler->selectButton('Create new field')->form(array( - 'field_ident' => $name, 'field_type' => $type, )); $crawler = self::submit($form); @@ -63,9 +64,37 @@ public function test_add_profile_field($name, $type, $page1_settings, $page2_set $crawler = self::submit($form); // Fill form for profile field specific options - $form = $crawler->selectButton('Save')->form($page2_settings); + $form = $crawler->selectButton('Save')->form(); $crawler= self::submit($form); $this->assertContainsLang('ADDED_PROFILE_FIELD', $crawler->text()); } + + public function test_edit_profile_fields() + { + // Custom profile fields page + $crawler = self::request('GET', 'adm/index.php?i=acp_profile&mode=profile&sid=' . $this->sid); + + // Get all profile fields edit URLs + $edits = $crawler->filter('td.actions a') + ->reduce( + function ($node, $i) { + $url = $node->attr('href'); + return ((bool) strpos($url, 'action=edit')); + }) + ->each( + function ($node, $i) { + $url = $node->attr('href'); + return ($url); + }); + + foreach ($edits as $edit_url) + { + $crawler = self::request('GET', 'adm/' . $edit_url . '&sid=' . $this->sid); + $form = $crawler->selectButton('Save')->form(); + $crawler= self::submit($form); + + $this->assertContainsLang('CHANGED_PROFILE_FIELD', $crawler->text()); + } + } } diff --git a/tests/functional/acp_registration_test.php b/tests/functional/acp_registration_test.php index ef9843679e7..08601f2d2ed 100644 --- a/tests/functional/acp_registration_test.php +++ b/tests/functional/acp_registration_test.php @@ -28,9 +28,7 @@ protected function set_email_enable($db, $status) public function test_submitting_activation_method() { - $db = $this->get_db(); - - $this->set_email_enable($db, false); + $this->set_email_enable($this->db, false); $this->add_lang('acp/board'); $this->login(); @@ -50,6 +48,6 @@ public function test_submitting_activation_method() $crawler = self::submit($form); $this->assertNotContainsLang('ACC_ACTIVATION_WARNING', $crawler->filter('div.main')->text()); - $this->set_email_enable($db, true); + $this->set_email_enable($this->db, true); } } diff --git a/tests/functional/acp_smilies_test.php b/tests/functional/acp_smilies_test.php index ebe8717fa79..12001c0f0a1 100644 --- a/tests/functional/acp_smilies_test.php +++ b/tests/functional/acp_smilies_test.php @@ -24,8 +24,8 @@ public function test_htmlspecialchars() // Create the BBCode $crawler = self::request('GET', 'adm/index.php?i=acp_icons&sid=' . $this->sid . '&mode=smilies&action=edit&id=1'); $form = $crawler->selectButton('Submit')->form(array( - 'code[icon_e_biggrin.gif]' => '>:D', - 'emotion[icon_e_biggrin.gif]' => '>:D' + 'code[icon_e_biggrin.svg]' => '>:D', + 'emotion[icon_e_biggrin.svg]' => '>:D' )); self::submit($form); @@ -38,6 +38,15 @@ public function test_htmlspecialchars() $crawler = self::submit($form); $html = $crawler->filter('#preview')->html(); - $this->assertRegexp('(]+ alt=">:D" title=">:D"[^>]*>)', $html); + + // Native HTML5 parser (PHP 8.4+) will encode entities + if (\PHP_VERSION_ID >= 80400) + { + $this->assertMatchesRegularExpression('(]+ alt=">:D" title=">:D"[^>]*>)', $html); + } + else + { + $this->assertMatchesRegularExpression('(]+ alt=">:D" title=">:D"[^>]*>)', $html); + } } } diff --git a/tests/functional/acp_storage_settings_test.php b/tests/functional/acp_storage_settings_test.php new file mode 100644 index 00000000000..f8c1728dcb2 --- /dev/null +++ b/tests/functional/acp_storage_settings_test.php @@ -0,0 +1,93 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_acp_storage_settings_test extends phpbb_functional_test_case +{ + public function test_storage_settings() + { + $this->add_lang(['common', 'acp/storage']); + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?i=acp_storage&mode=settings&sid=' . $this->sid); + $this->assertContainsLang('STORAGE_TITLE', $this->get_content()); + $this->assertContainsLang('STORAGE_TITLE_EXPLAIN', $this->get_content()); + + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + $crawler = self::submit($form); + $this->assertContainsLang('INFORMATION', $crawler->filter('div[class="errorbox"] > h3')->text()); + $this->assertContainsLang('STORAGE_NO_CHANGES', $crawler->filter('div[class="errorbox"] > p')->text()); + + // Test empty storage paths - invalid + $crawler = self::request('GET', 'adm/index.php?i=acp_storage&mode=settings&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'attachment[path]' => '', + 'avatar[path]' => '', + 'backup[path]' => '', + ]); + $crawler = self::submit($form); + $this->assertContainsLang('INFORMATION', $crawler->filter('div[class="errorbox"] > h3')->text()); + $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_SET', $this->lang('STORAGE_ATTACHMENT_TITLE')), $crawler->filter('div[class="errorbox"] > p')->text()); + $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_SET', $this->lang('STORAGE_AVATAR_TITLE')), $crawler->filter('div[class="errorbox"] > p')->text()); + $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_SET', $this->lang('STORAGE_BACKUP_TITLE')), $crawler->filter('div[class="errorbox"] > p')->text()); + + // Test storage paths became not writable on the server afterwards + // Unix tests only + if (!defined('PHP_WINDOWS_VERSION_MAJOR')) + { + $crawler = self::request('GET', 'adm/index.php?i=acp_storage&mode=settings&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + $values = $form->getValues(); + + $attachments_storage_path = $values['attachment[path]']; + $avatar_upload_path = $values['avatar[path]']; + $backup_storage_path = $values['backup[path]']; + + $filesystem = new \phpbb\filesystem\filesystem; + + // Make the directory not writable + global $phpbb_root_path; + $filesystem->chmod($phpbb_root_path . $attachments_storage_path, 444); + $filesystem->chmod($phpbb_root_path . $avatar_upload_path, 444); + $filesystem->chmod($phpbb_root_path . $backup_storage_path, 444); + $this->assertFalse($filesystem->is_writable($phpbb_root_path . $avatar_upload_path)); + + // Visit ACP Storage settings again - warning should be displayed + $crawler = self::request('GET', 'adm/index.php?i=acp_storage&mode=settings&sid=' . $this->sid); + $this->assertContainsLang('WARNING', $crawler->filter('div[class="errorbox"] > h3')->text()); + $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_ATTACHMENT_TITLE')), $crawler->filter('div[class="errorbox"]')->text()); + $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_AVATAR_TITLE')), $crawler->filter('div[class="errorbox"]')->text()); + $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_BACKUP_TITLE')), $crawler->filter('div[class="errorbox"]')->text()); + + // Restore default state + $filesystem->chmod($phpbb_root_path . $attachments_storage_path, 777); + $filesystem->chmod($phpbb_root_path . $avatar_upload_path, 777); + $filesystem->chmod($phpbb_root_path . $backup_storage_path, 777); + $this->assertTrue($filesystem->is_writable($phpbb_root_path . $attachments_storage_path)); + $this->assertTrue($filesystem->is_writable($phpbb_root_path . $avatar_upload_path)); + $this->assertTrue($filesystem->is_writable($phpbb_root_path . $backup_storage_path)); + + $crawler = self::request('GET', 'adm/index.php?i=acp_storage&mode=settings&sid=' . $this->sid); + $this->assertStringNotContainsString($this->lang('STORAGE_PATH_NOT_SET', $this->lang('STORAGE_ATTACHMENT_TITLE')), $this->get_content()); + $this->assertStringNotContainsString($this->lang('STORAGE_PATH_NOT_SET', $this->lang('STORAGE_AVATAR_TITLE')), $this->get_content()); + $this->assertStringNotContainsString($this->lang('STORAGE_PATH_NOT_SET', $this->lang('STORAGE_BACKUP_TITLE')), $this->get_content()); + + $this->assertStringNotContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_ATTACHMENT_TITLE')), $this->get_content()); + $this->assertStringNotContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_AVATAR_TITLE')), $this->get_content()); + $this->assertStringNotContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_BACKUP_TITLE')), $this->get_content()); + } + } +} diff --git a/tests/functional/acp_storage_test.php b/tests/functional/acp_storage_test.php new file mode 100644 index 00000000000..8f28f45c436 --- /dev/null +++ b/tests/functional/acp_storage_test.php @@ -0,0 +1,29 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_acp_storage_test extends phpbb_functional_test_case +{ + public function test_acp_storage_free_space() + { + $this->add_lang(['acp/common', 'acp/storage']); + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?i=acp_storage&mode=settings&sid=' . $this->sid); + $this->assertContainsLang('STORAGE_TITLE', $this->get_content()); + $this->assertNotContainsLang('STORAGE_UNKNOWN', $crawler->filter('div#main div.main table.table1')->text()); + } +} diff --git a/tests/functional/acp_test.php b/tests/functional/acp_test.php new file mode 100644 index 00000000000..d390d3158bd --- /dev/null +++ b/tests/functional/acp_test.php @@ -0,0 +1,71 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_acp_test extends phpbb_functional_test_case +{ + public function test_all_acp_module_links() + { + $this->login(); + $this->admin_login(); + $this->add_lang(['common']); + + // Browse ACP main page + $crawler = self::request('GET', 'index.php'); + $crawler = self::$client->click($crawler->selectLink($this->lang('ACP_SHORT'))->link()); + self::assert_response_html(); + + // Get all ACP module URLs array + $acp_modules = $crawler->filter('li.tab a')->each( + function ($node, $i) + { + // Filter out responsive mode links + if (empty($node->attr('class'))) + { + return $node->link(); + } + } + ); + $this->assertNotEmpty($acp_modules); + + // Browse all ACP modules and get their mode URLs array + $acp_submodules = []; + foreach ($acp_modules as $module) + { + $crawler = self::$client->click($module); + self::assert_response_html(); + $acp_submodules = array_merge($acp_submodules, $crawler->filter('div.menu-block li a')->each( + function ($node, $i) + { + return $node->link(); + } + )); + } + $this->assertNotEmpty($acp_submodules); + + // Browse all ACP submodules' modes + foreach ($acp_submodules as $acp_submodule) + { + // Don't click the ACP Extensions Catalog to prevent calling an external HTTP service in the test suite + if ($acp_submodule->getNode()->textContent === $this->lang('ACP_EXTENSIONS_CATALOG')) + { + continue; + } + + self::$client->click($acp_submodule); + self::assert_response_html(); + } + } +} diff --git a/tests/functional/acp_users_test.php b/tests/functional/acp_users_test.php index 78028aacb8b..2470b55f06b 100644 --- a/tests/functional/acp_users_test.php +++ b/tests/functional/acp_users_test.php @@ -16,7 +16,7 @@ */ class phpbb_functional_acp_users_test extends phpbb_functional_test_case { - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -34,7 +34,7 @@ public function test_founder_deletion() $crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u=$user_id&sid={$this->sid}"); $form = $crawler->filter('#user_delete')->selectButton($this->lang('SUBMIT'))->form(); $crawler = self::submit($form); - $this->assertContains($this->lang('CANNOT_REMOVE_FOUNDER'), $this->get_content()); + $this->assertStringContainsString($this->lang('CANNOT_REMOVE_FOUNDER'), $this->get_content()); } protected function make_founder($user_id) @@ -44,6 +44,6 @@ protected function make_founder($user_id) $data = array('user_founder' => '1'); $form->setValues($data); $crawler = self::submit($form); - $this->assertContains($this->lang('USER_OVERVIEW_UPDATED'), $this->get_content()); + $this->assertStringContainsString($this->lang('USER_OVERVIEW_UPDATED'), $this->get_content()); } } diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php index 76e1709afbb..d2cf623b4a6 100644 --- a/tests/functional/auth_test.php +++ b/tests/functional/auth_test.php @@ -22,7 +22,7 @@ public function test_login() // check for logout link $crawler = self::request('GET', 'index.php'); - $this->assertContains($this->lang('LOGOUT', 'admin'), $crawler->filter('.navbar')->text()); + $this->assertStringContainsString($this->lang('LOGOUT', 'admin'), $crawler->filter('.navbar')->text()); } public function test_login_other() @@ -30,7 +30,7 @@ public function test_login_other() $this->create_user('anothertestuser'); $this->login('anothertestuser'); $crawler = self::request('GET', 'index.php'); - $this->assertContains('anothertestuser', $crawler->filter('#username_logged_in')->text()); + $this->assertStringContainsString('anothertestuser', $crawler->filter('#username_logged_in')->text()); } /** @@ -40,15 +40,14 @@ public function test_login_ucp_other_auth_provider() { global $cache, $config; $cache = new phpbb_mock_null_cache; - $db = $this->get_db(); $sql = 'UPDATE ' . CONFIG_TABLE . " SET config_value = 'foobar' WHERE config_name = 'auth_method'"; - $db->sql_query($sql); + $this->db->sql_query($sql); $config['auth_method'] = 'foobar'; $this->login('anothertestuser'); $crawler = self::request('GET', 'index.php'); - $this->assertContains('anothertestuser', $crawler->filter('#username_logged_in')->text()); + $this->assertStringContainsString('anothertestuser', $crawler->filter('#username_logged_in')->text()); $sql = 'UPDATE ' . CONFIG_TABLE . " SET config_value = 'db' WHERE config_name = 'auth_method'"; - $db->sql_query($sql); + $this->db->sql_query($sql); $config['auth_method'] = 'db'; } @@ -60,12 +59,7 @@ public function test_logout() $this->login(); $this->add_lang('ucp'); - // logout - $crawler = self::request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout'); - - // look for a register link, which should be visible only when logged out - $crawler = self::request('GET', 'index.php'); - $this->assertContains($this->lang('REGISTER'), $crawler->filter('.navbar')->text()); + $this->logout(); } public function test_acp_login() @@ -75,6 +69,65 @@ public function test_acp_login() // check that we are logged in $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid); - $this->assertContains($this->lang('ADMIN_PANEL'), $crawler->filter('h1')->text()); + $this->assertStringContainsString($this->lang('ADMIN_PANEL'), $crawler->filter('h1')->text()); + } + + public function test_board_auth_oauth_setting() + { + $this->login(); + $this->admin_login(); + $this->add_lang(['ucp', 'acp/board']); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=auth&sid=' . $this->sid); + $this->assertStringContainsString($this->lang('AUTH_METHOD'), $crawler->filter('label[for="auth_method"]')->text()); + + // Set OAuth authentication method for Google with random keys + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[auth_method]' => 'oauth', + 'config[auth_oauth_google_key]' => '123456', + 'config[auth_oauth_google_secret]' => '123456', + ]); + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); + + // Test OAuth linking via UCP + $crawler = self::request('GET', 'ucp.php?i=ucp_auth_link&mode=auth_link&sid=' . $this->sid); + $this->assertStringContainsString($this->lang('AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'), $crawler->filter('h3')->text()); + $form = $crawler->selectButton($this->lang('UCP_AUTH_LINK_LINK'))->form(); + $crawler = self::submit($form); + $this->assertStringContainsString('accounts.google.com', $crawler->filter('base')->attr('href')); + + // Test OAuth linking for registration + $this->logout(); + $crawler = self::request('GET', 'ucp.php?mode=register'); + $this->assertContainsLang('REGISTRATION', $crawler->filter('div.content h2')->text()); + $form = $crawler->selectButton('I agree to these terms')->form(); + $crawler = self::submit($form); + $this->assertContainsLang('AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE', $crawler->filter('a.button1')->text()); + $crawler = self::request('GET', 'ucp.php?mode=login&login=external&oauth_service=google'); + $this->assertStringContainsString('accounts.google.com', $crawler->filter('base')->attr('href')); + + // Restore default auth method, but unset random keys first + // Restart webclient as we were redirected to external site before + self::$client->restart(); + + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=auth&sid=' . $this->sid); + $this->assertStringContainsString($this->lang('AUTH_METHOD'), $crawler->filter('label[for="auth_method"]')->text()); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[auth_oauth_google_key]' => '', + 'config[auth_oauth_google_secret]' => '', + ]); + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=auth&sid=' . $this->sid); + $this->assertStringContainsString($this->lang('AUTH_METHOD'), $crawler->filter('label[for="auth_method"]')->text()); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[auth_method]' => 'db', + ]); + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); } } diff --git a/tests/functional/avatar_acp_groups_test.php b/tests/functional/avatar_acp_groups_test.php index ca8c84ab2e5..6bdef1c499c 100644 --- a/tests/functional/avatar_acp_groups_test.php +++ b/tests/functional/avatar_acp_groups_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_avatar_test_case.php'; +require_once __DIR__ . '/common_avatar_test_case.php'; /** * @group functional @@ -23,7 +23,7 @@ public function get_url() return 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5'; } - public function avatar_acp_groups_data() + public static function avatar_acp_groups_data() { return array( // Correct Gravatar @@ -38,12 +38,12 @@ public function avatar_acp_groups_data() ), // Gravatar with incorrect size array( - 'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.', + 'The submitted avatar is 140 wide and 140 high. Avatars must be at least 40 wide and 40 high, but no larger than 120 wide and 120 high.', 'avatar_driver_gravatar', array( 'avatar_gravatar_email' => 'test@example.com', - 'avatar_gravatar_width' => 120, - 'avatar_gravatar_height' => 120, + 'avatar_gravatar_width' => 140, + 'avatar_gravatar_height' => 140, ), ), // Delete avatar image to reset group settings @@ -55,12 +55,12 @@ public function avatar_acp_groups_data() ), ), array( - 'The URL you specified is invalid.', - 'avatar_driver_remote', + 'EMAIL_INVALID_EMAIL', + 'avatar_driver_gravatar', array( - 'avatar_remote_url' => 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', - 'avatar_remote_width' => 80, - 'avatar_remote_height' => 80, + 'avatar_gravatar_email' => 'foobar123', + 'avatar_gravatar_width' => 120, + 'avatar_gravatar_height' => 120, ), ), ); @@ -80,6 +80,6 @@ public function test_no_avatar_acp_groups() $crawler = self::request('GET', $this->get_url() . '&sid=' . $this->sid); $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); $form_data = $form->getValues(); - $this->assertEmpty($form_data['avatar_type']); + $this->assertFalse(isset($form_data['avatar_type'])); } } diff --git a/tests/functional/avatar_acp_users_test.php b/tests/functional/avatar_acp_users_test.php index 8b05a286580..d674495dd36 100644 --- a/tests/functional/avatar_acp_users_test.php +++ b/tests/functional/avatar_acp_users_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_avatar_test_case.php'; +require_once __DIR__ . '/common_avatar_test_case.php'; /** * @group functional @@ -23,7 +23,7 @@ public function get_url() return 'adm/index.php?i=acp_users&u=2&mode=avatar'; } - public function avatar_acp_users_data() + public static function avatar_acp_users_data() { return array( // Gravatar with incorrect email @@ -39,9 +39,11 @@ public function avatar_acp_users_data() // Remote avatar with correct link array( 'USER_AVATAR_UPDATED', - 'avatar_driver_upload', + 'avatar_driver_gravatar', array( - 'avatar_upload_url' => 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', + 'avatar_gravatar_email' => 'test@example.com', + 'avatar_gravatar_width' => 80, + 'avatar_gravatar_height' => 80, ), ), // Reset avatar settings diff --git a/tests/functional/avatar_ucp_groups_test.php b/tests/functional/avatar_ucp_groups_test.php index 52ef67543e6..800c98ecf10 100644 --- a/tests/functional/avatar_ucp_groups_test.php +++ b/tests/functional/avatar_ucp_groups_test.php @@ -10,7 +10,7 @@ * the docs/CREDITS.txt file. * */ -require_once dirname(__FILE__) . '/common_avatar_test_case.php'; +require_once __DIR__ . '/common_avatar_test_case.php'; /** * @group functional @@ -22,15 +22,17 @@ public function get_url() return 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5'; } - public function avatar_ucp_groups_data() + public static function avatar_ucp_groups_data() { return array( - // Incorrect URL + // Gravatar with incorrect email array( - 'AVATAR_URL_INVALID', - 'avatar_driver_upload', + 'EMAIL_INVALID_EMAIL', + 'avatar_driver_gravatar', array( - 'avatar_upload_url' => 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80', + 'avatar_gravatar_email' => 'test.example.com', + 'avatar_gravatar_width' => 80, + 'avatar_gravatar_height' => 80, ), ), /* @@ -47,11 +49,11 @@ public function avatar_ucp_groups_data() // Correct remote avatar array( 'GROUP_UPDATED', - 'avatar_driver_remote', + 'avatar_driver_gravatar', array( - 'avatar_remote_url' => 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', - 'avatar_remote_width' => 80, - 'avatar_remote_height' => 80, + 'avatar_gravatar_email' => 'test@example.com', + 'avatar_gravatar_width' => 80, + 'avatar_gravatar_height' => 80, ), ), array( diff --git a/tests/functional/avatar_ucp_users_test.php b/tests/functional/avatar_ucp_users_test.php index 2f0832e0928..60e0ea8a638 100644 --- a/tests/functional/avatar_ucp_users_test.php +++ b/tests/functional/avatar_ucp_users_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_avatar_test_case.php'; +require_once __DIR__ . '/common_avatar_test_case.php'; /** * @group functional @@ -23,7 +23,7 @@ public function get_url() return 'ucp.php?i=ucp_profile&mode=avatar'; } - public function avatar_ucp_groups_data() + public static function avatar_ucp_groups_data() { return array( // Gravatar with correct settings @@ -58,15 +58,17 @@ public function test_avatar_ucp_groups($expected, $avatar_type, $data) public function test_display_upload_avatar() { $this->assert_avatar_submit('PROFILE_UPDATED', - 'avatar_driver_upload', + 'avatar_driver_gravatar', array( - 'avatar_upload_url' => 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', - ) + 'avatar_gravatar_email' => 'test@example.com', + 'avatar_gravatar_width' => 80, + 'avatar_gravatar_height' => 80, + ), ); $crawler = self::request('GET', $this->get_url() . '&sid=' . $this->sid); $avatar_link = $crawler->filter('img')->attr('src'); - $crawler = self::request('GET', $avatar_link . '&sid=' . $this->sid, array(), false); + self::request('GET', $avatar_link . '&sid=' . $this->sid, array(), false); $content = self::$client->getResponse()->getContent(); self::assertEquals(false, stripos(trim($content), 'debug'), 'Output contains debug message'); } diff --git a/tests/functional/browse_disabled_test.php b/tests/functional/browse_disabled_test.php new file mode 100644 index 00000000000..490d5863fe3 --- /dev/null +++ b/tests/functional/browse_disabled_test.php @@ -0,0 +1,163 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_browse_disabled_test extends phpbb_functional_test_case +{ + public function setUp(): void + { + parent::setUp(); + + $this->login(); + $this->admin_login(); + + // Disable board + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=settings&sid=' . $this->sid); + $form = $crawler->selectButton('Submit')->form(); + $form->setValues(['config[board_disable]' => 1]); + + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); + + $this->logout(); + } + + public function tearDown(): void + { + $this->login(); + $this->admin_login(); + + // Disable board + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=settings&sid=' . $this->sid); + $form = $crawler->selectButton('Submit')->form(); + $form->setValues(['config[board_disable]' => 0]); + + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); + + $this->logout(); + + parent::tearDown(); + } + + public function test_disabled_index_admin() + { + $this->login(); + $this->admin_login(); + + // Board should be fully visible for all variations for admins + for ($i = 0; $i <= 2; $i++) + { + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=settings&sid=' . $this->sid); + $form = $crawler->selectButton('Submit')->form(); + $form->setValues(['config[board_disable_access]' => $i]); + + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); + + $crawler = self::request('GET', 'index.php'); + $this->assertGreaterThan(0, $crawler->filter('.topiclist')->count()); + $this->assertContainsLang('BOARD_DISABLED', $crawler->filter('div[class="rules"]')->text()); + } + + $this->logout(); + } + + public function test_disabled_index_global_moderator() + { + $this->create_user('moderator-disabled-index'); + $this->add_user_group('GLOBAL_MODERATORS', ['moderator-disabled-index']); + + // Board should be fully visible for options 1 & 2 + for ($i = 0; $i <= 2; $i++) + { + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=settings&sid=' . $this->sid); + $form = $crawler->selectButton('Submit')->form(); + $form->setValues(['config[board_disable_access]' => $i]); + + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); + + $this->logout(); + + $this->login('moderator-disabled-index'); + + $crawler = self::request('GET', 'index.php'); + + if ($i == 0) + { + $this->assertEquals(0, $crawler->filter('.topiclist')->count(), 'Board should not be visible for option ' . $i); + $this->assertContainsLang('BOARD_DISABLE', $crawler->filter('div#message')->text()); + } + else + { + $this->assertGreaterThan(0, $crawler->filter('.topiclist')->count(), 'Board should be visible for option ' . $i); + $this->assertContainsLang('BOARD_DISABLED', $crawler->filter('div[class="rules"]')->text()); + } + $this->logout(); + } + } + + public function test_disabled_index_local_moderator() + { + $user_id = $this->create_user('moduser-disabled-index'); + + // Set m_delete to yes for user --> user has moderator permission + $this->add_lang('acp/permissions'); + $this->login(); + $this->admin_login(); + $crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=setting_user_local&user_id[0]=$user_id&forum_id[0]=2&type=m_&sid={$this->sid}"); + $form = $crawler->selectButton($this->lang('APPLY_PERMISSIONS'))->form(); + $data = array("setting[$user_id][2][m_edit]" => ACL_YES); + $form->setValues($data); + self::submit($form); + $this->logout(); + + // Board should be fully visible for option 2 only + for ($i = 0; $i <= 2; $i++) + { + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=settings&sid=' . $this->sid); + $form = $crawler->selectButton('Submit')->form(); + $form->setValues(['config[board_disable_access]' => $i]); + + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); + + $this->logout(); + + $this->login('moduser-disabled-index'); + + $crawler = self::request('GET', 'index.php'); + + if ($i < 2) + { + $this->assertEquals(0, $crawler->filter('.topiclist')->count(), 'Board should not be visible for option ' . $i); + $this->assertContainsLang('BOARD_DISABLE', $crawler->filter('div#message')->text()); + } + else + { + $this->assertGreaterThan(0, $crawler->filter('.topiclist')->count(), 'Board should be visible for option ' . $i); + $this->assertContainsLang('BOARD_DISABLED', $crawler->filter('div[class="rules"]')->text()); + } + $this->logout(); + } + } +} diff --git a/tests/functional/common_avatar_test_case.php b/tests/functional/common_avatar_test_case.php index 924eb1273cf..c796363a13a 100644 --- a/tests/functional/common_avatar_test_case.php +++ b/tests/functional/common_avatar_test_case.php @@ -17,11 +17,10 @@ abstract class phpbb_functional_common_avatar_test_case extends phpbb_functional_test_case { private $path; - private $form_content; abstract function get_url(); - public function setUp() + protected function setUp(): void { parent::setUp(); $this->path = __DIR__ . '/fixtures/files/'; @@ -36,7 +35,6 @@ private function set_acp_settings() $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid); // Check the default entries we should have $this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text()); - $this->assertContainsLang('ALLOW_REMOTE_UPLOAD', $crawler->text()); $this->assertContainsLang('ALLOW_AVATARS', $crawler->text()); $this->assertContainsLang('ALLOW_LOCAL', $crawler->text()); @@ -44,8 +42,6 @@ private function set_acp_settings() $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); $form['config[allow_avatar_local]']->select(1); $form['config[allow_avatar_gravatar]']->select(1); - $form['config[allow_avatar_remote]']->select(1); - $form['config[allow_avatar_remote_upload]']->select(1); $crawler = self::submit($form); $this->assertContainsLang('CONFIG_UPDATED', $crawler->text()); } @@ -84,7 +80,7 @@ public function assert_avatar_submit($expected, $type, $data, $delete = false, $ } catch (Exception $e) { - $this->assertContains($expected, $crawler->text()); + $this->assertStringContainsString($expected, $crawler->text()); } if ($delete) diff --git a/tests/functional/common_groups_test_case.php b/tests/functional/common_groups_test_case.php index 521b7c84d20..d3ee795c3b3 100644 --- a/tests/functional/common_groups_test_case.php +++ b/tests/functional/common_groups_test_case.php @@ -47,20 +47,17 @@ protected function enable_all_avatars() $crawler = self::request('GET', 'adm/index.php?i=board&mode=avatar&sid=' . $this->sid); // Check the default entries we should have - $this->assertContains($this->lang('ALLOW_REMOTE_UPLOAD'), $crawler->text()); - $this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text()); - $this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text()); + $this->assertStringContainsString($this->lang('ALLOW_AVATARS'), $crawler->text()); + $this->assertStringContainsString($this->lang('ALLOW_LOCAL'), $crawler->text()); // Now start setting the needed settings $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); $form['config[allow_avatar_local]']->select(1); - $form['config[allow_avatar_remote]']->select(1); - $form['config[allow_avatar_remote_upload]']->select(1); $crawler = self::submit($form); - $this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text()); + $this->assertStringContainsString($this->lang('CONFIG_UPDATED'), $crawler->text()); } - public function groups_manage_test_data() + public static function groups_manage_test_data() { return array( array('', 'GROUP_UPDATED'), @@ -82,36 +79,6 @@ public function test_groups_manage($input, $expected) $form = $this->get_group_manage_form(); $form['group_colour']->setValue($input); $crawler = self::submit($form); - $this->assertContains($this->lang($expected), $crawler->text()); - } - - public function group_avatar_min_max_data() - { - return array( - array('avatar_driver_upload', 'avatar_upload_url', 'foo', 'AVATAR_URL_INVALID'), - array('avatar_driver_upload', 'avatar_upload_url', 'foobar', 'AVATAR_URL_INVALID'), - array('avatar_driver_upload', 'avatar_upload_url', 'http://www.phpbb.com/' . str_repeat('f', 240) . '.png', 'TOO_LONG'), - array('avatar_driver_remote', 'avatar_remote_url', 'foo', 'AVATAR_URL_INVALID'), - array('avatar_driver_remote', 'avatar_remote_url', 'foobar', 'AVATAR_URL_INVALID'), - array('avatar_driver_remote', 'avatar_remote_url', 'http://www.phpbb.com/' . str_repeat('f', 240) . '.png', 'TOO_LONG'), - ); - } - - /** - * @dataProvider group_avatar_min_max_data - */ - public function test_group_avatar_min_max($avatar_type, $form_name, $input, $expected) - { - $this->login(); - $this->admin_login(); - $this->add_lang(array('ucp', 'acp/groups')); - $this->enable_all_avatars(); - - $crawler = self::request('GET', $this->get_url() . '&g=5&sid=' . $this->sid); - $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); - $form['avatar_driver']->setValue($avatar_type); - $form[$form_name]->setValue($input); - $crawler = self::submit($form); - $this->assertContains($this->lang($expected), $crawler->text()); + $this->assertStringContainsString($this->lang($expected), $crawler->text()); } } diff --git a/tests/functional/controllers_compatibility_test.php b/tests/functional/controllers_compatibility_test.php index 36a34aa7c8a..03fe6f07ef5 100644 --- a/tests/functional/controllers_compatibility_test.php +++ b/tests/functional/controllers_compatibility_test.php @@ -58,7 +58,7 @@ protected function assert301($from, $to) $location = substr($location, 0, -1); } - $this->assertEquals(301, self::$client->getResponse()->getStatus()); + $this->assertEquals(301, self::$client->getResponse()->getStatusCode()); $this->assertStringEndsWith($to, $location); } } diff --git a/tests/functional/download_test.php b/tests/functional/download_test.php index e2f1d065be0..ec67e9e42a5 100644 --- a/tests/functional/download_test.php +++ b/tests/functional/download_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_posting.php'; /** * @group functional @@ -49,15 +49,15 @@ public function test_create_post() $post = $this->create_topic($this->data['forums']['Download #1'], 'Download Topic #1', 'This is a test topic posted by the testing framework.', array('upload_files' => 1)); $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - $this->assertContains('Download Topic #1', $crawler->filter('html')->text()); + $this->assertStringContainsString('Download Topic #1', $crawler->filter('html')->text()); $this->data['topics']['Download Topic #1'] = (int) $post['topic_id']; $this->data['posts']['Download Topic #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); // Test creating a reply $post2 = $this->create_post($this->data['forums']['Download #1'], $post['topic_id'], 'Re: Download Topic #1-#2', 'This is a test post posted by the testing framework.', array('upload_files' => 1)); - $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); + $crawler = self::request('GET', "viewtopic.php?p={$post2['post_id']}&sid={$this->sid}"); - $this->assertContains('Re: Download Topic #1-#2', $crawler->filter('html')->text()); + $this->assertStringContainsString('Re: Download Topic #1-#2', $crawler->filter('html')->text()); $this->data['posts']['Re: Download Topic #1-#2'] = (int) $post2['post_id']; } @@ -83,7 +83,7 @@ public function test_download_accessible() )); // Download attachment as guest - $crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); + $crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); self::assert_response_status_code(200); $content = self::$client->getResponse()->getContent(); $finfo = new finfo(FILEINFO_MIME_TYPE); @@ -107,7 +107,7 @@ public function test_softdelete_post() )); $this->add_lang('posting'); - $crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Download #1']}&p={$this->data['posts']['Re: Download Topic #1-#2']}&sid={$this->sid}"); + $crawler = self::request('GET', "posting.php?mode=delete&p={$this->data['posts']['Re: Download Topic #1-#2']}&sid={$this->sid}"); $this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text()); $form = $crawler->selectButton('Yes')->form(); @@ -115,7 +115,7 @@ public function test_softdelete_post() $this->assertContainsLang('POST_DELETED', $crawler->text()); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Download Topic #1']}&sid={$this->sid}"); - $this->assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text()); + $this->assertStringContainsString($this->lang('POST_DISPLAY'), $crawler->text()); } public function test_download_softdeleted_post() @@ -141,7 +141,7 @@ public function test_download_softdeleted_post() $this->add_lang('viewtopic'); // No download attachment as guest - $crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); + $crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); self::assert_response_html(404); $this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text()); @@ -149,7 +149,7 @@ public function test_download_softdeleted_post() $this->login(); // Download attachment as admin - $crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); + $crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); self::assert_response_status_code(200); $content = self::$client->getResponse()->getContent(); $finfo = new finfo(FILEINFO_MIME_TYPE); @@ -182,7 +182,7 @@ public function test_softdelete_topic() $this->assertContainsLang('TOPIC_DELETED_SUCCESS', $crawler->text()); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Download Topic #1']}&sid={$this->sid}"); - $this->assertContains('Download Topic #1', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Download Topic #1', $crawler->filter('h2')->text()); } public function test_download_softdeleted_topic() @@ -208,7 +208,7 @@ public function test_download_softdeleted_topic() $this->add_lang('viewtopic'); // No download attachment as guest - $crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); + $crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); self::assert_response_html(404); $this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text()); @@ -216,7 +216,7 @@ public function test_download_softdeleted_topic() $this->login(); // Download attachment as admin - $crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); + $crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); self::assert_response_status_code(200); $content = self::$client->getResponse()->getContent(); $finfo = new finfo(FILEINFO_MIME_TYPE); @@ -225,10 +225,13 @@ public function test_download_softdeleted_topic() public function load_ids($data) { - $this->db = $this->get_db(); - if (!empty($data['forums'])) { + array_walk($data['forums'], function(&$value, $key) + { + $value = $this->db->sql_escape($value); + } + ); $sql = 'SELECT * FROM phpbb_forums WHERE ' . $this->db->sql_in_set('forum_name', $data['forums']); @@ -245,6 +248,11 @@ public function load_ids($data) if (!empty($data['topics'])) { + array_walk($data['topics'], function(&$value, $key) + { + $value = $this->db->sql_escape($value); + } + ); $sql = 'SELECT * FROM phpbb_topics WHERE ' . $this->db->sql_in_set('topic_title', $data['topics']); @@ -262,6 +270,11 @@ public function load_ids($data) $post_ids = array(); if (!empty($data['posts'])) { + array_walk($data['posts'], function(&$value, $key) + { + $value = $this->db->sql_escape($value); + } + ); $sql = 'SELECT * FROM phpbb_posts WHERE ' . $this->db->sql_in_set('post_subject', $data['posts']); @@ -276,7 +289,7 @@ public function load_ids($data) } $this->db->sql_freeresult($result); - if (isset($data['attachments'])) + if (isset($data['attachments']) && !empty($post_ids)) { $sql = 'SELECT * FROM phpbb_attachments diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index ce0f4911e30..94106e0872e 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -16,35 +16,33 @@ */ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case { - static private $helper; + private static $helper; - static protected $fixtures = array( + protected static $fixtures = array( './', ); - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); self::$helper = new phpbb_test_case_helpers(__CLASS__); - self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/../extension/ext/', self::$fixtures); + self::$helper->copy_ext_fixtures(__DIR__ . '/../extension/ext/', self::$fixtures); } - static public function tearDownAfterClass() + static public function tearDownAfterClass(): void { parent::tearDownAfterClass(); self::$helper->restore_original_ext_dir(); } - public function setUp() + protected function setUp(): void { parent::setUp(); $this->purge_cache(); - $this->get_db(); - // Clear the phpbb_ext table $this->db->sql_query('DELETE FROM phpbb_ext'); @@ -78,7 +76,19 @@ public function setUp() $this->login(); $this->admin_login(); - $this->add_lang('acp/extensions'); + $this->add_lang(['acp/common', 'acp/extensions']); + } + + /** + * Mocks the extensions catalog cache used in phpBB/phpbb/composer/manager.php + * with a predefined fixture so no external calls are made. + */ + protected function mock_extensions_catalog_cache():void { + $fixture_file = __DIR__ . '/fixtures/files/extensions_catalog.json'; + $package_type = 'phpbb-extension'; + + $available_extensions = json_decode(file_get_contents($fixture_file), true); + $this->cache->put('_composer_' . $package_type . '_available', $available_extensions, 24*60*60); } public function test_list() @@ -86,29 +96,30 @@ public function test_list() $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); $this->assertCount(1, $crawler->filter('.ext_enabled')); - $this->assertCount(6, $crawler->filter('.ext_disabled')); + $this->assertCount(3, $crawler->filter('.ext_disabled')); + $this->assertCount(4, $crawler->filter('.ext_not_installed')); - $this->assertContains('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text()); + $this->assertStringContainsString('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text()); $this->assertContainsLang('EXTENSION_DISABLE', $crawler->filter('.ext_enabled')->eq(0)->text()); - $this->assertContains('phpBB Moo Extension', $crawler->filter('.ext_disabled')->eq(2)->text()); + $this->assertStringContainsString('phpBB Moo Extension', $crawler->filter('.ext_disabled')->eq(2)->text()); $this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(2)->text()); $this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_disabled')->eq(2)->text()); $this->assertContainsLang('EXTENSION_DELETE_DATA', $crawler->filter('.ext_disabled')->eq(2)->text()); - $this->assertContains('The “vendor/test2” extension is not valid.', $crawler->filter('.ext_disabled')->eq(0)->text()); + $this->assertStringContainsString('The “vendor/test2” extension is not valid.', $crawler->filter('.ext_disabled')->eq(0)->text()); - $this->assertContains('The “vendor/test3” extension is not valid.', $crawler->filter('.ext_disabled')->eq(1)->text()); + $this->assertStringContainsString('The “vendor/test3” extension is not valid.', $crawler->filter('.ext_disabled')->eq(1)->text()); - $this->assertContains('phpBB Bar Extension', $crawler->filter('.ext_disabled')->eq(3)->text()); - $this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(3)->text()); - $this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_disabled')->eq(3)->text()); + $this->assertStringContainsString('phpBB Bar Extension', $crawler->filter('.ext_not_installed')->eq(0)->text()); + $this->assertContainsLang('DETAILS', $crawler->filter('.ext_not_installed')->eq(0)->text()); + $this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_not_installed')->eq(0)->text()); // Check that invalid extensions are not listed. - $this->assertNotContains('phpBB BarFoo Extension', $crawler->filter('.table1')->text()); - $this->assertNotContains('barfoo', $crawler->filter('.table1')->text()); + $this->assertStringNotContainsString('phpBB BarFoo Extension', $crawler->filter('.table1')->text()); + $this->assertStringNotContainsString('barfoo', $crawler->filter('.table1')->text()); - $this->assertNotContains('vendor3/bar', $crawler->filter('.table1')->text()); + $this->assertStringNotContainsString('vendor3/bar', $crawler->filter('.table1')->text()); } public function test_details() @@ -143,7 +154,7 @@ public function test_details() { $match = true; - $this->assertContains($expected, $text); + $this->assertStringContainsString($expected, $text); } } @@ -163,11 +174,16 @@ public function test_enable_pre() $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('div.main thead')->text()); $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid); - $this->assertContains($this->lang('EXTENSION_ENABLE_CONFIRM', 'phpBB Moo Extension'), $crawler->filter('#main')->text()); + $this->assertStringContainsString($this->lang('EXTENSION_ENABLE_CONFIRM', 'phpBB Moo Extension'), $crawler->filter('#main')->text()); - // Correctly submit the enable form + // Correctly submit the enable form, default not enableable message $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor3%2Ffoo&sid=' . $this->sid); $this->assertContainsLang('EXTENSION_NOT_ENABLEABLE', $crawler->filter('.errorbox')->text()); + + // Custom reason messages returned by not enableable extension + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor5%2Ffoo&sid=' . $this->sid); + $this->assertStringContainsString('Reason 1', $crawler->filter('.errorbox')->text()); + $this->assertStringContainsString('Reason 2', $crawler->filter('.errorbox')->text()); } public function test_disable_pre() @@ -179,14 +195,14 @@ public function test_disable_pre() $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('div.main thead')->text()); $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=vendor2%2Ffoo&sid=' . $this->sid); - $this->assertContains($this->lang('EXTENSION_DISABLE_CONFIRM', 'phpBB Foo Extension'), $crawler->filter('#main')->text()); + $this->assertStringContainsString($this->lang('EXTENSION_DISABLE_CONFIRM', 'phpBB Foo Extension'), $crawler->filter('#main')->text()); } public function test_delete_data_pre() { // test2 is not available (error) $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=delete_data_pre&ext_name=test2&sid=' . $this->sid); - $this->assertContains($this->lang('FILE_NOT_FOUND', ''), $crawler->filter('.errorbox')->text()); + $this->assertStringContainsString($this->lang('FILE_NOT_FOUND', ''), $crawler->filter('.errorbox')->text()); // foo is not disabled (redirect to list) $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=delete_data_pre&ext_name=vendor2%2Ffoo&sid=' . $this->sid); @@ -195,7 +211,7 @@ public function test_delete_data_pre() $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('div.main thead')->text()); $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=delete_data_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid); - $this->assertContains('Are you sure that you wish to delete the data associated with “phpBB Moo Extension”?', $crawler->filter('.errorbox')->text()); + $this->assertStringContainsString('Are you sure that you wish to delete the data associated with “phpBB Moo Extension”?', $crawler->filter('.errorbox')->text()); } public function test_actions() @@ -233,5 +249,150 @@ public function test_actions() // Attempt to enable invalid extension $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=barfoo&sid=' . $this->sid); $this->assertContainsLang('EXTENSION_DIR_INVALID', $crawler->filter('.errorbox')->text()); + + // Test installing/uninstalling extension altogether + $this->logout(); + $this->install_ext('vendor/moo'); + $this->uninstall_ext('vendor/moo'); + } + + public function test_extensions_catalog() + { + // Access extensions catalog main page + $this->mock_extensions_catalog_cache(); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=catalog&sid=' . $this->sid); + $this->assertContainsLang('ACP_EXTENSIONS_CATALOG', $this->get_content()); + + $this->assertContainsLang('BROWSE_EXTENSIONS_DATABASE', $crawler->filter('fieldset[class="quick quick-left"] > span > a')->eq(0)->text()); + $this->assertContainsLang('SETTINGS', $crawler->filter('fieldset[class="quick quick-left"] > span > a')->eq(1)->text()); + + $form = $crawler->selectButton('Submit')->form(); + $form['minimum_stability']->select('dev'); + $form['repositories'] = 'https://satis.phpbb.com/'; + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); + + // Revisit extensions catalog main page after configuration change + $this->mock_extensions_catalog_cache(); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=catalog&sid=' . $this->sid); + $this->assertContainsLang('ACP_EXTENSIONS_CATALOG', $this->get_content()); + + // Ensure catalog has any records in extensions list + $this->assertGreaterThan(0, $crawler->filter('tbody > tr > td > strong')->count()); + } + + public function test_extensions_catalog_installing_extension() + { + // Let's check the overview, multiple packages should be listed + $this->mock_extensions_catalog_cache(); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=catalog&sid=' . $this->sid); + $this->assertContainsLang('ACP_EXTENSIONS_CATALOG', $this->get_content()); + $this->assertGreaterThan(1, $crawler->filter('tr')->count()); + $this->assertGreaterThan(1, $crawler->selectLink($this->lang('INSTALL'))->count()); + + $pages = 1; + $pagination = $crawler->filter('div.pagination li:nth-last-child(2) a'); + if ($pagination->count() > 0) { + $pages = (int) $pagination->first()->text(); + } + + // Get Install links for both extensions + $extension_filter = function($crawler, $extension_name, &$install_link) + { + $extension_filter = $crawler->filter('tr')->reduce( + function ($node, $i) use ($extension_name) + { + return strpos($node->text(), $extension_name) !== false; + } + ); + + if ($extension_filter->count()) + { + $install_link = $extension_filter->selectLink($this->lang('INSTALL'))->link(); + } + }; + + for ($i = 0; $i < $pages; $i++) + { + if ($i != 0) + { + $this->mock_extensions_catalog_cache(); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&start=' . $i * 20 . '&mode=catalog&sid=' . $this->sid); + } + + $extension_filter($crawler, 'VigLink', $viglink_install_link); + } + + if (!isset($viglink_install_link)) + { + $this->fail('Failed acquiring install links for test extensions'); + } + + // Attempt to install phpbb/viglink extension + $crawler = self::$client->click($viglink_install_link); + $this->assertContainsLang('EXTENSIONS_INSTALLED', $crawler->filter('.successbox > p')->text()); + // Assert there's console log output + $this->assertStringContainsString('Locking phpbb/viglink', $crawler->filter('.console-output > pre')->text()); + + // Ensure installed extension appears in available extensions list + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); + $this->assertStringContainsString('VigLink', $crawler->filter('strong[title="phpbb/viglink"]')->text()); + } + + public function test_extensions_catalog_updating_extension() + { + // Enable 'VigLink' extension installed earlier + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); + $extension_enable_link = $crawler->filter('tr')->reduce( + function ($node, $i) + { + return (bool) (strpos($node->text(), 'VigLink') !== false); + } + )->selectLink($this->lang('EXTENSION_ENABLE'))->link(); + $crawler = self::$client->click($extension_enable_link); + $form = $crawler->selectButton($this->lang('EXTENSION_ENABLE'))->form(); + $crawler = self::submit($form); + $this->assertContainsLang('EXTENSION_ENABLE_SUCCESS', $crawler->filter('.successbox')->text()); + + // Update 'VigLink' enabled extension + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); + $viglink_update_link = $crawler->filter('tr')->reduce( + function ($node, $i) + { + return (bool) (strpos($node->text(), 'VigLink') !== false); + } + )->selectLink($this->lang('EXTENSION_UPDATE'))->link(); + $crawler = self::$client->click($viglink_update_link); + $this->assertContainsLang('EXTENSIONS_UPDATED', $crawler->filter('.successbox > p')->text()); + // Assert there's console log output + $this->assertStringContainsString('Updating packages', $crawler->filter('.console-output > pre')->text()); + + // Ensure installed extension still appears in available extensions list + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); + $this->assertStringContainsString('VigLink', $crawler->filter('strong[title="phpbb/viglink"]')->text()); + } + + public function test_extensions_catalog_removing_extension() + { + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); + + // Check if both enabled and disabled extensions have 'Remove' action available + $viglink_remove_link = $crawler->filter('tr')->reduce( + function ($node, $i) + { + return (bool) (strpos($node->text(), 'VigLink') !== false); + } + )->selectLink($this->lang('EXTENSION_REMOVE'))->link(); + + // Test extensions removal + // Remove 'VigLink' enabled extension + $crawler = self::$client->click($viglink_remove_link); + $this->assertContainsLang('EXTENSIONS_REMOVED', $crawler->filter('.successbox > p')->text()); + // Assert there's console log output + $this->assertStringContainsString('Removing phpbb/viglink', $crawler->filter('.console-output > pre')->text()); + + // Ensure removed extensions do not appear in available extensions list + self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); + $this->assertStringNotContainsString('VigLink', $this->get_content()); } } diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php index 2957749e89f..8a9d2032627 100644 --- a/tests/functional/extension_controller_test.php +++ b/tests/functional/extension_controller_test.php @@ -16,41 +16,36 @@ */ class phpbb_functional_extension_controller_test extends phpbb_functional_test_case { - protected $phpbb_extension_manager; - - static private $helper; - - static protected $fixtures = array( - 'foo/bar/config/', - 'foo/bar/controller/', - 'foo/bar/event/', - 'foo/bar/language/en/', - 'foo/bar/styles/prosilver/template/', - 'foo/foo/config/', - 'foo/foo/controller/', + private static $helper; + + protected static $fixtures = array( + './', ); - static public function setUpBeforeClass() + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); self::$helper = new phpbb_test_case_helpers(__CLASS__); - self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); + self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures); + + self::install_ext('foo/bar'); + self::install_ext('foo/foo'); } - static public function tearDownAfterClass() + public static function tearDownAfterClass(): void { parent::tearDownAfterClass(); + self::uninstall_ext('foo/bar'); + self::uninstall_ext('foo/foo'); self::$helper->restore_original_ext_dir(); } - public function setUp() + protected function setUp(): void { parent::setUp(); - $this->phpbb_extension_manager = $this->get_extension_manager(); - $this->purge_cache(); } @@ -59,11 +54,9 @@ public function setUp() */ public function test_foo_bar() { - $this->phpbb_extension_manager->enable('foo/bar'); $crawler = self::request('GET', 'app.php/foo/bar', array(), false); self::assert_response_status_code(); - $this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text()); - $this->phpbb_extension_manager->purge('foo/bar'); + $this->assertStringContainsString("foo/bar controller handle() method", $crawler->filter('body')->text()); } /** @@ -71,11 +64,9 @@ public function test_foo_bar() */ public function test_routing_resources() { - $this->phpbb_extension_manager->enable('foo/foo'); $crawler = self::request('GET', 'app.php/foo/foo', array(), false); self::assert_response_status_code(); - $this->assertContains("foo/foo controller handle() method", $crawler->filter('body')->text()); - $this->phpbb_extension_manager->purge('foo/foo'); + $this->assertStringContainsString("foo/foo controller handle() method", $crawler->filter('body')->text()); } /** @@ -83,10 +74,8 @@ public function test_routing_resources() */ public function test_controller_with_template() { - $this->phpbb_extension_manager->enable('foo/bar'); $crawler = self::request('GET', 'app.php/foo/template'); - $this->assertContains("I am a variable", $crawler->filter('#content')->text()); - $this->phpbb_extension_manager->purge('foo/bar'); + $this->assertStringContainsString("I am a variable", $crawler->filter('#content')->text()); } /** @@ -95,7 +84,7 @@ public function test_controller_with_template() public function test_controller_template_include_js_css() { $crawler = self::request('GET', 'app.php/help/faq'); - $this->assertContains("./../../assets/javascript/core.js", $crawler->filter('body')->html()); + $this->assertStringContainsString("./../../assets/javascript/core.js", $crawler->filter('body')->html()); } /** @@ -104,11 +93,9 @@ public function test_controller_template_include_js_css() */ public function test_missing_argument() { - $this->phpbb_extension_manager->enable('foo/bar'); $crawler = self::request('GET', 'app.php/foo/baz', array(), false); $this->assert_response_html(500); - $this->assertContains('Missing value for argument #1: test in class foo\bar\controller\controller:baz', $crawler->filter('body')->text()); - $this->phpbb_extension_manager->purge('foo/bar'); + $this->assertStringContainsString('Controller "foo\bar\controller\controller::baz" requires the "$test" argument that could not be resolved', $crawler->filter('body')->text()); } /** @@ -116,11 +103,9 @@ public function test_missing_argument() */ public function test_exception_should_result_in_500_status_code() { - $this->phpbb_extension_manager->enable('foo/bar'); $crawler = self::request('GET', 'app.php/foo/exception', array(), false); $this->assert_response_html(500); - $this->assertContains('Exception thrown from foo/exception route', $crawler->filter('body')->text()); - $this->phpbb_extension_manager->purge('foo/bar'); + $this->assertStringContainsString('Exception thrown from foo/exception route', $crawler->filter('body')->text()); } /** @@ -136,7 +121,10 @@ public function test_error_ext_disabled_or_404() { $crawler = self::request('GET', 'app.php/does/not/exist', array(), false); $this->assert_response_html(404); - $this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text()); + + // Since version 5.3.0-BETA1, Symfony shows full URI when route not found. See https://github.com/symfony/symfony/pull/39893 + $full_uri = self::$client->getRequest()->getUri(); + $this->assertStringContainsString('No route found for "GET ' . $full_uri . '"', $crawler->filter('body')->text()); } /** @@ -144,10 +132,9 @@ public function test_error_ext_disabled_or_404() */ public function test_login_redirect() { - $this->markTestIncomplete('Session table contains incorrect data for controllers on travis,' - . 'therefor the redirect fails.'); + $this->markTestIncomplete('Session table contains incorrect data for controllers on CI,' + . 'therefore the redirect fails.'); - $this->phpbb_extension_manager->enable('foo/bar'); $crawler = self::request('GET', 'app.php/foo/login_redirect'); $this->assertContainsLang('LOGIN', $crawler->filter('h2')->text()); $form = $crawler->selectButton('login')->form(array( @@ -157,8 +144,7 @@ public function test_login_redirect() $this->assertStringStartsWith('./app.php/foo/login_redirect', $form->get('redirect')->getValue()); $crawler = self::submit($form); - $this->assertContains("I am a variable", $crawler->filter('#content')->text(), 'Unsuccessful redirect after using login_box()'); - $this->phpbb_extension_manager->purge('foo/bar'); + $this->assertStringContainsString("I am a variable", $crawler->filter('#content')->text(), 'Unsuccessful redirect after using login_box()'); } /** @@ -166,7 +152,6 @@ public function test_login_redirect() */ public function test_redirect() { - $this->phpbb_extension_manager->enable('foo/bar'); $crawler = self::request('GET', 'app.php/foo/redirect'); $nodes = $crawler->filter('div')->extract(array('id')); @@ -181,10 +166,7 @@ public function test_redirect() $row_num = str_replace('redirect_expected_', '', $redirect); $redirect = $crawler->filter('#redirect_' . $row_num)->text(); - $redirect = substr($redirect, 0, strpos($redirect, 'sid') - 1); $this->assertEquals($crawler->filter('#redirect_expected_' . $row_num)->text(), $redirect); } - - $this->phpbb_extension_manager->purge('foo/bar'); } } diff --git a/tests/functional/extension_global_lang_test.php b/tests/functional/extension_global_lang_test.php index a1e25477451..1fb1d053e34 100644 --- a/tests/functional/extension_global_lang_test.php +++ b/tests/functional/extension_global_lang_test.php @@ -16,60 +16,56 @@ */ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_case { - protected $phpbb_extension_manager; + private static $helper; - static private $helper; - - static protected $fixtures = array( - 'foo/bar/config/', - 'foo/bar/event/', - 'foo/bar/language/en/', + protected static $fixtures = array( + './', ); - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); self::$helper = new phpbb_test_case_helpers(__CLASS__); - self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); + self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures); } - static public function tearDownAfterClass() + static public function tearDownAfterClass(): void { parent::tearDownAfterClass(); self::$helper->restore_original_ext_dir(); } - public function setUp() + protected function setUp(): void { parent::setUp(); - - $this->get_db(); - - $this->phpbb_extension_manager = $this->get_extension_manager(); + $this->get_db(); $this->purge_cache(); } - public function tearDown() + protected function tearDown(): void { + $this->uninstall_ext('foo/bar'); + parent::tearDown(); + } - $this->purge_cache(); + protected static function setup_extensions() + { + return ['foo/bar']; } public function test_load_extension_lang_globally() { - $this->phpbb_extension_manager->enable('foo/bar'); - // The board index, which should contain an overwritten translation $crawler = self::request('GET', 'index.php'); // language from language/en/common.php - $this->assertNotContains('Skip to content', $crawler->filter('.skiplink')->text()); + $this->assertStringNotContainsString('Skip to content', $crawler->filter('.skiplink')->text()); // language from ext/foo/bar/language/en/foo_global.php - $this->assertContains('Overwritten by foo', $crawler->filter('.skiplink')->text()); + $this->assertStringContainsString('Overwritten by foo', $crawler->filter('.skiplink')->text()); } } diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php index d3a66b9b359..9f7f44fb9d4 100644 --- a/tests/functional/extension_module_test.php +++ b/tests/functional/extension_module_test.php @@ -10,115 +10,130 @@ * the docs/CREDITS.txt file. * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/acp/acp_modules.php'; +require_once __DIR__ . '/../../phpBB/includes/acp/acp_modules.php'; /** * @group functional */ class phpbb_functional_extension_module_test extends phpbb_functional_test_case { - protected $phpbb_extension_manager; + private static $helper; - static private $helper; - - static protected $fixtures = array( + protected static $fixtures = array( './', ); - static public function setUpBeforeClass() + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); self::$helper = new phpbb_test_case_helpers(__CLASS__); - self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); + self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures); + + self::install_ext('foo/bar'); } - static public function tearDownAfterClass() + public static function tearDownAfterClass(): void { parent::tearDownAfterClass(); + self::uninstall_ext('foo/bar'); self::$helper->restore_original_ext_dir(); } - public function setUp() - { - global $db; - - parent::setUp(); - - $this->phpbb_extension_manager = $this->get_extension_manager(); - $this->phpbb_extension_manager->enable('foo/bar'); - - $db = $this->get_db(); - $cache = $this->get_cache_driver(); - $modules = new \phpbb\module\module_manager($cache, $db, $this->phpbb_extension_manager, MODULES_TABLE, dirname(__FILE__) . '/../../phpBB/', 'php'); - - $sql = 'SELECT module_id - FROM ' . MODULES_TABLE . " - WHERE module_langname = 'acp' - AND module_class = 'ACP_CAT_DOT_MODS'"; - $result = $db->sql_query($sql); - $module_id = (int) $db->sql_fetchfield('module_id'); - $db->sql_freeresult($result); - - $parent_data = array( - 'module_basename' => '', - 'module_enabled' => 1, - 'module_display' => 1, - 'parent_id' => $module_id, - 'module_class' => 'acp', - 'module_langname' => 'ACP_FOOBAR_TITLE', - 'module_mode' => '', - 'module_auth' => '', - ); - $modules->update_module_data($parent_data); - - $module_data = array( - 'module_basename' => 'foo\\bar\\acp\\main_module', - 'module_enabled' => 1, - 'module_display' => 1, - 'parent_id' => $parent_data['module_id'], - 'module_class' => 'acp', - 'module_langname' => 'ACP_FOOBAR_TITLE', - 'module_mode' => 'mode', - 'module_auth' => '', - ); - $modules->update_module_data($module_data); - - $parent_data = array( - 'module_basename' => '', - 'module_enabled' => 1, - 'module_display' => 1, - 'parent_id' => 0, - 'module_class' => 'ucp', - 'module_langname' => 'UCP_FOOBAR_TITLE', - 'module_mode' => '', - 'module_auth' => '', - ); - $modules->update_module_data($parent_data); - - $module_data = array( - 'module_basename' => 'foo\\bar\\ucp\\main_module', - 'module_enabled' => 1, - 'module_display' => 1, - 'parent_id' => $parent_data['module_id'], - 'module_class' => 'ucp', - 'module_langname' => 'UCP_FOOBAR_TITLE', - 'module_mode' => 'mode', - 'module_auth' => '', - ); - $modules->update_module_data($module_data); - - $this->purge_cache(); - } - public function test_acp() { + $this->add_lang('common'); $this->login(); $this->admin_login(); - $crawler = self::request('GET', 'adm/index.php?i=foo%5cbar%5cacp%5cmain_module&mode=mode&sid=' . $this->sid); - $this->assertContains('Bertie rulez!', $crawler->filter('#main')->text()); + $crawler = self::request('GET', 'adm/index.php?i=-foo-bar-acp-main_module&mode=mode&sid=' . $this->sid); + $this->assertStringContainsString('ACP_FOOBAR_SETTINGS', $crawler->filter('#main')->text()); + $this->assertContainsLang('GENERAL_SETTINGS', $crawler->filter('fieldset')->text()); + + $this->assertStringContainsString('SETTING_0', $crawler->filter('dl')->eq(0)->filter('dt > label[for="setting_0"]')->text()); + $this->assertStringContainsString('SETTING_0_EXPLAIN', $crawler->filter('dl')->eq(0)->filter('dt > span')->text()); + $this->assertEquals(2, $crawler->filter('dl')->eq(0)->filter('dd > input[type="number"]')->count()); + $this->assertEquals(1, $crawler->filter('dl')->eq(0)->filter('dd > input[type="number"]')->eq(0)->attr('value')); + $this->assertEquals(17, $crawler->filter('dl')->eq(0)->filter('dd > input[type="number"]')->eq(1)->attr('value')); + + $this->assertStringContainsString('SETTING_1', $crawler->filter('dl')->eq(1)->filter('dt > label[for="setting_1"]')->text()); + $this->assertStringContainsString('CUSTOM_LANG_EXPLAIN', $crawler->filter('dl')->eq(1)->filter('dt > span')->text()); + $this->assertEquals(1, $crawler->filter('dl')->eq(1)->filter('dd > input[type="submit"]')->count()); + $this->assertEquals('Test submit button', $crawler->filter('dl')->eq(1)->filter('dd > input[type="submit"]')->attr('value')); + + $this->assertStringContainsString('SETTING_2', $crawler->filter('dl')->eq(2)->filter('dt > label[for="setting_2"]')->text()); + $this->assertEquals(0, $crawler->filter('dl')->eq(2)->filter('dt > span')->count()); + $this->assertEquals(2, $crawler->filter('dl')->eq(2)->filter('dd > label > input[type="radio"]')->count()); + $this->assertContainsLang('YES', $crawler->filter('dl')->eq(2)->filter('dd > label')->eq(0)->text()); + $this->assertEquals(1, $crawler->filter('dl')->eq(2)->filter('dd > label > input[type="radio"]')->eq(0)->attr('value')); + $this->assertEquals('checked', $crawler->filter('dl')->eq(2)->filter('dd > label > input[type="radio"]')->eq(0)->attr('checked')); + $this->assertContainsLang('NO', $crawler->filter('dl')->eq(2)->filter('dd > label')->eq(1)->text()); + $this->assertEquals(0, $crawler->filter('dl')->eq(2)->filter('dd > label > input[type="radio"]')->eq(1)->attr('value')); + + $this->assertStringContainsString('SETTING_3', $crawler->filter('dl')->eq(3)->filter('dt > label[for="setting_3"]')->text()); + $this->assertStringContainsString('SETTING_3_EXPLAIN', $crawler->filter('dl')->eq(3)->filter('dt > span')->text()); + $this->assertEquals(1, $crawler->filter('dl')->eq(3)->filter('dd > input[type="number"]')->count()); + $this->assertEquals(15, $crawler->filter('dl')->eq(3)->filter('dd > input[type="number"]')->attr('value')); + + $this->assertStringContainsString('SETTING_4', $crawler->filter('dl')->eq(4)->filter('dt > label[for="setting_4"]')->text()); + $this->assertStringContainsString('SETTING_4_EXPLAIN', $crawler->filter('dl')->eq(4)->filter('dt > span')->text()); + $this->assertEquals(1, $crawler->filter('dl')->eq(4)->filter('dd > select[id="setting_4"]')->count()); + $this->assertEquals(3, $crawler->filter('dl')->eq(4)->filter('dd > select > option')->count()); + $this->assertEquals(2, $crawler->filter('dl')->eq(4)->filter('dd > select > option')->eq(1)->attr('value')); + $this->assertEquals('selected', $crawler->filter('dl')->eq(4)->filter('dd > select > option')->eq(1)->attr('selected')); + + $this->assertStringContainsString('SETTING_5', $crawler->filter('dl')->eq(5)->filter('dt > label[for="setting_5"]')->text()); + $this->assertStringContainsString('SETTING_5_EXPLAIN', $crawler->filter('dl')->eq(5)->filter('dt > span')->text()); + $this->assertEquals(1, $crawler->filter('dl')->eq(5)->filter('dd > input[type="text"]')->count()); + $this->assertEquals('Setting 5', $crawler->filter('dl')->eq(5)->filter('dd > input[type="text"]')->attr('value')); + + $this->assertStringContainsString('SETTING_6', $crawler->filter('dl')->eq(6)->filter('dt > label[for="setting_6"]')->text()); + $this->assertStringContainsString('SETTING_6_EXPLAIN', $crawler->filter('dl')->eq(6)->filter('dt > span')->text()); + $this->assertEquals(1, $crawler->filter('dl')->eq(6)->filter('dd > input[type="password"]')->count()); + $this->assertEquals('********', $crawler->filter('dl')->eq(6)->filter('dd > input[type="password"]')->attr('value')); + + $this->assertStringContainsString('SETTING_7', $crawler->filter('dl')->eq(7)->filter('dt > label[for="setting_7"]')->text()); + $this->assertStringContainsString('SETTING_7_EXPLAIN', $crawler->filter('dl')->eq(7)->filter('dt > span')->text()); + $this->assertEquals(1, $crawler->filter('dl')->eq(7)->filter('dd > input[type="email"]')->count()); + $this->assertEquals('test@example.dom', $crawler->filter('dl')->eq(7)->filter('dd > input[type="email"]')->attr('value')); + + $this->assertStringContainsString('SETTING_8', $crawler->filter('dl')->eq(8)->filter('dt > label[for="setting_8"]')->text()); + $this->assertStringContainsString('SETTING_8_EXPLAIN', $crawler->filter('dl')->eq(8)->filter('dt > span')->text()); + $this->assertEquals(1, $crawler->filter('dl')->eq(8)->filter('dd > textarea[name="config[setting_8]"]')->count()); + $this->assertEquals('Textarea', $crawler->filter('dl')->eq(8)->filter('dd > textarea[name="config[setting_8]"]')->text()); + + $this->assertStringContainsString('SETTING_9', $crawler->filter('dl')->eq(9)->filter('dt > label[for="setting_9"]')->text()); + $this->assertStringContainsString('SETTING_9_EXPLAIN', $crawler->filter('dl')->eq(9)->filter('dt > span')->text()); + $this->assertEquals(2, $crawler->filter('dl')->eq(9)->filter('dd > label > input[type="radio"]')->count()); + $this->assertEquals('checked', $crawler->filter('dl')->eq(9)->filter('dd > label > input[type="radio"]')->eq(0)->attr('checked')); + + $this->assertStringContainsString('SETTING_10', $crawler->filter('dl')->eq(10)->filter('dt > label[for="setting_10"]')->text()); + $this->assertStringContainsString('SETTING_10_EXPLAIN', $crawler->filter('dl')->eq(10)->filter('dt > span')->text()); + $this->assertEquals(3, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->count()); + $this->assertEquals(1, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->eq(0)->attr('value')); + $this->assertStringContainsString('LABEL_1', $crawler->filter('dl')->eq(10)->filter('dd > label')->eq(0)->text()); + $this->assertEquals(3, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->eq(1)->attr('value')); + $this->assertEquals('checked', $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->eq(1)->attr('checked')); + $this->assertStringContainsString('LABEL_3', $crawler->filter('dl')->eq(10)->filter('dd > label')->eq(1)->text()); + $this->assertEquals(2, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->eq(2)->attr('value')); + $this->assertStringContainsString('LABEL_2', $crawler->filter('dl')->eq(10)->filter('dd > label')->eq(2)->text()); + + $this->assertStringContainsString('SETTING_11', $crawler->filter('dl')->eq(11)->filter('dt > label[for="setting_11"]')->text()); + $this->assertStringContainsString('SETTING_11_EXPLAIN', $crawler->filter('dl')->eq(11)->filter('dt > span')->text()); + $this->assertEquals('1', $crawler->filter('dl')->eq(11)->filter('dd > label > input[type="radio"]')->eq(0)->attr('value')); + $this->assertEquals('0', $crawler->filter('dl')->eq(11)->filter('dd > label > input[type="radio"]')->eq(1)->attr('value')); + $this->assertEquals('checked', $crawler->filter('dl')->eq(11)->filter('dd > label > input[type="radio"]')->eq(1)->attr('checked')); + $this->assertContainsLang('YES', $crawler->filter('dl')->eq(11)->filter('dd > label')->eq(0)->text()); + $this->assertContainsLang('NO', $crawler->filter('dl')->eq(11)->filter('dd > label')->eq(1)->text()); + + $this->assertStringContainsString('SETTING_12', $crawler->filter('dl')->eq(12)->filter('dt > label[for="setting_12"]')->text()); + $this->assertStringContainsString('SETTING_12_EXPLAIN', $crawler->filter('dl')->eq(12)->filter('dt > span')->text()); + $this->assertContainsLang('ENABLED', $crawler->filter('dl')->eq(12)->filter('dd > label')->eq(0)->text()); + $this->assertEquals(1, $crawler->filter('dl')->eq(12)->filter('dd > label > input[type="radio"]')->eq(0)->attr('value')); + $this->assertContainsLang('DISABLED', $crawler->filter('dl')->eq(12)->filter('dd > label')->eq(1)->text()); + $this->assertEquals(0, $crawler->filter('dl')->eq(12)->filter('dd > label > input[type="radio"]')->eq(1)->attr('value')); + $this->assertEquals('checked', $crawler->filter('dl')->eq(12)->filter('dd > label > input[type="radio"]')->eq(1)->attr('checked')); } public function test_ucp() @@ -126,12 +141,23 @@ public function test_ucp() $this->login(); $crawler = self::request('GET', 'ucp.php?sid=' . $this->sid); - $this->assertContains('UCP_FOOBAR_TITLE', $crawler->filter('#tabs')->text()); + $this->assertStringContainsString('UCP_FOOBAR', $crawler->filter('#navigation')->text()); - $link = $crawler->selectLink('UCP_FOOBAR_TITLE')->link()->getUri(); + $link = $crawler->selectLink('UCP_FOOBAR')->link()->getUri(); $crawler = self::request('GET', substr($link, strpos($link, 'ucp.'))); - $this->assertContains('UCP Extension Template Test Passed!', $crawler->filter('#content')->text()); + $this->assertStringContainsString('UCP Extension Template Test Passed!', $crawler->filter('#content')->text()); + } + + public function test_mcp() + { + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'mcp.php?sid=' . $this->sid); + $this->assertStringContainsString('MCP_FOOBAR', $crawler->filter('#navigation')->text()); - $this->phpbb_extension_manager->purge('foo/bar'); + $link = $crawler->selectLink('MCP_FOOBAR')->link()->getUri(); + $crawler = self::request('GET', substr($link, strpos($link, 'mcp.'))); + $this->assertStringContainsString('MCP Extension Template Test Passed!', $crawler->filter('#content')->text()); } } diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php index f570d452159..e7dcb4ebcd3 100644 --- a/tests/functional/extension_permission_lang_test.php +++ b/tests/functional/extension_permission_lang_test.php @@ -16,58 +16,50 @@ */ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_test_case { - protected $phpbb_extension_manager; + private static $helper; - static private $helper; - - static protected $fixtures = array( - 'foo/bar/config/', - 'foo/bar/event/', - 'foo/bar/language/en/', + protected static $fixtures = array( + './', ); - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); self::$helper = new phpbb_test_case_helpers(__CLASS__); - self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); + self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures); } - static public function tearDownAfterClass() + static public function tearDownAfterClass(): void { parent::tearDownAfterClass(); self::$helper->restore_original_ext_dir(); } - public function setUp() + protected function setUp(): void { parent::setUp(); - - $this->get_db(); - - $acl_ary = array( - 'auth_option' => 'u_foo', - 'is_global' => 1, - ); - - $sql = 'INSERT INTO phpbb_acl_options ' . $this->db->sql_build_array('INSERT', $acl_ary); - $this->db->sql_query($sql); - - $this->phpbb_extension_manager = $this->get_extension_manager(); - - $this->purge_cache(); $this->login(); $this->admin_login(); $this->add_lang('acp/permissions'); } - public function test_auto_include_permission_lang_from_extensions() + protected function tearDown(): void + { + $this->uninstall_ext('foo/bar'); + + parent::tearDown(); + } + + protected static function setup_extensions() { - $this->phpbb_extension_manager->enable('foo/bar'); + return ['foo/bar']; + } + public function test_auto_include_permission_lang_from_extensions() + { // User permissions $crawler = self::request('GET', 'adm/index.php?i=acp_permissions&icat=16&mode=setting_user_global&sid=' . $this->sid); @@ -78,9 +70,9 @@ public function test_auto_include_permission_lang_from_extensions() $crawler = self::submit($form); // language from language/en/acp/permissions_phpbb.php - $this->assertContains('Can attach files', $crawler->filter('body')->text()); + $this->assertStringContainsString('Can attach files', $crawler->filter('body')->text()); // language from ext/foo/bar/language/en/permissions_foo.php - $this->assertContains('Can view foobar', $crawler->filter('body')->text()); + $this->assertStringContainsString('Can view foobar', $crawler->filter('body')->text()); } } diff --git a/tests/functional/extension_template_event_order_test.php b/tests/functional/extension_template_event_order_test.php new file mode 100644 index 00000000000..c32e9442b8b --- /dev/null +++ b/tests/functional/extension_template_event_order_test.php @@ -0,0 +1,98 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** + * @group functional + */ +class phpbb_functional_extension_template_event_order_test extends phpbb_functional_test_case +{ + private static $helper; + + protected static $fixtures = [ + './', + ]; + + public static function setUpBeforeClass(): void + { + parent::setUpBeforeClass(); + + self::$helper = new phpbb_test_case_helpers(__CLASS__); + self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures); + + self::install_ext('foo/bar'); + self::install_ext('foo/foo'); + } + + public static function tearDownAfterClass(): void + { + parent::tearDownAfterClass(); + + self::uninstall_ext('foo/bar'); + self::uninstall_ext('foo/foo'); + self::$helper->restore_original_ext_dir(); + } + + protected function setUp(): void + { + parent::setUp(); + + $this->purge_cache(); + } + + + /** + * Check extensions template event listener prioritizing + */ + public function test_different_template_event_priority() + { + global $phpbb_root_path; + + $crawler = self::request('GET', 'index.php'); + $quick_links_menu = $crawler->filter('ul[role="menu"]')->eq(0); + $quick_links_menu_nodes_count = (int) $quick_links_menu->filter('li')->count(); + // Ensure foo/foo template event goes before foo/bar one + $this->assertStringContainsString('FOO_FOO_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 4)->filter('span')->text()); + $this->assertStringContainsString('FOO_BAR_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 3)->filter('span')->text()); + + // Change template events order to default, put foo/bar event before foo/foo one + $this->disable_ext('foo/bar'); + $this->disable_ext('foo/foo'); + + $this->assertTrue(copy(__DIR__ . '/fixtures/ext/foo/bar/event/template_event_order_higher.php', $phpbb_root_path . 'ext/foo/bar/event/template_event_order.php')); + $this->assertTrue(copy(__DIR__ . '/fixtures/ext/foo/foo/event/template_event_order_lower.php', $phpbb_root_path . 'ext/foo/foo/event/template_event_order.php')); + + $this->install_ext('foo/bar'); + $this->install_ext('foo/foo'); + + $crawler = self::request('GET', 'index.php'); + $quick_links_menu = $crawler->filter('ul[role="menu"]')->eq(0); + $quick_links_menu_nodes_count = (int) $quick_links_menu->filter('li')->count(); + // Ensure foo/bar template event goes before foo/foo one + $this->assertStringContainsString('FOO_BAR_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 4)->filter('span')->text()); + $this->assertStringContainsString('FOO_FOO_QUICK_LINK', $quick_links_menu->filter('li')->eq($quick_links_menu_nodes_count - 3)->filter('span')->text()); + } + + /** + * Check extensions template event listener equal (default - 0) priority rendering + * Should render in the order of reading listener files from the filesystem + */ + public function test_same_template_event_priority() + { + global $phpbb_root_path; + + $crawler = self::request('GET', 'index.php'); + // Ensure foo/bar template event goes before foo/foo one (assuming they have been read from the filesystem in alphabetical order) + $this->assertStringContainsString('FOO_BAR_FORUMLIST_BODY_BEFORE', $crawler->filter('p[id*="forumlist_body_before"]')->eq(0)->text()); + $this->assertStringContainsString('FOO_FOO_FORUMLIST_BODY_BEFORE', $crawler->filter('p[id*="forumlist_body_before"]')->eq(1)->text()); + } +} diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php index 3792b0a23c3..16f4f2f7798 100644 --- a/tests/functional/feed_test.php +++ b/tests/functional/feed_test.php @@ -20,17 +20,13 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case static public $init_values = array(); - public function setUp() + protected function setUp(): void { parent::setUp(); - $this->purge_cache(); - } - - public function __construct($name = null, array $data = array(), $dataName = '') - { - parent::__construct($name, $data, $dataName); - $this->backupStaticAttributesBlacklist['phpbb_functional_feed_test'] = array('init_values'); + $this->setBackupStaticPropertiesExcludeList([ + 'phpbb_functional_feed_test' => ['init_values'], + ]); $this->purge_cache(); } @@ -49,25 +45,32 @@ public function test_setup_config_before_state() self::$init_values['topic_base_items'] = (int) $values['config[feed_limit_topic]']; // Enable all feeds - $values['config[feed_enable]'] = true; - $values['config[feed_forum]'] = true; - $values['config[feed_item_statistics]'] = true; - $values['config[feed_overall]'] = true; - $values['config[feed_overall_forums]'] = true; - $values['config[feed_topic]'] = true; - $values['config[feed_topics_active]'] = true; - $values['config[feed_topics_new]'] = true; + $values['config[feed_enable]'] = 1; + $values['config[feed_forum]'] = 1; + $values['config[feed_item_statistics]'] = 1; + $values['config[feed_overall]'] = 1; + $values['config[feed_overall_forums]'] = 1; + $values['config[feed_topic]'] = 1; + $values['config[feed_topics_active]'] = 1; + $values['config[feed_topics_new]'] = 1; $form->setValues($values); $crawler = self::submit($form); self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); + // Disable showing unapproved posts to users + $crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=features"); + $form = $crawler->selectButton('Submit')->form(); + $form->setValues(['config[display_unapproved_posts]' => 0]); + $crawler = self::submit($form); + self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); + // Special config (Guest can't see attachments) $this->add_lang('acp/permissions'); $crawler = self::request('GET', "adm/index.php?i=acp_permissions&sid={$this->sid}&icat=16&mode=setting_group_global&group_id[0]=1"); - self::assertContains($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text()); + self::assertStringContainsString($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text()); $form = $crawler->selectButton($this->lang('APPLY_PERMISSIONS'))->form(); $form['setting[1][0][u_download]']->select(-1); @@ -252,6 +255,29 @@ public function test_create_exclude_topic() $this->data['topics']['Feeds #exclude - Topic #1'] = (int) $post['topic_id']; } + public function test_feeds_disabled() + { + $this->login(); + $this->admin_login(); + + // Disable feeds in ACP + $crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=feed"); + $form = $crawler->selectButton('Submit')->form(); + $crawler = self::submit($form, ['config[feed_enable]' => 0]); + self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); + + // Assert that feeds aren't available + $crawler = self::request('GET', 'app.php/feed/overall', array(), false); + self::assert_response_status_code(404); + $this->assertContainsLang('NO_FEED_ENABLED', $crawler->text()); + + // Enable feeds again in ACP + $crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=feed"); + $form = $crawler->selectButton('Submit')->form(); + $crawler = self::submit($form, ['config[feed_enable]' => 1]); + self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); + } + public function test_feeds_exclude() { $this->load_ids(array( @@ -331,15 +357,15 @@ public function test_create_news_topics() $post = $this->create_topic($this->data['forums']['Feeds #news'], 'Feeds #news - Topic #2', 'This is a test topic posted by the testing framework.'); $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - self::assertContains('Feeds #news - Topic #2', $crawler->filter('html')->text()); + self::assertStringContainsString('Feeds #news - Topic #2', $crawler->filter('html')->text()); $this->data['topics']['Feeds #news - Topic #2'] = (int) $post['topic_id']; $this->data['posts']['Feeds #news - Topic #2'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); // Test creating a reply $post2 = $this->create_post($this->data['forums']['Feeds #news'], $post['topic_id'], 'Re: Feeds #news - Topic #2', 'This is a test post posted by the testing framework.'); - $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); + $crawler = self::request('GET', "viewtopic.php?p={$post2['post_id']}&sid={$this->sid}"); - self::assertContains('Re: Feeds #news - Topic #2', $crawler->filter('html')->text()); + self::assertStringContainsString('Re: Feeds #news - Topic #2', $crawler->filter('html')->text()); $this->data['posts']['Re: Feeds #news - Topic #2'] = (int) $post2['post_id']; } @@ -493,9 +519,9 @@ public function test_create_softdelete_post() // Test creating a reply $post2 = $this->create_post($this->data['forums']['Feeds #1'], $post['topic_id'], 'Re: Feeds #1 - Topic #2', 'This is a test post posted by the testing framework.'); - $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); + $crawler = self::request('GET', "viewtopic.php?p={$post2['post_id']}&sid={$this->sid}"); - self::assertContains('Re: Feeds #1 - Topic #2', $crawler->filter('html')->text()); + self::assertStringContainsString('Re: Feeds #1 - Topic #2', $crawler->filter('html')->text()); $this->data['posts']['Re: Feeds #1 - Topic #2'] = (int) $post2['post_id']; } @@ -515,7 +541,7 @@ public function test_softdelete_post() )); $this->add_lang('posting'); - $crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Feeds #1']}&p={$this->data['posts']['Re: Feeds #1 - Topic #2']}&sid={$this->sid}"); + $crawler = self::request('GET', "posting.php?mode=delete&p={$this->data['posts']['Re: Feeds #1 - Topic #2']}&sid={$this->sid}"); self::assertContainsLang('DELETE_PERMANENTLY', $crawler->text()); $form = $crawler->selectButton('Yes')->form(); @@ -523,7 +549,7 @@ public function test_softdelete_post() self::assertContainsLang('POST_DELETED', $crawler->text()); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1 - Topic #2']}&sid={$this->sid}"); - self::assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text()); + self::assertStringContainsString($this->lang('POST_DISPLAY'), $crawler->text()); } public function test_feeds_softdeleted_post_admin() @@ -623,7 +649,7 @@ public function test_softdelete_topic() self::assertContainsLang('TOPIC_DELETED_SUCCESS', $crawler->text()); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1 - Topic #2']}&sid={$this->sid}"); - self::assertContains('Feeds #1 - Topic #2', $crawler->filter('h2')->text()); + self::assertStringContainsString('Feeds #1 - Topic #2', $crawler->filter('h2')->text()); } public function test_feeds_softdeleted_topic_admin() @@ -762,7 +788,7 @@ public function test_create_unapproved_post() $this->create_post($this->data['forums']['Feeds #1.1'], $post['topic_id'], 'Re: Feeds #1.1 - Topic #2', 'This is a test post posted by the testing framework.', array(), 'POST_STORED_MOD'); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1.1 - Topic #2']}&sid={$this->sid}"); - self::assertNotContains('Re: Feeds #1.1 - Topic #2', $crawler->filter('html')->text()); + self::assertStringNotContainsString('Re: Feeds #1.1 - Topic #2', $crawler->filter('html')->text()); } public function test_feeds_unapproved_post_admin() @@ -850,34 +876,15 @@ public function test_create_unapproved_topic() $this->set_flood_interval(0); $this->login('disapprove_user'); - $post = $this->create_topic($this->data['forums']['Feeds #1.1'], 'Feeds #1.1 - Topic #3', 'This is a test topic posted by the testing framework.', array(), 'POST_STORED_MOD'); - $this->data['topics']['Feeds #1 - Topic #3'] = (int) $post['topic_id']; - $crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Feeds #1.1']}&sid={$this->sid}"); + $this->create_topic($this->data['forums']['Feeds #1.1'], 'Feeds #1.1 - Topic #3', 'This is a test topic posted by the testing framework.', array(), 'POST_STORED_MOD'); - self::assertNotContains('Feeds #1.1 - Topic #3', $crawler->filter('html')->text()); + $crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Feeds #1.1']}&sid={$this->sid}"); + self::assertStringNotContainsString('Feeds #1.1 - Topic #3', $crawler->filter('html')->text()); $this->logout(); $this->set_flood_interval(15); } - protected function set_flood_interval($flood_interval) - { - $this->login(); - $this->admin_login(); - - $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post'); - - $form = $crawler->selectButton('Submit')->form(); - $values = $form->getValues(); - - $values['config[flood_interval]'] = $flood_interval; - $form->setValues($values); - $crawler = self::submit($form); - self::assertGreaterThan(0, $crawler->filter('.successbox')->count()); - - $this->logout(); - } - public function test_feeds_unapproved_topic_admin() { $this->load_ids(array( @@ -1006,7 +1013,7 @@ public function test_create_attachment_topic() $post = $this->create_topic($this->data['forums']['Feeds #1'], 'Feeds #1 - Topic #3', 'This is a test topic posted by the testing framework. [attachment=0]Attachment #0[/attachment]', array('upload_files' => 1)); $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - self::assertContains('Feeds #1 - Topic #3', $crawler->filter('html')->text()); + self::assertStringContainsString('Feeds #1 - Topic #3', $crawler->filter('html')->text()); $this->data['topics']['Feeds #1 - Topic #3'] = (int) $post['topic_id']; } @@ -1222,9 +1229,9 @@ public function test_create_missing_attachment_post() // Test creating a reply with 1 missing attachment $post2 = $this->create_post($this->data['forums']['Feeds #1'], $this->data['topics']['Feeds #1 - Topic #3'], 'Re: Feeds #1 - Topic #3-1', 'This is a test post posted by the testing framework. [attachment=0]Attachment #0[/attachment]'); - $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); + $crawler = self::request('GET', "viewtopic.php?p={$post2['post_id']}&sid={$this->sid}"); - self::assertContains('Re: Feeds #1 - Topic #3-1', $crawler->filter('html')->text()); + self::assertStringContainsString('Re: Feeds #1 - Topic #3-1', $crawler->filter('html')->text()); $this->data['posts']['Re: Feeds #1 - Topic #3-1'] = (int) $post2['post_id']; } @@ -1240,6 +1247,7 @@ public function test_feeds_missing_attachment_admin() 'posts' => array( 'Feeds #1 - Topic #3', ), + 'attachments' => array(), )); $this->add_lang('viewtopic'); @@ -1388,7 +1396,7 @@ protected function assert_feed($params, $data) foreach($data['contents'] as $entry_id => $string) { $content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text(); - self::assertContains($string, $content, "Tested feed : 'app.php/feed{$params}'"); + self::assertStringContainsString($string, $content, "Tested feed : 'app.php/feed{$params}'"); } } @@ -1408,18 +1416,18 @@ protected function assert_feed($params, $data) $content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text(); foreach ($attachments as $i => $attachment) { - $url = self::$root_url . "download/file.php?id={$attachment['id']}"; + $url = self::$root_url . "app.php/download/attachment/{$attachment['id']}"; $string = "Attachment #{$i}"; if ($attachment['displayed']) { - self::assertContains($url, $content, "Tested feed : 'app.php/feed{$params}'"); - self::assertNotContains($string, $content, "Tested feed : 'app.php/feed{$params}'"); + self::assertStringContainsString($url, $content, "Tested feed : 'app.php/feed{$params}'"); + self::assertStringNotContainsString($string, $content, "Tested feed : 'app.php/feed{$params}'"); } else { - self::assertContains($string, $content, "Tested feed : 'app.php/feed{$params}'"); - self::assertNotContains($url, $content, "Tested feed : 'app.php/feed{$params}'"); + self::assertStringContainsString($string, $content, "Tested feed : 'app.php/feed{$params}'"); + self::assertStringNotContainsString($url, $content, "Tested feed : 'app.php/feed{$params}'"); } } } @@ -1442,8 +1450,6 @@ protected function assert_feed($params, $data) protected function load_ids($data) { - $this->db = $this->get_db(); - if (!empty($data['forums'])) { $sql = 'SELECT * diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php index d381fa1ae25..13ee475b8b8 100644 --- a/tests/functional/fileupload_form_test.php +++ b/tests/functional/fileupload_form_test.php @@ -18,14 +18,14 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case { private $path; - public function setUp() + protected function setUp(): void { parent::setUp(); $this->path = __DIR__ . '/fixtures/files/'; $this->add_lang('posting'); } - public function tearDown() + protected function tearDown(): void { $iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/'); foreach ($iterator as $fileinfo) @@ -46,6 +46,13 @@ public function tearDown() private function upload_file($filename, $mimetype) { + $crawler = self::$client->request( + 'GET', + 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid + ); + + $file_form_data = array_merge(['add_file' => $this->lang('ADD_FILE')], $this->get_hidden_fields($crawler, 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid)); + $file = array( 'tmp_name' => $this->path . $filename, 'name' => $filename, @@ -56,8 +63,8 @@ private function upload_file($filename, $mimetype) $crawler = self::$client->request( 'POST', - 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid, - array('add_file' => $this->lang('ADD_FILE')), + 'posting.php?mode=reply&t=1&sid=' . $this->sid, + $file_form_data, array('fileupload' => $file) ); @@ -99,7 +106,6 @@ public function test_disallowed_content_no_check() $form = $crawler->selectButton('Submit')->form(array( 'config[check_attachment_content]' => 0, - 'config[img_imagick]' => '', )); self::submit($form); @@ -137,7 +143,7 @@ public function test_valid_file() $crawler = $this->upload_file('valid.jpg', 'image/jpeg'); // Ensure there was no error message rendered - $this->assertNotContains('

      ' . $this->lang('INFORMATION') . '

      ', $this->get_content()); + $this->assertStringNotContainsString('

      ' . $this->lang('INFORMATION') . '

      ', $this->get_content()); // Also the file name should be in the first row of the files table $this->assertEquals('valid.jpg', $crawler->filter('span.file-name')->eq(1)->text()); diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php deleted file mode 100644 index 4fced5700ac..00000000000 --- a/tests/functional/fileupload_remote_test.php +++ /dev/null @@ -1,121 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -/** - * @group functional - */ -class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case -{ - /** @var \phpbb\filesystem\filesystem_interface */ - protected $filesystem; - - /** @var \phpbb\files\factory */ - protected $factory; - - /** @var \bantu\IniGetWrapper\IniGetWrapper */ - protected $php_ini; - - /** @var \phpbb\language\language */ - protected $language; - - /** @var \phpbb\request\request_interface */ - protected $request; - - /** @var string phpBB root path */ - protected $phpbb_root_path; - - public function setUp() - { - parent::setUp(); - // Only doing this within the functional framework because we need a - // URL - - // Global $config required by unique_id - global $config, $phpbb_root_path, $phpEx; - - if (!is_array($config)) - { - $config = new \phpbb\config\config(array()); - } - - $config['rand_seed'] = ''; - $config['rand_seed_last_update'] = time() + 600; - $config['remote_upload_verify'] = 0; - - $this->filesystem = new \phpbb\filesystem\filesystem(); - $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); - $this->request = $this->createMock('\phpbb\request\request'); - $this->php_ini = new \bantu\IniGetWrapper\IniGetWrapper; - - $container = new phpbb_mock_container_builder(); - $container->set('files.filespec', new \phpbb\files\filespec($this->filesystem, $this->language, $this->php_ini, new \FastImageSize\FastImageSize(), $this->phpbb_root_path)); - $this->factory = new \phpbb\files\factory($container); - $container->set('files.factory', $this->factory); - $container->set('files.types.remote', new \phpbb\files\types\remote($config, $this->factory, $this->language, $this->php_ini, $this->request, $phpbb_root_path)); - $this->phpbb_root_path = $phpbb_root_path; - } - - public function tearDown() - { - global $config, $user; - $user = null; - $config = array(); - } - - public function test_invalid_extension() - { - /** @var \phpbb\files\upload $upload */ - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); - $upload->set_error_prefix('') - ->set_allowed_extensions(array('jpg')) - ->set_max_filesize(100); - $file = $upload->handle_upload('files.types.remote', self::$root_url . 'develop/blank.gif'); - $this->assertEquals('URL_INVALID', $file->error[0]); - } - - public function test_empty_file() - { - /** @var \phpbb\files\upload $upload */ - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); - $upload->set_error_prefix('') - ->set_allowed_extensions(array('jpg')) - ->set_max_filesize(100); - $file = $upload->handle_upload('files.types.remote', self::$root_url . 'develop/blank.jpg'); - $this->assertEquals('EMPTY_REMOTE_DATA', $file->error[0]); - } - - public function test_successful_upload() - { - /** @var \phpbb\files\upload $upload */ - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); - $upload->set_error_prefix('') - ->set_allowed_extensions(array('gif')) - ->set_max_filesize(2000); - $file = $upload->handle_upload('files.types.remote', self::$root_url . 'develop/test.gif'); - $this->assertEquals(0, count($file->error)); - $this->assertTrue(file_exists($file->get('filename'))); - $this->assertTrue($file->is_uploaded()); - } - - public function test_too_large() - { - /** @var \phpbb\files\upload $upload */ - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); - $upload->set_error_prefix('') - ->set_allowed_extensions(array('gif')) - ->set_max_filesize(100); - $file = $upload->handle_upload('files.types.remote', self::$root_url . 'develop/test.gif'); - $this->assertEquals(1, count($file->error)); - $this->assertEquals('WRONG_FILESIZE', $file->error[0]); - } -} diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php index 371ab7c967d..9e79de88a6d 100644 --- a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php +++ b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php @@ -25,12 +25,12 @@ class main_info { function module() { - return array( - 'filename' => 'foo\bar\acp\main_module', + return [ + 'filename' => '\foo\bar\acp\main_module', 'title' => 'ACP_FOOBAR_TITLE', - 'modes' => array( - 'mode' => array('title' => 'ACP_FOOBAR_MODE', 'auth' => '', 'cat' => array('ACP_FOOBAR_TITLE')), - ), - ); + 'modes' => [ + 'mode' => ['title' => 'ACP_FOOBAR_MODE', 'auth' => '', 'cat' => ['ACP_FOOBAR_TITLE']], + ], + ]; } } diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php index ee797c718d5..ec9e8d01451 100644 --- a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php +++ b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php @@ -27,7 +27,137 @@ class main_module function main($id, $mode) { + global $language, $template; + $this->tpl_name = 'foobar'; $this->page_title = 'Bertie'; + + $display_vars = [ + 'title' => 'ACP_FOOBAR_SETTINGS', + 'vars' => [ + 'legend' => 'GENERAL_SETTINGS', + // For the 'dimension' type the order is important: main setting goes last. + 'setting_0_width' => ['lang' => 'SETTING_0', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false], + 'setting_0_height' => ['lang' => 'SETTING_0', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false], + 'setting_0' => ['lang' => 'SETTING_0', 'validate' => 'int:0:16', 'type' => 'dimension:0:999', 'explain' => true, 'append' => ' ' . $language->lang('PIXEL')], + 'setting_1' => ['lang' => 'SETTING_1', 'validate' => 'bool', 'type' => 'custom', 'method' => 'submit_button', 'lang_explain' => 'CUSTOM_LANG_EXPLAIN', 'explain' => true], + 'setting_2' => ['lang' => 'SETTING_2', 'validate' => 'bool', 'type' => 'radio', 'function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'YES', 0 => 'NO']]], + 'setting_3' => ['lang' => 'SETTING_3', 'validate' => 'int:0:99999','type' => 'number:0:99999', 'explain' => true], + 'setting_4' => ['lang' => 'SETTING_4', 'validate' => 'string', 'type' => 'select', 'method' => 'create_select', 'explain' => true], + 'setting_5' => ['lang' => 'SETTING_5', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true], + 'setting_6' => ['lang' => 'SETTING_6', 'validate' => 'string', 'type' => 'password:25:255', 'explain' => true], + 'setting_7' => ['lang' => 'SETTING_7', 'validate' => 'email', 'type' => 'email:0:100', 'explain' => true], + 'setting_8' => ['lang' => 'SETTING_8', 'validate' => 'string', 'type' => 'textarea:5:30', 'explain' => true], + 'setting_9' => ['lang' => 'SETTING_9', 'validate' => 'bool', 'type' => 'radio', 'function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'ENABLED', 0 => 'DISABLED']], 'explain' => true], + 'setting_10'=> ['lang' => 'SETTING_10', 'validate' => 'int', 'type' => 'radio', 'function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'LABEL_1', 3 => 'LABEL_3', 2 => 'LABEL_2']], 'explain' => true], + 'setting_11'=> ['lang' => 'SETTING_11', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true], + 'setting_12'=> ['lang' => 'SETTING_12', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true], + ] + ]; + + $config = new \phpbb\config\config([ + 'setting_0_width' => '1', + 'setting_0_height' => '17', + 'setting_0' => '10', + 'setting_2' => '1', + 'setting_3' => '15', + 'setting_4' => '2', + 'setting_5' => 'Setting 5', + 'setting_6' => 'password', + 'setting_7' => 'test@example.dom', + 'setting_8' => 'Textarea', + 'setting_9' => '1', + 'setting_10' => '3', + 'setting_11' => '0', + 'setting_12' => '0', + ]); + $this->new_config = clone $config; + $cfg_array = (isset($_REQUEST['config'])) ? $request->variable('config', ['' => ''], true) : $this->new_config; + $error = []; + + validate_config_vars($display_vars['vars'], $cfg_array, $error); + + foreach ($display_vars['vars'] as $config_name => $null) + { + if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false) + { + continue; + } + + $this->new_config[$config_name] = $cfg_array[$config_name]; + } + + $template->assign_vars([ + 'L_TITLE' => $language->lang($display_vars['title']), + 'L_TITLE_EXPLAIN' => $language->lang($display_vars['title'] . '_EXPLAIN'), + + 'S_ERROR' => (sizeof($error)) ? true : false, + 'ERROR_MSG' => implode('
      ', $error), + + 'U_ACTION' => $this->u_action + ]); + + // Output relevant page + foreach ($display_vars['vars'] as $config_key => $vars) + { + if (!is_array($vars) && strpos($config_key, 'legend') === false) + { + continue; + } + + if (strpos($config_key, 'legend') !== false) + { + $template->assign_block_vars('options', [ + 'S_LEGEND' => true, + 'LEGEND' => $language->lang($vars), + ]); + + continue; + } + $type = explode(':', $vars['type']); + + $l_explain = ''; + $vars['explain'] = $vars['explain'] ?? false; + $vars['lang_explain'] = $vars['lang_explain'] ?? false; + + if ($vars['explain']) + { + $l_explain = $language->lang($vars['lang_explain'] ?: $vars['lang'] . '_EXPLAIN'); + } + + $content = phpbb_build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars); + + if (empty($content)) + { + continue; + } + + $template->assign_block_vars('options', [ + 'KEY' => $config_key, + 'TITLE' => $language->lang($vars['lang']), + 'S_EXPLAIN' => $vars['explain'], + 'TITLE_EXPLAIN' => $l_explain, + 'CONTENT' => $content, + ]); + + unset($display_vars['vars'][$config_key]); + } } + + function create_select($value) + { + $options = [ + 1 => 'Option 1', + 2 => 'Option 2', + 3 => 'Option 3', + ]; + + return ['options' => build_select($options, $value)]; + } + + function submit_button() + { + return ''; + } + } diff --git a/tests/functional/fixtures/ext/foo/bar/adm/style/foobar.html b/tests/functional/fixtures/ext/foo/bar/adm/style/foobar.html index 3cb45c269c8..4560a09da5d 100644 --- a/tests/functional/fixtures/ext/foo/bar/adm/style/foobar.html +++ b/tests/functional/fixtures/ext/foo/bar/adm/style/foobar.html @@ -1,3 +1,32 @@ -Bertie rulez! +

      {{ lang('TITLE') }}

      +

      {{ lang('TITLE_EXPLAIN') }}

      +{% if S_ERROR %} +
      +

      {{ lang('WARNING') }}

      +

      {{ ERROR_MSG }}

      +
      +{% endif %} + +{% for options in loops.options %} + {% if options.S_LEGEND %} + {% if not options.S_FIRST_ROW %} + + {% endif %} +
      + {{ options.LEGEND }} + {% else %} +
      +
      {% if options.S_EXPLAIN %}
      {{ options.TITLE_EXPLAIN }}{% endif %}
      +
      + {% if options.CONTENT is iterable %} + {{ FormsBuildTemplate(options.CONTENT) }} + {% else %} + {{ options.CONTENT }} + {% endif %} +
      +
      + + {% endif %} +{% endfor %} diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml index 495c775a1f8..cac5f9cd76c 100644 --- a/tests/functional/fixtures/ext/foo/bar/config/services.yml +++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml @@ -14,7 +14,13 @@ services: class: foo\bar\event\permission tags: - { name: event.listener } + foo_bar.listener.user_setup: class: foo\bar\event\user_setup tags: - { name: event.listener } + + foo_bar.listener.template_event_order: + class: foo\bar\event\template_event_order + tags: + - { name: event.listener } diff --git a/tests/functional/fixtures/ext/foo/bar/event/template_event_order.php b/tests/functional/fixtures/ext/foo/bar/event/template_event_order.php new file mode 100644 index 00000000000..16589591c93 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/event/template_event_order.php @@ -0,0 +1,38 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace foo\bar\event; + +/** +* Event listener +*/ +use Symfony\Component\EventDispatcher\EventSubscriberInterface; + +class template_event_order implements EventSubscriberInterface +{ + static public function getSubscribedEvents() + { + return array( + 'core.twig_event_tokenparser_constructor' => 'set_template_event_priority', + ); + } + + public function set_template_event_priority($event) + { + $template_event_priority_array = $event['template_event_priority_array']; + $template_event_priority_array['foo_bar'] = [ + 'event/navbar_header_quick_links_after' => -1, + ]; + $event['template_event_priority_array'] = $template_event_priority_array; + } +} diff --git a/tests/functional/fixtures/ext/foo/bar/event/template_event_order_higher.php b/tests/functional/fixtures/ext/foo/bar/event/template_event_order_higher.php new file mode 100644 index 00000000000..6d3978a2ad2 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/event/template_event_order_higher.php @@ -0,0 +1,38 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace foo\bar\event; + +/** +* Event listener +*/ +use Symfony\Component\EventDispatcher\EventSubscriberInterface; + +class template_event_order implements EventSubscriberInterface +{ + static public function getSubscribedEvents() + { + return array( + 'core.twig_event_tokenparser_constructor' => 'set_template_event_priority', + ); + } + + public function set_template_event_priority($event) + { + $template_event_priority_array = $event['template_event_priority_array']; + $template_event_priority_array['foo_bar'] = [ + 'event/navbar_header_quick_links_after' => 1, + ]; + $event['template_event_priority_array'] = $template_event_priority_array; + } +} diff --git a/tests/functional/fixtures/ext/foo/bar/mcp/main_info.php b/tests/functional/fixtures/ext/foo/bar/mcp/main_info.php new file mode 100644 index 00000000000..cad3cf76e4e --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/mcp/main_info.php @@ -0,0 +1,28 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace foo\bar\mcp; + +class main_info +{ + function module() + { + return [ + 'filename' => '\foo\bar\mcp\main_module', + 'title' => 'MCP_FOOBAR_TITLE', + 'modes' => [ + 'mode' => ['title' => 'MCP_FOOBAR_MODE', 'auth' => '', 'cat' => ['MCP_FOOBAR_TITLE']], + ], + ]; + } +} diff --git a/tests/functional/fixtures/ext/foo/bar/mcp/main_module.php b/tests/functional/fixtures/ext/foo/bar/mcp/main_module.php new file mode 100644 index 00000000000..fe984a83ff5 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/mcp/main_module.php @@ -0,0 +1,25 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace foo\bar\mcp; + +class main_module +{ + var $u_action; + + function main($id, $mode) + { + $this->tpl_name = 'foobar_mcp'; + $this->page_title = 'Bertie MCP'; + } +} diff --git a/tests/functional/fixtures/ext/foo/bar/migrations/add_acp_module.php b/tests/functional/fixtures/ext/foo/bar/migrations/add_acp_module.php new file mode 100644 index 00000000000..d2e2fb675b0 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/migrations/add_acp_module.php @@ -0,0 +1,31 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace foo\bar\migrations; + +class add_acp_module extends \phpbb\db\migration\migration +{ + public function update_data() + { + // Add ACP module + return [ + ['module.add', ['acp', 'ACP_CAT_DOT_MODS', 'ACP_FOOBAR']], + ['module.add', ['acp', 'ACP_FOOBAR', [ + 'module_basename' => '\foo\bar\acp\main_module', + 'module_langname' => 'ACP_FOOBAR_TITLE', + 'module_mode' => 'mode', + 'module_auth' => '', + ]]], + ]; + } +} diff --git a/tests/functional/fixtures/ext/foo/bar/migrations/add_mcp_module.php b/tests/functional/fixtures/ext/foo/bar/migrations/add_mcp_module.php new file mode 100644 index 00000000000..476aa89dfe5 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/migrations/add_mcp_module.php @@ -0,0 +1,31 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace foo\bar\migrations; + +class add_mcp_module extends \phpbb\db\migration\container_aware_migration +{ + public function update_data() + { + // Add MCP module + return [ + ['module.add', ['mcp', 'MCP_MAIN', 'MCP_FOOBAR']], + ['module.add', ['mcp', 'MCP_FOOBAR', [ + 'module_basename' => '\foo\bar\mcp\main_module', + 'module_langname' => 'MCP_FOOBAR_TITLE', + 'module_mode' => 'mode', + 'module_auth' => '', + ]]], + ]; + } +} diff --git a/tests/functional/fixtures/ext/foo/bar/migrations/add_permission.php b/tests/functional/fixtures/ext/foo/bar/migrations/add_permission.php new file mode 100644 index 00000000000..970c284954f --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/migrations/add_permission.php @@ -0,0 +1,25 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace foo\bar\migrations; + +class add_permission extends \phpbb\db\migration\container_aware_migration +{ + public function update_data() + { + // Add global permission + return [ + ['permission.add', ['u_foo', true]], + ]; + } +} diff --git a/tests/functional/fixtures/ext/foo/bar/migrations/add_ucp_module.php b/tests/functional/fixtures/ext/foo/bar/migrations/add_ucp_module.php new file mode 100644 index 00000000000..45ef7128c48 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/migrations/add_ucp_module.php @@ -0,0 +1,31 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace foo\bar\migrations; + +class add_ucp_module extends \phpbb\db\migration\container_aware_migration +{ + public function update_data() + { + // Add UCP module + return [ + ['module.add', ['ucp', 'UCP_MAIN', 'UCP_FOOBAR']], + ['module.add', ['ucp', 'UCP_FOOBAR', [ + 'module_basename' => '\foo\bar\ucp\main_module', + 'module_langname' => 'UCP_FOOBAR_TITLE', + 'module_mode' => 'mode', + 'module_auth' => '', + ]]], + ]; + } +} diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/index_body_forumlist_body_before.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/index_body_forumlist_body_before.html new file mode 100644 index 00000000000..2071af84333 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/index_body_forumlist_body_before.html @@ -0,0 +1 @@ +

      {{ lang('FOO_BAR_FORUMLIST_BODY_BEFORE') }}

      \ No newline at end of file diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/navbar_header_quick_links_after.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/navbar_header_quick_links_after.html new file mode 100644 index 00000000000..40be5d2b389 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/event/navbar_header_quick_links_after.html @@ -0,0 +1 @@ +
    • {{ lang('FOO_BAR_QUICK_LINK') }}
      • \ No newline at end of file diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_mcp.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_mcp.html new file mode 100644 index 00000000000..304d0fbd20d --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_mcp.html @@ -0,0 +1,3 @@ +{% INCLUDE 'overall_header.html' %} +
      MCP Extension Template Test Passed!
      +{% INCLUDE 'overall_footer.html' %} diff --git a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php index 4c744426393..26b515a1d66 100644 --- a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php +++ b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php @@ -17,12 +17,12 @@ class main_info { function module() { - return array( + return [ 'filename' => '\foo\bar\ucp\main_module', - 'title' => 'ACP_FOOBAR_TITLE', - 'modes' => array( - 'mode' => array('title' => 'ACP_FOOBAR_MODE', 'auth' => '', 'cat' => array('ACP_FOOBAR_TITLE')), - ), - ); + 'title' => 'UCP_FOOBAR_TITLE', + 'modes' => [ + 'mode' => ['title' => 'UCP_FOOBAR_MODE', 'auth' => '', 'cat' => ['UCP_FOOBAR_TITLE']], + ], + ]; } } diff --git a/tests/functional/fixtures/ext/foo/foo/config/services.yml b/tests/functional/fixtures/ext/foo/foo/config/services.yml index b3c77197155..fc10b65e56d 100644 --- a/tests/functional/fixtures/ext/foo/foo/config/services.yml +++ b/tests/functional/fixtures/ext/foo/foo/config/services.yml @@ -1,3 +1,8 @@ services: foo_foo.controller: class: foo\foo\controller\controller + + foo_foo.listener.template_event_order: + class: foo\foo\event\template_event_order + tags: + - { name: event.listener } diff --git a/tests/functional/fixtures/ext/foo/foo/event/template_event_order.php b/tests/functional/fixtures/ext/foo/foo/event/template_event_order.php new file mode 100644 index 00000000000..09045e918ef --- /dev/null +++ b/tests/functional/fixtures/ext/foo/foo/event/template_event_order.php @@ -0,0 +1,38 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace foo\foo\event; + +/** +* Event listener +*/ +use Symfony\Component\EventDispatcher\EventSubscriberInterface; + +class template_event_order implements EventSubscriberInterface +{ + static public function getSubscribedEvents() + { + return array( + 'core.twig_event_tokenparser_constructor' => 'set_template_event_priority', + ); + } + + public function set_template_event_priority($event) + { + $template_event_priority_array = $event['template_event_priority_array']; + $template_event_priority_array['foo_foo'] = [ + 'event/navbar_header_quick_links_after' => 1, + ]; + $event['template_event_priority_array'] = $template_event_priority_array; + } +} diff --git a/tests/functional/fixtures/ext/foo/foo/event/template_event_order_lower.php b/tests/functional/fixtures/ext/foo/foo/event/template_event_order_lower.php new file mode 100644 index 00000000000..d18eb85baf7 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/foo/event/template_event_order_lower.php @@ -0,0 +1,38 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace foo\foo\event; + +/** +* Event listener +*/ +use Symfony\Component\EventDispatcher\EventSubscriberInterface; + +class template_event_order implements EventSubscriberInterface +{ + static public function getSubscribedEvents() + { + return array( + 'core.twig_event_tokenparser_constructor' => 'set_template_event_priority', + ); + } + + public function set_template_event_priority($event) + { + $template_event_priority_array = $event['template_event_priority_array']; + $template_event_priority_array['foo_foo'] = [ + 'event/navbar_header_quick_links_after' => -1, + ]; + $event['template_event_priority_array'] = $template_event_priority_array; + } +} diff --git a/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/index_body_forumlist_body_before.html b/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/index_body_forumlist_body_before.html new file mode 100644 index 00000000000..3b76634e181 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/index_body_forumlist_body_before.html @@ -0,0 +1 @@ +

      {{ lang('FOO_FOO_FORUMLIST_BODY_BEFORE') }}

      \ No newline at end of file diff --git a/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/navbar_header_quick_links_after.html b/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/navbar_header_quick_links_after.html new file mode 100644 index 00000000000..932c93caff8 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/foo/styles/prosilver/template/event/navbar_header_quick_links_after.html @@ -0,0 +1 @@ +
    • {{ lang('FOO_FOO_QUICK_LINK') }}
      • \ No newline at end of file diff --git a/tests/functional/fixtures/files/extensions_catalog.json b/tests/functional/fixtures/files/extensions_catalog.json new file mode 100644 index 00000000000..1ab64d98dff --- /dev/null +++ b/tests/functional/fixtures/files/extensions_catalog.json @@ -0,0 +1,34 @@ +[ + { + "name": "extension1/vendor", + "display_name": "Extension 1", + "composer_name": "extension1/vendor", + "version": "1.0.0", + "description": "Dummy extension 1 for testing.", + "url": "https://example.com/extension1", + "authors": [ + { + "name": "Author One", + "email": "author1@example.com", + "homepage": "https://author1.example.com", + "role": "Developer" + } + ] + }, + { + "name": "phpbb/viglink", + "display_name": "VigLink", + "composer_name": "phpbb/viglink", + "version": "dev-master", + "description": "The VigLink extension for phpBB makes it possible to earn revenue, without any change to the user experience, when users post and follow links to commercial sites.", + "url": "https://www.phpbb.com/", + "authors": [ + { + "name": "Author Two", + "email": "author2@example.com", + "homepage": "https://author2.example.com", + "role": "Developer" + } + ] + } +] diff --git a/tests/functional/forgot_password_test.php b/tests/functional/forgot_password_test.php index 64fa19557fc..554b503470d 100644 --- a/tests/functional/forgot_password_test.php +++ b/tests/functional/forgot_password_test.php @@ -18,10 +18,9 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case { public function test_forgot_password_enabled() { - global $config; $this->add_lang('ucp'); - $crawler = self::request('GET', 'ucp.php?mode=sendpassword'); - $this->assertEquals($this->lang('SEND_PASSWORD'), $crawler->filter('h2')->text()); + $crawler = self::request('GET', 'app.php/user/forgot_password'); + $this->assertEquals($this->lang('RESET_PASSWORD'), $crawler->filter('h2')->text()); } public function test_forgot_password_disabled() @@ -40,12 +39,12 @@ public function test_forgot_password_disabled() $this->logout(); - $crawler = self::request('GET', 'ucp.php?mode=sendpassword'); - $this->assertContains($this->lang('UCP_PASSWORD_RESET_DISABLED', '', ''), $crawler->text()); + $crawler = self::request('GET', 'app.php/user/forgot_password'); + $this->assertStringContainsString($this->lang('UCP_PASSWORD_RESET_DISABLED', '', ''), $crawler->text()); } - public function tearDown() + protected function tearDown(): void { $this->login(); $this->admin_login(); diff --git a/tests/functional/forum_password_test.php b/tests/functional/forum_password_test.php index 4b2b69a92c2..93c0dbb6d61 100644 --- a/tests/functional/forum_password_test.php +++ b/tests/functional/forum_password_test.php @@ -34,7 +34,7 @@ public function test_setup_forum_with_password() $crawler = self::submit($form); } - public function data_enter_forum_with_password() + public static function data_enter_forum_with_password() { return array( array('foowrong', 'WRONG_PASSWORD'), diff --git a/tests/functional/forum_style_test.php b/tests/functional/forum_style_test.php index b3c1115b7f3..e2d5fdd129e 100644 --- a/tests/functional/forum_style_test.php +++ b/tests/functional/forum_style_test.php @@ -16,46 +16,33 @@ */ class phpbb_functional_forum_style_test extends phpbb_functional_test_case { - public function test_font_awesome_style() - { - $crawler = self::request('GET', 'viewtopic.php?t=1&f=2'); - $this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href')); - - $crawler = self::request('GET', 'viewtopic.php?t=1'); - $this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href')); - - $crawler = self::request('GET', 'viewtopic.php?t=1&view=next'); - $this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href')); - } - public function test_default_forum_style() { $crawler = self::request('GET', 'viewtopic.php?t=1&f=2'); - $this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); + $this->assertStringContainsString('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); $crawler = self::request('GET', 'viewtopic.php?t=1'); - $this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); + $this->assertStringContainsString('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); $crawler = self::request('GET', 'viewtopic.php?t=1&view=next'); - $this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); + $this->assertStringContainsString('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); } public function test_custom_forum_style() { - $db = $this->get_db(); $this->add_style(2, 'test_style'); - $db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 2 WHERE forum_id = 2'); + $this->db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 2 WHERE forum_id = 2'); $crawler = self::request('GET', 'viewtopic.php?t=1&f=2'); - $this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); + $this->assertStringContainsString('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); $crawler = self::request('GET', 'viewtopic.php?t=1'); - $this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); + $this->assertStringContainsString('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); $crawler = self::request('GET', 'viewtopic.php?t=1&view=next'); - $this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); + $this->assertStringContainsString('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href')); - $db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2'); + $this->db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2'); $this->delete_style(2, 'test_style'); } } diff --git a/tests/functional/jumpbox_test.php b/tests/functional/jumpbox_test.php index f5a671b1b93..9acaf5ee627 100644 --- a/tests/functional/jumpbox_test.php +++ b/tests/functional/jumpbox_test.php @@ -16,6 +16,8 @@ */ class phpbb_functional_jumpbox_test extends phpbb_functional_test_case { + protected $crawler; + public function test_jumpbox() { $this->login(); @@ -30,6 +32,6 @@ public function test_jumpbox() protected function check_valid_jump($forum) { - $this->assertContains($this->lang('FORUM') . ": $forum", $this->crawler->filter('#cp-main h2')->text(), $this->crawler->text()); + $this->assertStringContainsString($this->lang('FORUM') . ": $forum", $this->crawler->filter('#cp-main h2')->text(), $this->crawler->text()); } } diff --git a/tests/functional/lang_test.php b/tests/functional/lang_test.php index 7cffd0ef614..ed3b6786d20 100644 --- a/tests/functional/lang_test.php +++ b/tests/functional/lang_test.php @@ -22,11 +22,9 @@ public function test_lang() $this->assertEquals('Board index', $this->lang('FORUM_INDEX')); } - /** - * @expectedException RuntimeException - */ public function test_lang_missing() { + $this->expectException('RuntimeException'); $this->assertEquals('Your account has now been activated. Thank you for registering.', $this->lang('ACCOUNT_ACTIVE')); } diff --git a/tests/functional/manifest_test.php b/tests/functional/manifest_test.php new file mode 100644 index 00000000000..57551a67e22 --- /dev/null +++ b/tests/functional/manifest_test.php @@ -0,0 +1,48 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_manifest_test extends phpbb_functional_test_case +{ + public function test_manifest() + { + $url_path = preg_replace('#^(/.+)/$#', '$1/', parse_url(self::$root_url, PHP_URL_PATH)); + + $expected = [ + 'name' => 'yourdomain.com', + 'short_name' => 'yourdomain', + 'display' => 'standalone', + 'orientation' => 'portrait', + 'start_url' => $url_path, + 'scope' => $url_path, + ]; + + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=settings&sid=' . $this->sid); + + $form_data = [ + 'config[sitename]' => $expected['name'], + 'config[sitename_short]' => $expected['short_name'], + ]; + $form = $crawler->selectButton('submit')->form($form_data); + $crawler = self::submit($form); + $this->assertStringContainsString($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text()); + + self::request('GET', 'app.php/manifest', [], false); + $this->assertEquals(json_encode($expected), self::get_content()); + } +} diff --git a/tests/functional/mcp/mcp_logs_test.php b/tests/functional/mcp/mcp_logs_test.php new file mode 100644 index 00000000000..1b830cba33d --- /dev/null +++ b/tests/functional/mcp/mcp_logs_test.php @@ -0,0 +1,35 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_mcp_logs_test extends phpbb_functional_test_case +{ + public function test_delete_logs() + { + $this->add_lang(['mcp', 'common']); + + $this->login(); + $crawler = self::request('GET', "mcp.php?i=mcp_logs&mode=front&sid={$this->sid}"); + $this->assertGreaterThanOrEqual(1, $crawler->filter('input[type=checkbox]')->count()); + + $form = $crawler->selectButton($this->lang('DELETE_ALL'))->form(); + $crawler = self::submit($form); + + $form = $crawler->selectButton($this->lang('YES'))->form(); + $crawler = self::submit($form); + + $this->assertCount(0, $crawler->filter('input[type=checkbox]')); + } +} diff --git a/tests/functional/mcp/mcp_main_test.php b/tests/functional/mcp/mcp_main_test.php new file mode 100644 index 00000000000..4d5bfc1e0a3 --- /dev/null +++ b/tests/functional/mcp/mcp_main_test.php @@ -0,0 +1,319 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_mcp_main_test extends phpbb_functional_test_case +{ + public function test_create_topics() + { + $this->add_lang(['acp/common', 'acp/forums', 'common']); + $this->login(); + $this->admin_login(); + + $this->set_flood_interval(0); + + // Create a forum to move topics around + $forum_name = 'MCP Test #1'; + $crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}"); + $form = $crawler->selectButton($this->lang('CREATE_FORUM'))->form([ + 'forum_name' => $forum_name, + ]); + $crawler = self::submit($form); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'forum_parent_id' => 1, + 'forum_perm_from' => 2, + ]); + $crawler = self::submit($form); + $this->assertContainsLang('FORUM_CREATED', $crawler->text()); + + // Create topics to test with + $post = []; + $post[] = $this->create_topic(2, 'Test Topic 3', 'Testing forum moderation actions from MCP/View forum page.'); + $crawler = self::request('GET', "viewtopic.php?t={$post[0]['topic_id']}&sid={$this->sid}"); + $this->assertStringContainsString('Testing forum moderation actions from MCP/View forum page.', $crawler->filter('html')->text()); + + $post[] = $this->create_topic(2, 'Topic to merge with', 'Testing merge topics moderation actions from MCP/View forum page.'); + $crawler = self::request('GET', "viewtopic.php?t={$post[1]['topic_id']}&sid={$this->sid}"); + $this->assertStringContainsString('Testing merge topics moderation actions from MCP/View forum page.', $crawler->filter('html')->text()); + + $this->set_flood_interval(15); + + return $post; +} + + + /** + * @depends test_create_topics + */ + public function test_mcp_view_forum($post) + { + $this->add_lang(['common']); + $this->login(); + + // Browse MCP main page from forum view (gives &f=2) + $crawler = self::request('GET', "viewforum.php?f=2&sid={$this->sid}"); + $crawler = self::$client->click($crawler->selectLink($this->lang('MCP_SHORT'))->link()); + + // Test forum moderation page has a list of topics to select + $this->assertGreaterThanOrEqual(3, $crawler->filter('input[type=checkbox]')->count()); + + return $post; + } + + public static function mcp_view_forum_actions_data() + { + // action, success message, require_confirmation + return [ + ['delete_topic', 'TOPIC_DELETED_SUCCESS', true], + ['restore_topic', 'TOPIC_RESTORED_SUCCESS', true], + ['fork', 'TOPIC_FORKED_SUCCESS', true], + ['lock', 'TOPIC_LOCKED_SUCCESS', true], + ['unlock', 'TOPIC_UNLOCKED_SUCCESS', true], + ['resync', 'TOPIC_RESYNC_SUCCESS', false], + ['make_global', 'TOPIC_TYPE_CHANGED', true], + ['make_announce', 'TOPIC_TYPE_CHANGED', true], + ['make_sticky', 'TOPIC_TYPE_CHANGED', true], + ['make_normal', 'TOPIC_TYPE_CHANGED', true], + ['merge_topics', 'POSTS_MERGED_SUCCESS', true], + ['move', 'TOPIC_MOVED_SUCCESS', true], + ]; + } + + /** + * @depends test_mcp_view_forum + * @dataProvider mcp_view_forum_actions_data + */ + public function test_mcp_view_forum_actions($action, $message, $require_confirmation, $post) + { + $topic_id_1 = $post[0]['topic_id']; + $topic_id_2 = $post[1]['topic_id']; + + $this->add_lang(['common', 'mcp']); + $this->login(); + + $crawler = self::request('GET', "viewforum.php?f=2&sid={$this->sid}"); + $crawler = self::$client->click($crawler->selectLink($this->lang('MCP_SHORT'))->link()); + + // Test actions + $form = $crawler->selectButton($this->lang('SUBMIT'))->form()->disableValidation()->setValues([ + 'action' => $action, + 'topic_id_list' => [$action == 'move' ? $topic_id_2 : $topic_id_1], // while moving, topic_id_1 has been already merged into topic_id_2 + ]); + $crawler = self::submit($form); + + if ($require_confirmation) + { + if ($action == 'merge_topics') + { + // Merge topic_id_1 into topic_id_2 + $select_for_merge_link = $crawler->selectLink($this->lang('SELECT_MERGE'))->reduce( + function ($node, $i) use ($topic_id_2) + { + return (bool) strpos($node->attr('href'), "to_topic_id=$topic_id_2"); + } + )->link(); + + $crawler = self::$client->click($select_for_merge_link); + } + + $form = $crawler->selectButton($this->lang('YES'))->form(); + + if (in_array($action, ['fork', 'move'])) + { + // Fork or move the topic to the 'MCP Test #1' + $forum_id = $crawler->filter('select > option')->reduce( + function ($node, $i) + { + return (bool) strpos($node->text(), 'MCP Test #1'); + } + )->attr('value'); + $form['to_forum_id']->select($forum_id); + } + + $crawler = self::submit($form); + } + + $this->assertStringContainsString($this->lang($message), $crawler->filter('#message p')->text()); + } + + /** + * @depends test_mcp_view_forum_actions + */ + public function test_mcp_view_forum_permanently_delete_topic() + { + $this->add_lang(['common', 'mcp']); + $this->login(); + + // Get to the forum 'MCP Test #1' where the topic has been moved to in previous test + $crawler = self::request('GET', "index.php?sid={$this->sid}"); + $crawler = self::$client->click($crawler->selectLink('MCP Test #1')->link()); + $crawler = self::$client->click($crawler->selectLink($this->lang('MCP_SHORT'))->link()); + + // Get topic ids to delete (forked and moved topics in the previous test) + $topic_link_1 = $crawler->selectLink('Test Topic 3')->attr('href'); + $topic_link_2 = $crawler->selectLink('Topic to merge with')->attr('href'); + $topic_ids = [ + (int) $this->get_parameter_from_link($topic_link_1, 't'), + (int) $this->get_parameter_from_link($topic_link_2, 't'), + ]; + + $form = $crawler->selectButton($this->lang('SUBMIT'))->form()->disableValidation()->setValues([ + 'action' => 'delete_topic', + 'topic_id_list' => $topic_ids, // tick both topics in the list + ]); + $crawler = self::submit($form); + + $form = $crawler->selectButton($this->lang('YES'))->form(); + $form['delete_permanent']->tick(); + $crawler = self::submit($form); + $this->assertStringContainsString($this->lang('TOPICS_DELETED_SUCCESS'), $crawler->filter('#message p')->text()); + } + + public static function mcp_view_topic_actions_data() + { + // action, success message, require_confirmation + return [ + ['lock_post', 'POSTS_LOCKED_SUCCESS', true], + ['unlock_post', 'POSTS_UNLOCKED_SUCCESS', true], + ['resync', 'TOPIC_RESYNC_SUCCESS', false], + ['split_all', 'TOPIC_SPLIT_SUCCESS', true], + ['split_beyond', 'TOPIC_SPLIT_SUCCESS', true], + ['merge_posts', 'POSTS_MERGED_SUCCESS', true], + ['delete_post', 'POSTS_DELETED_SUCCESS', true], + ]; + } + + public function test_create_topic_with_replies() + { + $this->login(); + + // Create topic and replies to test with + $post = []; + $post[] = $this->create_topic(2, 'Test Topic 4', 'Testing topic moderation actions from MCP/View topic page.'); + $crawler = self::request('GET', "viewtopic.php?t={$post[0]['topic_id']}&sid={$this->sid}"); + $this->assertStringContainsString('Testing topic moderation actions from MCP/View topic page.', $crawler->filter('html')->text()); + + // Create replies. Flood control was disabled above + for ($i = 1; $i <= 15; $i++) + { + usleep(100000); + $post_text = "This is reply number $i to the Test Topic 4 to test moderation actions from MCP/View topic page."; + $post[$i] = $this->create_post(2, $post[0]['topic_id'], 'Re: Test Topic 4', $post_text); + $crawler = self::request('GET', "viewtopic.php?p={$post[$i]['post_id']}&sid={$this->sid}#p{$post[$i]['post_id']}"); + $this->assertStringContainsString($post_text, $crawler->filter('html')->text()); + } + + return $post; + } + + /** + * @depends test_create_topic_with_replies + * @dataProvider mcp_view_topic_actions_data + */ + public function test_mcp_view_topic_actions($action, $message, $require_confirmation, $post) + { + $this->add_lang(['common', 'mcp']); + $this->login(); + + $crawler = self::request('GET', "viewtopic.php?t={$post[0]['topic_id']}&sid={$this->sid}"); + $crawler = self::$client->click($crawler->selectLink($this->lang('MCP_SHORT'))->link()); + $this->assertLessThanOrEqual(count($post), $crawler->filter('input[type=checkbox]')->count()); + + // Test actions + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + + // Set posts to select for actions + $post_id_list = []; + switch ($action) + { + case 'lock_post': + case 'unlock_post': + $post_id_list = [$post[1]['post_id'], $post[2]['post_id']]; + break; + + case 'split_all': + $post_id_list = [$post[13]['post_id'], $post[14]['post_id'], $post[15]['post_id']]; // Split last 3 replies + $subject = '[Split] Topic 1'; + break; + + case 'split_beyond': + $post_id_list = [$post[10]['post_id']]; // Split from 10th reply + $subject = '[Split] Topic 2'; + break; + + case 'merge_posts': + $post_id_list = [$post[7]['post_id'], $post[8]['post_id'], $post[9]['post_id']]; // Split replies 7, 8, 9 + break; + + case 'delete_post': + $post_id_list = [$post[4]['post_id'], $post[5]['post_id'], $post[6]['post_id']]; // Delete posts 4, 5, 6 + break; + + default: + break; + } + + $form->disableValidation()->setValues([ + 'action' => $action, + 'post_id_list' => $post_id_list, // tick post ids + ]); + $crawler = self::submit($form); + + if ($require_confirmation) + { + if ($action == 'merge_posts') + { + // Merge posts into '[Split] Topic 1' + // Get topics list to select from + $crawler = self::$client->click($crawler->selectLink($this->lang('SELECT_TOPIC'))->link()); + + // Get '[Split] Topic 1' topic_id + $to_topic_link = $crawler->selectLink('[Split] Topic 1')->attr('href'); + $to_topic_id = (int) $this->get_parameter_from_link($to_topic_link, 't'); + + // Select '[Split] Topic 1' + $select_for_merge_link = $crawler->selectLink($this->lang('SELECT_MERGE'))->reduce( + function ($node, $i) use ($to_topic_id) + { + return (bool) strpos($node->attr('href'), "to_topic_id=$to_topic_id"); + } + )->link(); + + $crawler = self::$client->click($select_for_merge_link); + + $this->assertEquals($to_topic_id, (int) $crawler->filter('#to_topic_id')->attr('value')); + + // Reselect post ids to move + $form = $crawler->selectButton($this->lang('SUBMIT'))->form()->disableValidation()->setValues(['post_id_list' => $post_id_list]); + $crawler = self::submit($form); + } + + if (in_array($action, ['split_all', 'split_beyond'])) + { + $form = $crawler->selectButton($this->lang('SUBMIT'))->form()->disableValidation()->setValues([ + 'subject' => $subject, + 'post_id_list' => $post_id_list, // tick post ids + 'to_forum_id' => 2, + ]); + $crawler = self::submit($form); + } + + $form = $crawler->selectButton($this->lang('YES'))->form(); + $crawler = self::submit($form); + } + + $this->assertStringContainsString($this->lang($message), $crawler->filter('#message p')->text()); + } +} diff --git a/tests/functional/mcp/mcp_quickmod_tools_test.php b/tests/functional/mcp/mcp_quickmod_tools_test.php new file mode 100644 index 00000000000..ef44f31efbc --- /dev/null +++ b/tests/functional/mcp/mcp_quickmod_tools_test.php @@ -0,0 +1,63 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_mcp_quickmod_tools_test extends phpbb_functional_test_case +{ + public function test_post_new_topic() + { + $this->login(); + + // Test creating topic + $post = $this->create_topic(2, 'Test Topic 2', 'Testing move post with "Move posts" option from Quick-Moderator Tools.'); + + $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); + $this->assertStringContainsString('Testing move post with "Move posts" option from Quick-Moderator Tools.', $crawler->filter('html')->text()); + + return $crawler; + } + + /** + * @depends test_post_new_topic + */ + public function test_handle_quickmod($crawler) + { + $this->login(); + + // Test moving a post + return $this->get_quickmod_page(0, 'MERGE_POSTS', $crawler); + } + + /** + * @depends test_handle_quickmod + */ + public function test_move_post_to_topic($crawler) + { + $this->login(); + $this->add_lang(['common', 'mcp']); + + // Select the post in MCP + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(array( + 'to_topic_id' => 1, + )); + $form['post_id_list'][0]->tick(); + $crawler = self::submit($form); + $this->assertStringContainsString($this->lang('MERGE_POSTS_CONFIRM'), $crawler->filter('html')->text()); + + $form = $crawler->selectButton($this->lang('YES'))->form(); + $crawler = self::submit($form); + $this->assertStringContainsString($this->lang('POSTS_MERGED_SUCCESS'), $crawler->text()); + } +} diff --git a/tests/functional/mcp/mcp_test.php b/tests/functional/mcp/mcp_test.php new file mode 100644 index 00000000000..b2d8fd6cac4 --- /dev/null +++ b/tests/functional/mcp/mcp_test.php @@ -0,0 +1,60 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_mcp_test extends phpbb_functional_test_case +{ + public function test_all_mcp_module_links() + { + $this->login(); + $this->add_lang(['common', 'mcp']); + + // Browse MCP main page + $crawler = self::request('GET', 'index.php'); + $crawler = self::$client->click($crawler->selectLink($this->lang('MCP_SHORT'))->link()); + self::assert_response_html(); + + // Get all MCP module URLs array + $mcp_modules = $crawler->filter('.tabs a')->each( + function ($node, $i) + { + return $node->link(); + } + ); + $this->assertNotEmpty($mcp_modules); + + // Browse all MCP modules and get their mode URLs array + $mcp_submodules = []; + foreach ($mcp_modules as $module) + { + $crawler = self::$client->click($module); + self::assert_response_html(); + $mcp_submodules = array_merge($mcp_submodules, $crawler->filter('.cp-menu a')->each( + function ($node, $i) + { + return $node->link(); + } + )); + } + $this->assertNotEmpty($mcp_submodules); + + // Browse all MCP submodules' modes + foreach ($mcp_submodules as $mcp_submodule) + { + self::$client->click($mcp_submodule); + self::assert_response_html(); + } + } +} diff --git a/tests/functional/mcp_test.php b/tests/functional/mcp_test.php deleted file mode 100644 index 40615d66a54..00000000000 --- a/tests/functional/mcp_test.php +++ /dev/null @@ -1,83 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -/** -* @group functional -*/ -class phpbb_functional_mcp_test extends phpbb_functional_test_case -{ - public function test_post_new_topic() - { - $this->login(); - - // Test creating topic - $post = $this->create_topic(2, 'Test Topic 2', 'Testing move post with "Move posts" option from Quick-Moderator Tools.'); - - $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - $this->assertContains('Testing move post with "Move posts" option from Quick-Moderator Tools.', $crawler->filter('html')->text()); - - return $crawler; - } - - /** - * @depends test_post_new_topic - */ - public function test_handle_quickmod($crawler) - { - // Test moving a post - return $this->get_quickmod_page(0, 'MERGE_POSTS', $crawler); - } - - /** - * @depends test_handle_quickmod - */ - public function test_move_post_to_topic($crawler) - { - // Select the post in MCP - $form = $crawler->selectButton($this->lang('SUBMIT'))->form(array( - 'to_topic_id' => 1, - )); - $form['post_id_list'][0]->tick(); - $crawler = self::submit($form); - $this->assertContains($this->lang('MERGE_POSTS'), $crawler->filter('html')->text()); - - return $crawler; - } - - /** - * @depends test_move_post_to_topic - */ - public function test_confirm_result($crawler) - { - $this->add_lang('mcp'); - $form = $crawler->selectButton('Yes')->form(); - $crawler = self::submit($form); - $this->assertContains($this->lang('POSTS_MERGED_SUCCESS'), $crawler->text()); - } - - public function test_delete_logs() - { - $this->login(); - $crawler = self::request('GET', "mcp.php?i=mcp_logs&mode=front&sid={$this->sid}"); - $this->assertGreaterThanOrEqual(1, $crawler->filter('input[type=checkbox]')->count()); - - $this->add_lang('mcp'); - $form = $crawler->selectButton($this->lang('DELETE_ALL'))->form(); - $crawler = self::submit($form); - - $form = $crawler->selectButton('Yes')->form(); - $crawler = self::submit($form); - - $this->assertCount(0, $crawler->filter('input[type=checkbox]')); - } -} diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php index 1da5c39401f..b088b67dbb2 100644 --- a/tests/functional/memberlist_test.php +++ b/tests/functional/memberlist_test.php @@ -22,15 +22,15 @@ public function test_memberlist() // logs in as admin $this->login(); $crawler = self::request('GET', 'memberlist.php?sid=' . $this->sid); - $this->assertContains('memberlist-test-user', $crawler->text()); + $this->assertStringContainsString('memberlist-test-user', $crawler->text()); // restrict by first character $crawler = self::request('GET', 'memberlist.php?first_char=m&sid=' . $this->sid); - $this->assertContains('memberlist-test-user', $crawler->text()); + $this->assertStringContainsString('memberlist-test-user', $crawler->text()); // make sure results for wrong character are not returned $crawler = self::request('GET', 'memberlist.php?first_char=a&sid=' . $this->sid); - $this->assertNotContains('memberlist-test-user', $crawler->text()); + $this->assertStringNotContainsString('memberlist-test-user', $crawler->text()); } public function test_viewprofile() @@ -38,12 +38,12 @@ public function test_viewprofile() $this->login(); // XXX hardcoded user id $crawler = self::request('GET', 'memberlist.php?mode=viewprofile&u=2&sid=' . $this->sid); - $this->assertContains('admin', $crawler->filter('h2')->text()); + $this->assertStringContainsString('admin', $crawler->filter('h2')->text()); } protected function get_memberlist_leaders_table_crawler() { - $crawler = self::request('GET', 'memberlist.php?mode=team&sid=' . $this->sid); + $crawler = self::request('GET', 'app.php/members/team'); return $crawler->filter('.forumbg-table'); } @@ -55,16 +55,16 @@ public function test_leaders() $crawler = $this->get_memberlist_leaders_table_crawler(); // Admin in admin group, but not in moderators - $this->assertContains('admin', $crawler->eq(0)->text()); - $this->assertNotContains('admin', $crawler->eq(1)->text()); + $this->assertStringContainsString('admin', $crawler->eq(0)->text()); + $this->assertStringNotContainsString('admin', $crawler->eq(1)->text()); // memberlist-test-user in neither group - $this->assertNotContains('memberlist-test-user', $crawler->eq(0)->text()); - $this->assertNotContains('memberlist-test-user', $crawler->eq(1)->text()); + $this->assertStringNotContainsString('memberlist-test-user', $crawler->eq(0)->text()); + $this->assertStringNotContainsString('memberlist-test-user', $crawler->eq(1)->text()); // memberlist-test-moderator in neither group - $this->assertNotContains('memberlist-test-moderator', $crawler->eq(0)->text()); - $this->assertNotContains('memberlist-test-moderator', $crawler->eq(1)->text()); + $this->assertStringNotContainsString('memberlist-test-moderator', $crawler->eq(0)->text()); + $this->assertStringNotContainsString('memberlist-test-moderator', $crawler->eq(1)->text()); } public function test_leaders_remove_users() @@ -74,14 +74,14 @@ public function test_leaders_remove_users() // Remove admin from admins, but is now in moderators $this->remove_user_group('ADMINISTRATORS', array('admin')); $crawler = $this->get_memberlist_leaders_table_crawler(); - $this->assertNotContains('admin', $crawler->eq(0)->text()); - $this->assertContains('admin', $crawler->eq(1)->text()); + $this->assertStringNotContainsString('admin', $crawler->eq(0)->text()); + $this->assertStringContainsString('admin', $crawler->eq(1)->text()); // Remove admin from moderators, should not be visible anymore $this->remove_user_group('GLOBAL_MODERATORS', array('admin')); $crawler = $this->get_memberlist_leaders_table_crawler(); - $this->assertNotContains('admin', $crawler->eq(0)->text()); - $this->assertNotContains('admin', $crawler->eq(1)->text()); + $this->assertStringNotContainsString('admin', $crawler->eq(0)->text()); + $this->assertStringNotContainsString('admin', $crawler->eq(1)->text()); } public function test_leaders_add_users() @@ -91,20 +91,20 @@ public function test_leaders_add_users() // Add memberlist-test-moderator to moderators $this->add_user_group('GLOBAL_MODERATORS', array('memberlist-test-moderator')); $crawler = $this->get_memberlist_leaders_table_crawler(); - $this->assertNotContains('memberlist-test-moderator', $crawler->eq(0)->text()); - $this->assertContains('memberlist-test-moderator', $crawler->eq(1)->text()); + $this->assertStringNotContainsString('memberlist-test-moderator', $crawler->eq(0)->text()); + $this->assertStringContainsString('memberlist-test-moderator', $crawler->eq(1)->text()); // Add admin to moderators, should be visible as moderator $this->add_user_group('GLOBAL_MODERATORS', array('admin'), true); $crawler = $this->get_memberlist_leaders_table_crawler(); - $this->assertNotContains('admin', $crawler->eq(0)->text()); - $this->assertContains('admin', $crawler->eq(1)->text()); + $this->assertStringNotContainsString('admin', $crawler->eq(0)->text()); + $this->assertStringContainsString('admin', $crawler->eq(1)->text()); // Add admin to admins as leader, should be visible as admin, not moderator $this->add_user_group('ADMINISTRATORS', array('admin'), true, true); $crawler = $this->get_memberlist_leaders_table_crawler(); - $this->assertContains('admin', $crawler->eq(0)->text()); - $this->assertNotContains('admin', $crawler->eq(1)->text()); + $this->assertStringContainsString('admin', $crawler->eq(0)->text()); + $this->assertStringNotContainsString('admin', $crawler->eq(1)->text()); } public function test_group_rank() @@ -130,8 +130,33 @@ public function test_group_rank() $this->assertContainsLang('RANK_UPDATED', $crawler->filter('.successbox')->text()); $crawler = self::request('GET', 'memberlist.php?mode=group&g=2'); - $this->assertContains('memberlist-test-user', $crawler->text()); + $this->assertStringContainsString('memberlist-test-user', $crawler->text()); unlink(__DIR__ . '/../../phpBB/images/ranks/valid.jpg'); } + + public function test_email() + { + $this->login(); + $this->admin_login(); + $this->add_lang(['acp/board', 'acp/common', 'memberlist']); + + $crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=email"); + $form = $crawler->selectButton('Submit')->form([ + 'config[board_email_form]' => 1, + ]); + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); + + $crawler = self::request('GET', 'memberlist.php?mode=email&u=2'); + $this->assertStringContainsString($this->lang('SEND_EMAIL_USER', 'admin'), $crawler->filter('.titlespace')->text()); + + $form = $crawler->selectButton($this->lang('SEND_EMAIL'))->form([ + 'subject' => 'Test email form message', + 'message' => 'This is a test email message sent from a member profile email form.', + ]); + $crawler = self::submit($form); + + $this->assertContainsLang('EMAIL_SENT', $crawler->text()); + } } diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php index 8456c40f00e..9744bf08a7f 100644 --- a/tests/functional/metadata_manager_test.php +++ b/tests/functional/metadata_manager_test.php @@ -16,45 +16,34 @@ */ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case { - protected $phpbb_extension_manager; + private static $helper; - static private $helper; - - static protected $fixtures = array( - 'foo/bar/', + protected static $fixtures = array( + './', ); - public function tearDown() - { - $this->purge_cache(); - - parent::tearDown(); - } - - static public function setUpBeforeClass() + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); self::$helper = new phpbb_test_case_helpers(__CLASS__); - self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); + self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures); + + self::install_ext('foo/bar'); } - static public function tearDownAfterClass() + public static function tearDownAfterClass(): void { parent::tearDownAfterClass(); + self::uninstall_ext('foo/bar'); self::$helper->restore_original_ext_dir(); } - public function setUp() + protected function setUp(): void { parent::setUp(); - $this->phpbb_extension_manager = $this->get_extension_manager(); - - $this->purge_cache(); - $this->phpbb_extension_manager->enable('foo/bar'); - $this->login(); $this->admin_login(); $this->add_lang('acp/extensions'); @@ -63,9 +52,9 @@ public function setUp() public function test_extensions_list() { $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); - $this->assertContains($this->lang('EXTENSIONS_EXPLAIN'), $crawler->filter('#main')->text()); - $this->assertContains('phpBB 3.1 Extension Testing', $crawler->filter('#main')->text()); - $this->assertContains('Details', $crawler->filter('#main')->text()); + $this->assertStringContainsString($this->lang('EXTENSIONS_EXPLAIN'), $crawler->filter('#main')->text()); + $this->assertStringContainsString('phpBB 3.1 Extension Testing', $crawler->filter('#main')->text()); + $this->assertStringContainsString('Details', $crawler->filter('#main')->text()); } public function test_extensions_details() @@ -73,15 +62,15 @@ public function test_extensions_details() $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo%2Fbar&sid=' . $this->sid); // Test whether the details are displayed - $this->assertContains($this->lang('CLEAN_NAME'), $crawler->filter('#main')->text()); - $this->assertContains('foo/bar', $crawler->filter('#meta_name')->text()); + $this->assertStringContainsString($this->lang('CLEAN_NAME'), $crawler->filter('#main')->text()); + $this->assertStringContainsString('foo/bar', $crawler->filter('#meta_name')->text()); - $this->assertContains($this->lang('PHP_VERSION'), $crawler->filter('#main')->text()); - $this->assertContains('>=5.3', $crawler->filter('#require_php')->text()); + $this->assertStringContainsString($this->lang('PHP_VERSION'), $crawler->filter('#main')->text()); + $this->assertStringContainsString('>=5.3', $crawler->filter('#require_php')->text()); // Details should be html escaped // However, text() only returns the displayed text, so HTML Special Chars are decoded. // So we test this directly on the content of the response. - $this->assertContains('>=5.3', $this->get_content()); + $this->assertStringContainsString('>=5.3', $this->get_content()); } public function test_extensions_details_notexists() @@ -89,6 +78,6 @@ public function test_extensions_details_notexists() $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=not%2Fexists&sid=' . $this->sid); // Error message because the files do not exist - $this->assertContains($this->lang('FILE_NOT_FOUND', ''), $crawler->filter('#main')->text()); + $this->assertStringContainsString($this->lang('FILE_NOT_FOUND', ''), $crawler->filter('#main')->text()); } } diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php index 4ca1d4b6373..6d4ca216318 100644 --- a/tests/functional/notification_test.php +++ b/tests/functional/notification_test.php @@ -16,7 +16,7 @@ */ class phpbb_functional_notification_test extends phpbb_functional_test_case { - static public function user_subscription_data() + public static function user_subscription_data() { return array( // Rows inserted by phpBB/install/schemas/schema_data.sql @@ -65,9 +65,9 @@ public function test_mark_notifications_read() $this->login('notificationtestuser'); // Post a new post that needs approval - $this->create_post(2, 1, 'Re: Welcome to phpBB3', 'This is a test [b]post[/b] posted by notificationtestuser.', array(), 'POST_STORED_MOD'); + $this->create_post(2, 1, 'Re: Welcome to phpBB', 'This is a test [b]post[/b] posted by notificationtestuser.', array(), 'POST_STORED_MOD'); $crawler = self::request('GET', "viewtopic.php?t=1&sid={$this->sid}"); - $this->assertNotContains('This is a test post posted by notificationtestuser.', $crawler->filter('html')->text()); + $this->assertStringNotContainsString('This is a test post posted by notificationtestuser.', $crawler->filter('html')->text()); // Login as admin $this->logout(); diff --git a/tests/functional/notification_webpush_test.php b/tests/functional/notification_webpush_test.php new file mode 100644 index 00000000000..acd15a261d6 --- /dev/null +++ b/tests/functional/notification_webpush_test.php @@ -0,0 +1,127 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_notification_webpush_test extends phpbb_functional_test_case +{ + public function test_acp_module() + { + $this->login(); + $this->admin_login(); + + $this->add_lang(['acp/board', 'acp/common']); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=webpush&sid=' . $this->sid); + + $this->assertContainsLang('ACP_WEBPUSH_SETTINGS', $crawler->filter('div.main > h1')->text()); + $this->assertContainsLang('ACP_WEBPUSH_SETTINGS_EXPLAIN', $crawler->filter('div.main > p')->text()); + $this->assertContainsLang('WEBPUSH_GENERATE_VAPID_KEYS', $crawler->filter('input[type="button"]')->attr('value')); + + $form_data = [ + 'config[webpush_enable]' => 1, + 'config[webpush_vapid_public]' => 'BDnYSJHVZBxq834LqDGr893IfazEez7q-jYH2QBNlT0ji2C9UwGosiqz8Dp_ZN23lqAngBZyRjXVWF4ZLA8X2zI', + 'config[webpush_vapid_private]' => 'IE5OYlmfWsMbBU1lzvr0bxrxVAXIteSkAnwGlZIhmRk', + 'config[webpush_method_default_enable]' => 1, + 'config[webpush_dropdown_subscribe]' => 1, + ]; + $form = $crawler->selectButton('submit')->form($form_data); + $crawler = self::submit($form); + $this->assertStringContainsString($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text()); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=webpush&sid=' . $this->sid); + + foreach ($form_data as $config_name => $config_value) + { + $config_value = ($config_name === 'config[webpush_vapid_private]') ? '********' : $config_value; + $this->assertEquals($config_value, $crawler->filter('input[name="' . $config_name . '"]')->attr('value')); + } + } + + public function test_ucp_module() + { + $this->login(); + $this->admin_login(); + + $this->add_lang('ucp'); + + $crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options'); + + $this->assertContainsLang('NOTIFY_WEBPUSH_ENABLE', $crawler->filter('label[for="subscribe_webpush"]')->text()); + $this->assertContainsLang('NOTIFICATION_METHOD_WEBPUSH', $crawler->filter('th.mark')->eq(2)->text()); + + // Assert checkbox is checked + $wp_list = $crawler->filter('.table1'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.bookmark_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.mention_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.post_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.quote_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.topic_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.forum_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.group_request_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.pm_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.report_pm_closed_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.report_post_closed_notification.method.webpush'); + + $this->set_acp_option('webpush_method_default_enable', 0); + + $crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options'); + + // Assert checkbox is unchecked + $wp_list = $crawler->filter('.table1'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.bookmark_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.mention_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.post_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.quote_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.topic_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.forum_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.group_request_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.pm_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.report_pm_closed_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.report_post_closed_notification.method.webpush'); + } + + public function test_dropdown_subscribe_button() + { + $this->login(); + $this->admin_login(); + + // Assert subscribe dropdown is present + $crawler = self::request('GET', 'index.php'); + $this->assertCount(1, $crawler->filter('.webpush-subscribe')); + $this->assertContainsLang('NOTIFY_WEB_PUSH_SUBSCRIBE', $crawler->filter('.webpush-subscribe #subscribe_webpush')->text()); + $this->assertContainsLang('NOTIFY_WEB_PUSH_SUBSCRIBED', $crawler->filter('.webpush-subscribe #unsubscribe_webpush')->text()); + + // Assert subscribe button is not displayed in UCP when dropdown subscribe is present + $crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options'); + $this->assertCount(0, $crawler->filter('.webpush-subscribe')); + + $this->set_acp_option('webpush_dropdown_subscribe', 0); + + // Assert subscribe dropdown is not present by default + $crawler = self::request('GET', 'index.php'); + $this->assertCount(0, $crawler->filter('.webpush-subscribe')); + } + + protected function set_acp_option($option, $value) + { + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=webpush&sid=' . $this->sid); + $form = $crawler->selectButton('Submit')->form(); + $values = $form->getValues(); + $values["config[{$option}]"] = $value; + $form->setValues($values); + $crawler = self::submit($form); + $this->assertEquals(1, $crawler->filter('.successbox')->count()); + } +} diff --git a/tests/functional/paging_test.php b/tests/functional/paging_test.php index cfaf9104a87..f6d69609194 100644 --- a/tests/functional/paging_test.php +++ b/tests/functional/paging_test.php @@ -27,17 +27,17 @@ public function test_pagination() $this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', 'This is a test post no' . $post_id . ' posted by the testing framework.'); } $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - $this->assertContains('post no4', $crawler->text()); - $this->assertNotContains('post no16', $crawler->text()); + $this->assertStringContainsString('post no4', $crawler->text()); + $this->assertStringNotContainsString('post no16', $crawler->text()); $next_link = $crawler->filter('.pagination > ul > li.next > a')->attr('href'); $crawler = self::request('GET', $next_link); - $this->assertNotContains('post no4', $crawler->text()); - $this->assertContains('post no16', $crawler->text()); + $this->assertStringNotContainsString('post no4', $crawler->text()); + $this->assertStringContainsString('post no16', $crawler->text()); $prev_link = $crawler->filter('.pagination > ul > li.previous > a')->attr('href'); $crawler = self::request('GET', $prev_link); - $this->assertContains('post no4', $crawler->text()); - $this->assertNotContains('post no16', $crawler->text()); + $this->assertStringContainsString('post no4', $crawler->text()); + $this->assertStringNotContainsString('post no16', $crawler->text()); } } diff --git a/tests/functional/permission_roles_test.php b/tests/functional/permission_roles_test.php index e6506fb37c4..5cc6491e4bc 100644 --- a/tests/functional/permission_roles_test.php +++ b/tests/functional/permission_roles_test.php @@ -16,7 +16,7 @@ */ class functional_permission_roles_test extends phpbb_functional_test_case { - public function data_permission_roles() + public static function data_permission_roles() { return array( array( diff --git a/tests/functional/plupload_test.php b/tests/functional/plupload_test.php index 9d284a7e579..efe64c688c3 100644 --- a/tests/functional/plupload_test.php +++ b/tests/functional/plupload_test.php @@ -21,16 +21,15 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case protected function set_extension_group_permission($val) { - $db = $this->get_db(); $query = " UPDATE phpbb_extension_groups SET allow_in_pm = '$val' WHERE group_name = 'IMAGES' "; - $db->sql_query($query); + $this->db->sql_query($query); } - public function setUp() + protected function setUp(): void { parent::setUp(); $this->purge_cache(); @@ -40,7 +39,7 @@ public function setUp() $this->login(); } - public function tearDown() + protected function tearDown(): void { $this->set_extension_group_permission(0); $iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/'); @@ -60,10 +59,10 @@ public function tearDown() } } - public function get_urls() + public static function get_urls() { return array( - array('posting.php?mode=reply&f=2&t=1'), + array('posting.php?mode=reply&t=1'), array('ucp.php?i=pm&mode=compose'), ); } @@ -76,6 +75,10 @@ public function test_chunked_upload($url) $chunk_size = ceil(filesize($this->path . 'valid.jpg') / self::CHUNKS); $handle = fopen($this->path . 'valid.jpg', 'rb'); + $crawler = self::$client->request('POST', $url . '&sid=' . $this->sid); + + $file_form_data = $this->get_hidden_fields($crawler, $url); + for ($i = 0; $i < self::CHUNKS; $i++) { $chunk = fread($handle, $chunk_size); @@ -94,20 +97,20 @@ public function test_chunked_upload($url) $crawler = self::$client->request( 'POST', $url . '&sid=' . $this->sid, - array( + array_merge(array( 'chunk' => $i, 'chunks' => self::CHUNKS, 'name' => md5('valid') . '.jpg', 'real_filename' => 'valid.jpg', 'add_file' => $this->lang('ADD_FILE'), - ), + ), $file_form_data), array('fileupload' => $file), array('X-PHPBB-USING-PLUPLOAD' => '1') ); if ($i < self::CHUNKS - 1) { - $this->assertContains('{"jsonrpc":"2.0","id":"id","result":null}', self::get_content()); + $this->assertStringContainsString('{"jsonrpc":"2.0","id":"id","result":null}', self::get_content()); } else { @@ -134,17 +137,19 @@ public function test_normal_upload($url) 'error' => UPLOAD_ERR_OK, ); + $file_form_data = $this->get_hidden_fields(null, $url); + self::$client->setServerParameter('HTTP_X_PHPBB_USING_PLUPLOAD', '1'); self::$client->request( 'POST', $url . '&sid=' . $this->sid, - array( + array_merge(array( 'chunk' => '0', 'chunks' => '1', 'name' => md5('valid') . '.jpg', 'real_filename' => 'valid.jpg', 'add_file' => $this->lang('ADD_FILE'), - ), + ), $file_form_data), array('fileupload' => $file) ); diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php index 764376a9458..f561a9618c7 100644 --- a/tests/functional/posting_test.php +++ b/tests/functional/posting_test.php @@ -24,32 +24,27 @@ public function test_post_new_topic() $post = $this->create_topic(2, 'Test Topic 1', 'This is a test topic posted by the testing framework.'); $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - $this->assertContains('This is a test topic posted by the testing framework.', $crawler->filter('html')->text()); + $this->assertStringContainsString('This is a test topic posted by the testing framework.', $crawler->filter('html')->text()); // Test creating a reply with bbcode $post2 = $this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', 'This is a test [b]post[/b] posted by the testing framework.'); - $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); - $this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text()); + $crawler = self::request('GET', "viewtopic.php?p={$post2['post_id']}&sid={$this->sid}"); + $this->assertStringContainsString('This is a test post posted by the testing framework.', $crawler->filter('html')->text()); // Test quoting a message - $crawler = self::request('GET', "posting.php?mode=quote&f=2&t={$post2['topic_id']}&p={$post2['post_id']}&sid={$this->sid}"); - $this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text()); + $crawler = self::request('GET', "posting.php?mode=quote&p={$post2['post_id']}&sid={$this->sid}"); + $this->assertStringContainsString('This is a test post posted by the testing framework.', $crawler->filter('html')->text()); } public function test_unsupported_characters() { $this->login(); - $this->add_lang('posting'); - - self::create_post(2, - 1, - "Unsupported: \xF0\x9F\x88\xB3 \xF0\x9F\x9A\xB6", - 'This is a test with emoji characters in the topic title.', - array(), - 'Your subject contains the following unsupported characters' - ); + $post = $this->create_topic(2, "Test Topic \xF0\x9F\xA4\x94 3\xF0\x9D\x94\xBB\xF0\x9D\x95\x9A", 'This is a test with emoji character in the topic title.'); + $this->create_post(2, $post['topic_id'], "Re: Test Topic 1 \xF0\x9F\xA4\x94 3\xF0\x9D\x94\xBB\xF0\x9D\x95\x9A", 'This is a test with emoji characters in the topic title.'); + $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); + $this->assertStringContainsString("\xF0\x9F\xA4\x94 3\xF0\x9D\x94\xBB\xF0\x9D\x95\x9A", $crawler->text()); } public function test_supported_unicode_characters() @@ -59,7 +54,7 @@ public function test_supported_unicode_characters() $post = $this->create_topic(2, 'Test Topic 1', 'This is a test topic posted by the testing framework.'); $this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', "This is a test with these weird characters: \xF0\x9F\x84\x90 \xF0\x9F\x84\x91"); $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - $this->assertContains("\xF0\x9F\x84\x90 \xF0\x9F\x84\x91", $crawler->text()); + $this->assertStringContainsString("\xF0\x9F\x84\x90 \xF0\x9F\x84\x91", $crawler->text()); } public function test_html_entities() @@ -69,21 +64,21 @@ public function test_html_entities() $post = $this->create_topic(2, 'Test Topic 1', 'This is a test topic posted by the testing framework.'); $this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', '😀'); $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - $this->assertContains('😀', $crawler->text()); + $this->assertStringContainsString('😀', $crawler->text()); } public function test_quote() { $text = 'Test post "\' &&amp;'; - $expected = "(\\[quote=admin[^\\]]*\\]\n" . preg_quote($text) . "\n\\[/quote\\])"; + $expected = "(\[quote=admin[^\]]*\]\s?" . preg_quote($text) . "\s?\[\/quote\])"; $this->login(); $topic = $this->create_topic(2, 'Test Topic 1', 'Test topic'); $post = $this->create_post(2, $topic['topic_id'], 'Re: Test Topic 1', $text); - $crawler = self::request('GET', "posting.php?mode=quote&f=2&t={$post['topic_id']}&p={$post['post_id']}&sid={$this->sid}"); + $crawler = self::request('GET', "posting.php?mode=quote&p={$post['post_id']}&sid={$this->sid}"); - $this->assertRegexp($expected, $crawler->filter('textarea#message')->text()); + $this->assertMatchesRegularExpression($expected, $crawler->filter('textarea#message')->text()); } /** @@ -96,12 +91,12 @@ public function test_edit() $url = self::$client->getCrawler()->selectLink('Edit')->link()->getUri(); $post_id = $this->get_parameter_from_link($url, 'p'); - $crawler = self::request('GET', "posting.php?mode=edit&f=2&p={$post_id}&sid={$this->sid}"); + $crawler = self::request('GET', "posting.php?mode=edit&p={$post_id}&sid={$this->sid}"); $form = $crawler->selectButton('Submit')->form(); $form->setValues(array('message' => 'Edited post')); $crawler = self::submit($form); - $this->assertContains('Edited post', $crawler->filter("#post_content{$post_id} .content")->text()); + $this->assertStringContainsString('Edited post', $crawler->filter("#post_content{$post_id} .content")->text()); } /** @@ -120,15 +115,15 @@ public function test_quote_depth_form() $this->login(); $topic = $this->create_topic(2, 'Test Topic 1', 'Test topic'); $post = $this->create_post(2, $topic['topic_id'], 'Re: Test Topic 1', $text); - $quote_url = "posting.php?mode=quote&f=2&t={$post['topic_id']}&p={$post['post_id']}&sid={$this->sid}"; + $quote_url = "posting.php?mode=quote&p={$post['post_id']}&sid={$this->sid}"; $this->admin_login(); foreach ($expected as $quote_depth => $expected_text) { $this->set_quote_depth($quote_depth); $crawler = self::request('GET', $quote_url); - $this->assertRegexp( - "(\\[quote=admin[^\\]]*\\]\n?" . preg_quote($expected_text) . "\n?\\[/quote\\])", + $this->assertMatchesRegularExpression( + "(\[quote=admin[^\]]*\]\s?" . preg_quote($expected_text) . "\s?\[\/quote\])", $crawler->filter('textarea#message')->text() ); } @@ -161,18 +156,18 @@ public function test_quote_depth_submit() { $this->set_quote_depth($quote_depth); - $post = $this->create_post(2, $topic['topic_id'], 'Re: Test Topic 1', $text); + $post = $this->create_post(2, $topic['topic_id'], "Re: Test Topic 1#$quote_depth", $text); $url = "viewtopic.php?p={$post['post_id']}&sid={$this->sid}"; $crawler = self::request('GET', $url); $text_content = $crawler->filter('#p' . $post['post_id'])->text(); foreach ($contains[$quote_depth] as $contains_text) { - $this->assertContains($contains_text, $text_content); + $this->assertStringContainsString($contains_text, $text_content); } foreach ($not_contains[$quote_depth] as $not_contains_text) { - $this->assertNotContains($not_contains_text, $text_content); + $this->assertStringNotContainsString($not_contains_text, $text_content); } } } @@ -234,7 +229,7 @@ public function test_old_signature_in_preview() 'message' => 'My post', )); $crawler = self::submit($form); - $this->assertContains( + $this->assertStringContainsString( 'My signature', $crawler->filter('#preview .signature')->html() ); @@ -279,7 +274,7 @@ public function test_allowed_schemes_links() 'message' => $text, )); $crawler = self::submit($form); - $this->assertContains( + $this->assertStringContainsString( 'http://example.org/ tcp://localhost:22/ServiceName', $crawler->filter('#preview .content')->html() ); @@ -300,9 +295,31 @@ public function test_allowed_schemes_links() 'message' => $text, )); $crawler = self::submit($form); - $this->assertContains( + $this->assertStringContainsString( 'http://example.org/ tcp://localhost:22/ServiceName', $crawler->filter('#preview .content')->html() ); } + + public static function nonexistent_post_id_data() + { + $nonexistent_post_id = 999999; // Random value + return [ + ['edit', $nonexistent_post_id], + ['delete', $nonexistent_post_id], + ['quote', $nonexistent_post_id], + ['soft_delete', $nonexistent_post_id], + ]; + } + + /** + * @dataProvider nonexistent_post_id_data + */ + public function test_nonexistent_post_id($mode, $nonexistent_post_id) + { + $this->add_lang('posting'); + $this->login(); + $crawler = self::request('GET', "posting.php?mode={$mode}&p={$nonexistent_post_id}&sid={$this->sid}"); + $this->assertContainsLang('NO_POST', $crawler->text()); + } } diff --git a/tests/functional/private_messages_test.php b/tests/functional/private_messages_test.php index 7fda26fb491..1f31fda240f 100644 --- a/tests/functional/private_messages_test.php +++ b/tests/functional/private_messages_test.php @@ -32,7 +32,7 @@ public function test_setup_config() $form->setValues($values); $crawler = self::submit($form); - $this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text()); + $this->assertStringContainsString($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text()); } public function test_inbox_full() @@ -41,12 +41,12 @@ public function test_inbox_full() $message_id = $this->create_private_message('Test private message #1', 'This is a test private message sent by the testing framework.', array(2)); $crawler = self::request('GET', "ucp.php?i=pm&mode=view&sid{$this->sid}&p={$message_id}"); - $this->assertContains($this->lang('UCP_PM_VIEW'), $crawler->filter('html')->text()); + $this->assertStringContainsString($this->lang('UCP_PM_VIEW'), $crawler->filter('html')->text()); $message_id = $this->create_private_message('Test private message #2', 'This is a test private message sent by the testing framework.', array(2)); $crawler = self::request('GET', "ucp.php?i=pm&mode=view&sid{$this->sid}&p={$message_id}"); - $this->assertContains($this->lang('NO_AUTH_READ_HOLD_MESSAGE'), $crawler->filter('html')->text()); + $this->assertStringContainsString($this->lang('NO_AUTH_READ_HOLD_MESSAGE'), $crawler->filter('html')->text()); } public function test_restore_config() @@ -64,7 +64,7 @@ public function test_restore_config() $form->setValues($values); $crawler = self::submit($form); - $this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text()); + $this->assertStringContainsString($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text()); } public function test_quote_post() @@ -79,32 +79,32 @@ public function test_quote_post() $crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=quotepost&p=' . $post['post_id'] . '&sid=' . $this->sid); - $this->assertRegexp($expected, $crawler->filter('textarea#message')->text()); + $this->assertMatchesRegularExpression($expected, $crawler->filter('textarea#message')->text()); } public function test_quote_pm() { $text = 'This is a test private message sent by the testing framework.'; - $expected = "(\\[quote=admin time=\\d+ user_id=2\\]\n" . $text . "\n\\[/quote\\])"; + $expected = "(\[quote=admin msg_id=[\d]+ time=[\d]+ user_id=2\]\s?" . $text . "\s?\[\/quote\])"; $this->login(); $message_id = $this->create_private_message('Test', $text, array(2)); $crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=quote&p=' . $message_id . '&sid=' . $this->sid); - $this->assertRegexp($expected, $crawler->filter('textarea#message')->text()); + $this->assertMatchesRegularExpression($expected, $crawler->filter('textarea#message')->text()); } public function test_quote_forward() { $text = 'This is a test private message sent by the testing framework.'; - $expected = "[quote=admin]\n" . $text . "\n[/quote]"; + $expected = "(\[quote=admin\]\s?" . $text . "\s?\[\/quote\])"; $this->login(); $message_id = $this->create_private_message('Test', $text, array(2)); $crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=forward&f=0&p=' . $message_id . '&sid=' . $this->sid); - $this->assertContains($expected, $crawler->filter('textarea#message')->text()); + $this->assertMatchesRegularExpression($expected, $crawler->filter('textarea#message')->text()); } } diff --git a/tests/functional/prune_shadow_topic_test.php b/tests/functional/prune_shadow_topic_test.php index 39bf223f930..125c3b90b9e 100644 --- a/tests/functional/prune_shadow_topic_test.php +++ b/tests/functional/prune_shadow_topic_test.php @@ -61,7 +61,7 @@ public function test_create_post() $this->post = $this->create_topic($this->data['forums']['Prune Shadow'], 'Prune Shadow #1', 'This is a test topic posted by the testing framework.'); $crawler = self::request('GET', "viewtopic.php?t={$this->post['topic_id']}&sid={$this->sid}"); - $this->assertContains('Prune Shadow #1', $crawler->filter('html')->text()); + $this->assertStringContainsString('Prune Shadow #1', $crawler->filter('html')->text()); $this->data['topics']['Prune Shadow #1'] = (int) $this->post['topic_id']; $this->data['posts']['Prune Shadow #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); @@ -77,9 +77,9 @@ public function test_create_post() // Test creating a reply $post2 = $this->create_post($this->data['forums']['Prune Shadow'], $this->post['topic_id'], 'Re: Prune Shadow #1-#2', 'This is a test post posted by the testing framework.'); - $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); + $crawler = self::request('GET', "viewtopic.php?p={$post2['post_id']}&sid={$this->sid}"); - $this->assertContains('Re: Prune Shadow #1-#2', $crawler->filter('html')->text()); + $this->assertStringContainsString('Re: Prune Shadow #1-#2', $crawler->filter('html')->text()); $this->data['posts']['Re: Prune Shadow #1-#2'] = (int) $post2['post_id']; $this->assert_forum_details($this->data['forums']['Prune Shadow'], array( @@ -121,19 +121,18 @@ public function test_move_topic() 'forum_topics_softdeleted' => 0, ), 'after moving'); - $this->db = $this->get_db(); // Date topic 3 days back $sql = 'UPDATE phpbb_topics SET topic_last_post_time = ' . (time() - 60*60*24*3) . ' WHERE topic_id = ' . ($this->data['topics']['Prune Shadow #1'] + 1); - $result = $this->db->sql_query($sql); + $this->db->sql_query($sql); $crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Prune Shadow']}&sid={$this->sid}"); $this->assertNotEmpty($crawler->filter('img')->last()->attr('src')); self::request('GET', "app.php/cron/cron.task.core.prune_shadow_topics?f={$this->data['forums']['Prune Shadow']}&sid={$this->sid}", array(), false); // Try to ensure that the cron can actually run before we start to wait for it - sleep(1); + usleep(100000); $cron_lock = new \phpbb\lock\db('cron_lock', new \phpbb\config\db($this->db, new \phpbb\cache\driver\dummy(), 'phpbb_config'), $this->db); while (!$cron_lock->acquire()) { @@ -153,8 +152,6 @@ public function test_move_topic() public function assert_forum_details($forum_id, $details, $additional_error_message = '') { - $this->db = $this->get_db(); - $sql = 'SELECT ' . implode(', ', array_keys($details)) . ' FROM phpbb_forums WHERE forum_id = ' . (int) $forum_id; @@ -167,8 +164,6 @@ public function assert_forum_details($forum_id, $details, $additional_error_mess public function load_ids($data) { - $this->db = $this->get_db(); - if (!empty($data['forums'])) { $sql = 'SELECT * diff --git a/tests/functional/registration_test.php b/tests/functional/registration_test.php index 690f4ae9f26..e47d8193b5e 100644 --- a/tests/functional/registration_test.php +++ b/tests/functional/registration_test.php @@ -24,6 +24,7 @@ public function test_disable_captcha_on_registration() $crawler = self::request('GET', "adm/index.php?i=acp_board&mode=registration&sid={$this->sid}"); $form = $crawler->selectButton('Submit')->form(); $form['config[enable_confirm]']->setValue('0'); + $form['config[pass_complex]']->setValue('PASS_TYPE_ANY'); $crawler = self::submit($form); $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('#main .successbox')->text()); @@ -36,6 +37,10 @@ public function test_register_new_account() { $this->add_lang('ucp'); + // Check that we can't skip + self::request('GET', 'ucp.php?mode=register&agreed=1'); + $this->assertContainsLang('AGREE', $this->get_content()); + $crawler = self::request('GET', 'ucp.php?mode=register'); $this->assertContainsLang('REGISTRATION', $crawler->filter('div.content h2')->text()); @@ -64,4 +69,115 @@ public function test_default_subscription_options() $this->assert_checkbox_is_checked($crawler, 'notification.type.post_notification.method.email'); $this->assert_checkbox_is_checked($crawler, 'notification.type.topic_notification.method.email'); } + + /** + * @depends test_disable_captcha_on_registration + */ + public function test_register_coppa_account() + { + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', "adm/index.php?i=acp_board&mode=registration&sid={$this->sid}"); + $form = $crawler->selectButton('Submit')->form(); + $form['config[coppa_enable]']->setValue('1'); + $crawler = self::submit($form); + + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('#main .successbox')->text()); + $this->logout(); + + $this->add_lang('ucp'); + + // Check that we can't skip + $crawler = self::request('GET', 'ucp.php?mode=register&coppa=1'); + $this->assertContainsLang('COPPA_BIRTHDAY', $crawler->html()); + + $form = $crawler->selectButton('coppa_yes')->form(); + $crawler = self::submit($form); + + $this->assertContainsLang('REGISTRATION', $crawler->filter('div.content h2')->text()); + + $form = $crawler->selectButton('I agree to these terms')->form(); + $crawler = self::submit($form); + + $form = $crawler->selectButton('Submit')->form(array( + 'username' => 'user-coppa-test', + 'email' => 'user-coppa-test@phpbb.com', + 'new_password' => 'user-coppa-testuser-coppa-test', + 'password_confirm' => 'user-coppa-testuser-coppa-test', + )); + $form['tz']->select('Europe/Berlin'); + $crawler = self::submit($form); + + $this->assertContainsLang('ACCOUNT_COPPA', $crawler->filter('#message')->text()); + + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', "adm/index.php?i=acp_board&mode=registration&sid={$this->sid}"); + $form = $crawler->selectButton('Submit')->form(); + $form['config[coppa_enable]']->setValue('0'); + $crawler = self::submit($form); + } + + /** + * @depends test_disable_captcha_on_registration + */ + public function test_register_new_account_with_cpf_numbers() + { + $this->add_lang(['ucp', 'acp/profile']); + + // Create "Numbers" type CPF but don't set its default value + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', "adm/index.php?i=acp_profile&mode=profile&sid={$this->sid}"); + $form = $crawler->selectButton('submit')->form([ // Create new field + 'field_type' => 'profilefields.type.int', + ]); + $crawler = self::submit($form); + + $this->assertContainsLang('STEP_1_TITLE_CREATE', $this->get_content()); + $this->assertStringContainsString('Numbers', $crawler->filter('dl > dd > strong')->text()); + + $form = $crawler->selectButton('next')->form([ // Go to Profile type specific options + 'field_ident' => 'Numbers', + 'lang_name' => 'Numbers CPF', + ]); + $form['field_show_on_reg']->tick(); + $crawler = self::submit($form); + + $this->assertContainsLang('STEP_2_TITLE_CREATE', $this->get_content()); + + $form = $crawler->selectButton('Save')->form(); // Save CPF + self::submit($form); + $this->assertContainsLang('ADDED_PROFILE_FIELD', $this->get_content()); + + $this->logout(); + + // Get into registration process + // Check that we can't skip + self::request('GET', 'ucp.php?mode=register&agreed=1'); + $this->assertContainsLang('AGREE', $this->get_content()); + + $crawler = self::request('GET', 'ucp.php?mode=register'); + $this->assertContainsLang('REGISTRATION', $crawler->filter('div.content h2')->text()); + + $form = $crawler->selectButton('I agree to these terms')->form(); + $crawler = self::submit($form); + + // Check if Numbers CPF displayed on registration + $this->assertStringContainsString('Numbers CPF', $crawler->filter('label[for="pf_numbers"]')->text()); + + $form = $crawler->selectButton('Submit')->form(array( + 'username' => 'user-reg-test1', + 'email' => 'user-reg-test1@phpbb.com', + 'new_password' => 'user-reg-testuser-reg-test1', + 'password_confirm' => 'user-reg-testuser-reg-test1', + )); + $form['tz']->select('Europe/Berlin'); + $crawler = self::submit($form); + + $this->assertContainsLang('ACCOUNT_ADDED', $crawler->filter('#message')->text()); + } } diff --git a/tests/functional/report_post_captcha_test.php b/tests/functional/report_post_captcha_test.php index 36a1a9ee4d7..1c7435fcf31 100644 --- a/tests/functional/report_post_captcha_test.php +++ b/tests/functional/report_post_captcha_test.php @@ -21,11 +21,11 @@ public function test_guest_report_post() $crawler = self::request('GET', 'app.php/post/1/report', array(), false); $this->assert_response_html(403); $this->add_lang('mcp'); - $this->assertContains($this->lang('USER_CANNOT_REPORT'), $crawler->filter('html')->text()); + $this->assertStringContainsString($this->lang('USER_CANNOT_REPORT'), $crawler->filter('html')->text()); $this->set_reporting_guest(1); $crawler = self::request('GET', 'app.php/post/1/report'); - $this->assertContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text()); + $this->assertStringContainsString($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text()); $this->set_reporting_guest(-1); } @@ -33,12 +33,12 @@ public function test_user_report_post() { $this->login(); $crawler = self::request('GET', 'app.php/post/1/report'); - $this->assertNotContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text()); + $this->assertStringNotContainsString($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text()); $this->add_lang('mcp'); $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); $crawler = self::submit($form); - $this->assertContains($this->lang('POST_REPORTED_SUCCESS'), $crawler->text()); + $this->assertStringContainsString($this->lang('POST_REPORTED_SUCCESS'), $crawler->text()); } protected function set_reporting_guest($report_post_allowed) @@ -64,8 +64,8 @@ protected function set_reporting_guest($report_post_allowed) $values = $form->getValues(); $values["setting[1][2][f_report]"] = $report_post_allowed; $form->setValues($values); - $crawler = self::submit($form); + self::submit($form); - $crawler = self::request('GET', 'ucp.php?mode=logout&sid=' . $this->sid); + $this->logout(); } } diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php index 48c444fb767..ddf2e7564f9 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -16,96 +16,452 @@ */ abstract class phpbb_functional_search_base extends phpbb_functional_test_case { - protected function assert_search_found($keywords, $posts_found, $words_highlighted) + protected $search_backend; + + protected function assert_search_found($keywords, $posts_found, $words_highlighted, $sort_key = '') { - $crawler = self::request('GET', 'search.php?keywords=' . $keywords); - $this->assertEquals($posts_found, $crawler->filter('.postbody')->count()); - $this->assertEquals($words_highlighted, $crawler->filter('.posthilit')->count()); + $this->purge_cache(); + $crawler = self::request('GET', 'search.php?keywords=' . $keywords . ($sort_key ? "&sk=$sort_key" : '')); + $this->assertEquals($posts_found, $crawler->filter('.postbody')->count(), $this->search_backend); + $this->assertEquals($words_highlighted, $crawler->filter('.posthilit')->count(), $this->search_backend); + $this->assertStringContainsString("Search found $posts_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); + } + + protected function assert_search_found_topics($keywords, $topics_found, $sort_key = '') + { + $this->purge_cache(); + $crawler = self::request('GET', 'search.php?sr=topics&keywords=' . $keywords . ($sort_key ? "&sk=$sort_key" : '')); + $this->assertEquals($topics_found, $crawler->filter('.row')->count(), $this->search_backend); + $this->assertStringContainsString("Search found $topics_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); + } + + protected function assert_search_posts_by_author($author, $posts_found, $sort_key = '') + { + $this->purge_cache(); + $crawler = self::request('GET', 'search.php?author=' . $author . ($sort_key ? "&sk=$sort_key" : '')); + $this->assertEquals($posts_found, $crawler->filter('.postbody')->count(), $this->search_backend); + $this->assertStringContainsString("Search found $posts_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); + } + + protected function assert_search_topics_by_author($author, $topics_found, $sort_key = '') + { + $this->purge_cache(); + $crawler = self::request('GET', 'search.php?sr=topics&author=' . $author . ($sort_key ? "&sk=$sort_key" : '')); + $this->assertEquals($topics_found, $crawler->filter('.row')->count(), $this->search_backend); + $this->assertStringContainsString("Search found $topics_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); + } + + protected function assert_search_posts_by_author_id($author_id, $posts_found, $sort_key = '', $sort_dir = '') + { + // Test obtaining data from cache if sorting direction is set + if (!$sort_dir) + { + $this->purge_cache(); + } + $crawler = self::request('GET', 'search.php?author_id=' . $author_id . ($sort_key ? "&sk=$sort_key" : '') . ($sort_dir ? "&sk=$sort_dir" : '')); + $this->assertEquals($posts_found, $crawler->filter('.postbody')->count(), $this->search_backend); + $this->assertStringContainsString("Search found $posts_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); + } + + protected function assert_search_topics_by_author_id($author_id, $topics_found, $sort_key = '', $sort_dir = '') + { + // Test obtaining data from cache if sorting direction is set + if (!$sort_dir) + { + $this->purge_cache(); + } + $crawler = self::request('GET', 'search.php?sr=topics&author_id=' . $author_id . ($sort_key ? "&sk=$sort_key" : '') . ($sort_dir ? "&sk=$sort_dir" : '')); + $this->assertEquals($topics_found, $crawler->filter('.row')->count(), $this->search_backend); + $this->assertStringContainsString("Search found $topics_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); + } + + protected function assert_search_in_topic($topic_id, $keywords, $posts_found, $sort_key = '') + { + $this->purge_cache(); + $crawler = self::request('GET', "search.php?t=$topic_id&sf=msgonly&keywords=$keywords" . ($sort_key ? "&sk=$sort_key" : '')); + $this->assertEquals($posts_found, $crawler->filter('.postbody')->count(), $this->search_backend); + $this->assertStringContainsString("Search found $posts_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); + } + + protected function assert_search_in_forum($forum_id, $keywords, $posts_found, $sort_key = '') + { + $this->purge_cache(); + $crawler = self::request('GET', "search.php?fid[]=$forum_id&keywords=$keywords" . ($sort_key ? "&sk=$sort_key" : '')); + $this->assertEquals($posts_found, $crawler->filter('.postbody')->count(), $this->search_backend); + $this->assertStringContainsString("Search found $posts_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); + } + + protected function assert_search_topics_in_forum($forum_id, $keywords, $topics_found, $sort_key = '') + { + $this->purge_cache(); + $crawler = self::request('GET', "search.php?fid[]=$forum_id&sr=topics&keywords=$keywords" . ($sort_key ? "&sk=$sort_key" : '')); + $this->assertEquals($topics_found, $crawler->filter('.row')->count(), $this->search_backend); + $this->assertStringContainsString("Search found $topics_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); } protected function assert_search_not_found($keywords) { $crawler = self::request('GET', 'search.php?keywords=' . $keywords); - $this->assertEquals(0, $crawler->filter('.postbody')->count()); - $split_keywords_string = str_replace(array('+', '-'), ' ', $keywords); - $this->assertEquals($split_keywords_string, $crawler->filter('#keywords')->attr('value')); + $this->assertEquals(0, $crawler->filter('.postbody')->count(), $this->search_backend); + $split_keywords_string = str_replace('+', ' ', $keywords); + $this->assertEquals($split_keywords_string, $crawler->filter('#keywords')->attr('value'), $this->search_backend); + } + + protected function assert_search_for_author_not_found($author) + { + $this->add_lang('search'); + $crawler = self::request('GET', 'search.php?author=' . $author); + $this->assertContainsLang('NO_SEARCH_RESULTS', $crawler->text(), $this->search_backend); } public function test_search_backend() { + $this->add_lang('common'); + + // Create a new standard user if needed, topic and post to test searh for author + if (!$searchforauthoruser_id = $this->user_exists('searchforauthoruser')) + { + $searchforauthoruser_id = $this->create_user('searchforauthoruser'); + } + else + { + $searchforauthoruser_id = key($searchforauthoruser_id); + } + $this->remove_user_group('NEWLY_REGISTERED', ['searchforauthoruser']); + $this->set_flood_interval(0); + $this->login('searchforauthoruser'); + $topic_by_author = $this->create_topic(2, 'Test Topic from searchforauthoruser', 'This is a test topic posted by searchforauthoruser to test searching by author.'); + $this->create_post(2, $topic_by_author['topic_id'], 'Re: Test Topic from searchforauthoruser', 'This is a test post posted by searchforauthoruser'); + $this->logout(); + $this->login(); $this->admin_login(); - $this->create_search_index('\phpbb\search\fulltext_native'); - $post = $this->create_topic(2, 'Test Topic 1 foosubject', 'This is a test topic posted by the barsearch testing framework.'); + $topic_multiple_results_count1 = $this->create_topic(2, 'Test Topic for multiple search results', 'This is a test topic posted to test multiple results count.'); + $this->create_post(2, $topic_multiple_results_count1['topic_id'], 'Re: Test Topic for multiple search results', 'This is a test post 2 posted to test multiple results count.'); + $topic_multiple_results_count2 = $this->create_topic(2, 'Test Topic 2 for multiple search results', 'This is a test topic 2 posted to test multiple results count.'); + $this->set_flood_interval(15); $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=settings&sid=' . $this->sid); - $form = $crawler->selectButton('Submit')->form(); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); $values = $form->getValues(); if ($values["config[search_type]"] != $this->search_backend) { $values["config[search_type]"] = $this->search_backend; - $form->setValues($values); + + if (strpos($this->search_backend, 'fulltext_sphinx')) + { + // Set board Sphinx id in according to respective setup-sphinx.sh $ID value + $values["config[fulltext_sphinx_id]"] = 'saw9zf2fdhp1goue'; + } + + try + { + $form->setValues($values); + } + catch(\InvalidArgumentException $e) + { + // Search backed is not supported because don't appear in the select + $this->delete_topic($post['topic_id']); + $this->delete_topic($topic_by_author['topic_id']); + $this->delete_topic($topic_multiple_results_count1['topic_id']); + $this->delete_topic($topic_multiple_results_count2['topic_id']); + $this->markTestSkipped("Search backend is not supported/running"); + } + $crawler = self::submit($form); + $this->purge_cache(); - $form = $crawler->selectButton('Yes')->form(); + $form = $crawler->selectButton($this->lang('YES'))->form(); $values = $form->getValues(); $crawler = self::submit($form); - // check if search backend is not supported + // Unknown error selecting search backend if ($crawler->filter('.errorbox')->count() > 0) { - $this->delete_topic($post['topic_id']); - $this->markTestSkipped("Search backend is not supported/running"); + $this->fail('Error when trying to select available search backend'); } $this->create_search_index(); } $this->logout(); - $this->assert_search_found('phpbb3+installation', 1, 3); - $this->assert_search_found('foosubject+barsearch', 1, 2); + + foreach (['', 'a', 't', 'f', 'i', 's'] as $sort_key) + { + $this->assert_search_found('phpbb+installation', 1, 4, $sort_key); + $this->assert_search_found('foosubject+barsearch', 1, 2, $sort_key); + $this->assert_search_found('barsearch-testing', 1, 2, $sort_key); // test hyphen ignored + $this->assert_search_found('barsearch+-+testing', 1, 2, $sort_key); // test hyphen wrapped with space ignored + $this->assert_search_found('multiple+results+count', 3, 15, $sort_key); // test multiple results count - posts + $this->assert_search_found_topics('multiple+results+count', 2, $sort_key); // test multiple results count - topics + $this->assert_search_found_topics('phpbb+installation', 1, $sort_key); + $this->assert_search_found_topics('foosubject+barsearch', 1, $sort_key); + + $this->assert_search_in_forum(2, 'multiple+search+results', 3, $sort_key); // test multiple results count - forum search - posts + $this->assert_search_topics_in_forum(2, 'multiple+search+results', 2, $sort_key); // test multiple results count - forum search - topics + $this->assert_search_in_topic((int) $topic_multiple_results_count1['topic_id'], 'multiple+results', 2, $sort_key); // test multiple results count - topic search + + $this->assert_search_posts_by_author('searchforauthoruser', 2, $sort_key); + $this->assert_search_topics_by_author('searchforauthoruser', 1, $sort_key); + + $this->assert_search_posts_by_author_id($searchforauthoruser_id, 2, $sort_key); + $this->assert_search_topics_by_author_id($searchforauthoruser_id, 1, $sort_key); + $this->assert_search_posts_by_author_id($searchforauthoruser_id, 2, $sort_key, 'a'); //search asc order + $this->assert_search_topics_by_author_id($searchforauthoruser_id, 1, $sort_key, 'a'); // search asc order + } + $this->assert_search_not_found('loremipsumdedo'); + $this->assert_search_not_found('loremipsumdedo+-'); // test search query ending with the space followed by hyphen + $this->assert_search_not_found('barsearch+-testing'); // test excluding keyword + $this->assert_search_for_author_not_found('authornotexists'); $this->login(); $this->admin_login(); $this->delete_search_index(); $this->delete_topic($post['topic_id']); + $this->delete_topic($topic_by_author['topic_id']); + $this->delete_topic($topic_multiple_results_count1['topic_id']); + $this->delete_topic($topic_multiple_results_count2['topic_id']); + } + + public function test_caching_search_results() + { + global $phpbb_root_path; + + // Sphinx search doesn't use phpBB search results caching + if (strpos($this->search_backend, 'fulltext_sphinx')) + { + $this->markTestSkipped("Sphinx search doesn't use phpBB search results caching"); + } + + $this->purge_cache(); + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'search.php?author_id=2&sr=posts'); + $posts_found_text = $crawler->filter('.searchresults-title')->text(); + + // Get total user's post count + preg_match('!(\d+)!', $posts_found_text, $matches); + $posts_count = (int) $matches[1]; + + $this->assertStringContainsString("Search found $posts_count matches", $posts_found_text, $this->search_backend); + + // Set this value to cache less results than total count + $sql = 'UPDATE ' . CONFIG_TABLE . ' + SET config_value = ' . floor($posts_count / 3) . " + WHERE config_name = '" . $this->db->sql_escape('search_block_size') . "'"; + $this->db->sql_query($sql); + + // Temporarily set posts_per_page to the value allowing to get several pages (4+) + $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post'); + $form = $crawler->selectButton('Submit')->form(); + $values = $form->getValues(); + $current_posts_per_page = $values['config[posts_per_page]']; + $values['config[posts_per_page]'] = floor($posts_count / 10); + $form->setValues($values); + $crawler = self::submit($form); + $this->assertEquals(1, $crawler->filter('.successbox')->count(), $this->search_backend); + + // Now actually test caching search results + $this->purge_cache(); + + // Default sort direction is 'd' (descending), browse the 1st page + $crawler = self::request('GET', 'search.php?author_id=2&sr=posts'); + $pagination = $crawler->filter('.pagination')->eq(0); + $posts_found_text = $pagination->text(); + + $this->assertStringContainsString("Search found $posts_count matches", $posts_found_text, $this->search_backend); + + // Filter all search result page links on the 1st page + $pagination = $pagination->filter('li > a')->reduce( + function ($node, $i) + { + return ($node->attr('class') == 'button'); + } + ); + + // Get last page number + $last_page = (int) $pagination->last()->text(); + + // Browse the last search page + $crawler = self::$client->click($pagination->selectLink($last_page)->link()); + $pagination = $crawler->filter('.pagination')->eq(0); + + // Filter all search result page links on the last page + $pagination = $pagination->filter('li > a')->reduce( + function ($node, $i) + { + return ($node->attr('class') == 'button'); + } + ); + + // Now change sort direction to ascending + $form = $crawler->selectButton('sort')->form(); + $values = $form->getValues(); + $values['sd'] = 'a'; + $form->setValues($values); + $crawler = self::submit($form); + + $pagination = $crawler->filter('.pagination')->eq(0); + + // Filter all search result page links on the 1st page with new sort direction + $pagination = $pagination->filter('li > a')->reduce( + function ($node, $i) + { + return ($node->attr('class') == 'button'); + } + ); + + // Browse the rest of search results pages with new sort direction + $pages = range(2, $last_page); + foreach ($pages as $page_number) + { + $crawler = self::$client->click($pagination->selectLink($page_number)->link()); + $pagination = $crawler->filter('.pagination')->eq(0); + $pagination = $pagination->filter('li > a')->reduce( + function ($node, $i) + { + return ($node->attr('class') == 'button'); + } + ); + } + + // Get search results cache varname + $finder = new \Symfony\Component\Finder\Finder(); + $finder + ->name('data_search_results_*.php') + ->files() + ->in($phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT); + $iterator = $finder->getIterator(); + $iterator->rewind(); + $cache_filename = $iterator->current(); + $cache_varname = substr($cache_filename->getBasename('.php'), 4); + + // Get cached post ids data + $cache = $this->get_cache_driver(); + $post_ids_cached = $cache->get($cache_varname); + + $cached_results_count = count($post_ids_cached) - 2; // Don't count '-1' and '-2' indexes + + $post_ids_cached_backup = $post_ids_cached; + + // Cached data still should have initial 'd' sort direction + $this->assertTrue($post_ids_cached[-2] === 'd', $this->search_backend); + + // Cached search results count should be equal to displayed on search results page + $this->assertEquals($posts_count, $post_ids_cached[-1], $this->search_backend); + + // Actual cached data array count should be equal to displayed on search results page too + $this->assertEquals($posts_count, $cached_results_count, $this->search_backend); + + // Cached data array shouldn't change after removing duplicates. That is, it shouldn't have any duplicates. + unset($post_ids_cached[-2], $post_ids_cached[-1]); + unset($post_ids_cached_backup[-2], $post_ids_cached_backup[-1]); + $post_ids_cached = array_unique($post_ids_cached); + $this->assertEquals($post_ids_cached_backup, $post_ids_cached, $this->search_backend); + + // Restore this value to default + $sql = 'UPDATE ' . CONFIG_TABLE . " + SET config_value = 250 + WHERE config_name = '" . $this->db->sql_escape('search_block_size') . "'"; + $this->db->sql_query($sql); + + // Restore posts_per_page value + $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post'); + $form = $crawler->selectButton('Submit')->form(); + $values = $form->getValues(); + $values['config[posts_per_page]'] = $current_posts_per_page; + $form->setValues($values); + $crawler = self::submit($form); + $this->assertEquals(1, $crawler->filter('.successbox')->count(), $this->search_backend); } protected function create_search_index($backend = null) { $this->add_lang('acp/search'); + $search_type = $backend ?? $this->search_backend; $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid); - $form = $crawler->selectButton('Create index')->form(); + $form = $crawler->selectButton($this->lang('CREATE_INDEX'))->form(); $form_values = $form->getValues(); $form_values = array_merge($form_values, - array( - 'search_type' => ( ($backend === null) ? $this->search_backend : $backend ), + [ + 'search_type' => $search_type, 'action' => 'create', - ) + ] ); $form->setValues($form_values); $crawler = self::submit($form); + + $meta_refresh = $crawler->filter('meta[http-equiv="refresh"]'); + + if ($meta_refresh->count() > 0) + { + // Wait for posts to be fully indexed + while ($meta_refresh->count() > 0) + { + preg_match('#url=.+/(adm+.+)#', $meta_refresh->attr('content'), $match); + $url = $match[1]; + $crawler = self::request('POST', $url); + $meta_refresh = $crawler->filter('meta[http-equiv="refresh"]'); + } + } + $this->assertContainsLang('SEARCH_INDEX_CREATED', $crawler->text()); + + // Ensure search index has been actually created + $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid); + $posts_indexed = (int) $crawler->filter('#acp_search_index_' . str_replace('\\', '-', $search_type) . ' td')->reduce( + function ($node, $i) { + // Find the value of total posts indexed + return (strpos($node->text(), $this->lang('FULLTEXT_MYSQL_TOTAL_POSTS')) !== false || strpos($node->text(), $this->lang('TOTAL_WORDS')) !== false); + }) + ->nextAll()->eq(0)->text(); + $this->assertTrue($posts_indexed > 0); } protected function delete_search_index() { $this->add_lang('acp/search'); $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid); - $form = $crawler->selectButton('Delete index')->form(); + $form = $crawler->selectButton($this->lang('DELETE_INDEX'))->form(); $form_values = $form->getValues(); $form_values = array_merge($form_values, - array( + [ 'search_type' => $this->search_backend, 'action' => 'delete', - ) + ] ); $form->setValues($form_values); $crawler = self::submit($form); + + $meta_refresh = $crawler->filter('meta[http-equiv="refresh"]'); + + if ($meta_refresh->count() > 0) + { + // Wait for index to be fully deleted + while ($meta_refresh->count() > 0) + { + preg_match('#url=.+/(adm+.+)#', $meta_refresh->attr('content'), $match); + $url = $match[1]; + $crawler = self::request('POST', $url); + $meta_refresh = $crawler->filter('meta[http-equiv="refresh"]'); + } + } + $this->assertContainsLang('SEARCH_INDEX_REMOVED', $crawler->text()); + + // Ensure search index has been actually removed + $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid); + $posts_indexed = (int) $crawler->filter('#acp_search_index_' . str_replace('\\', '-', $this->search_backend) . ' td')->reduce( + function ($node, $i) { + // Find the value of total posts indexed + return (strpos($node->text(), $this->lang('FULLTEXT_MYSQL_TOTAL_POSTS')) !== false || strpos($node->text(), $this->lang('TOTAL_WORDS')) !== false); + }) + ->nextAll()->eq(0)->text(); + $this->assertEquals(0, $posts_indexed); } } diff --git a/tests/functional/search/mysql_test.php b/tests/functional/search/mysql_test.php index a97b12e9057..ef3a273f2ab 100644 --- a/tests/functional/search/mysql_test.php +++ b/tests/functional/search/mysql_test.php @@ -11,13 +11,36 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; /** * @group functional */ class phpbb_functional_search_mysql_test extends phpbb_functional_search_base { - protected $search_backend = '\phpbb\search\fulltext_mysql'; + protected $search_backend = 'phpbb\search\backend\fulltext_mysql'; + protected function setUp(): void + { + $sql_layer = substr(self::$config['dbms'], strlen('phpbb\\db\\driver\\')); + if ($sql_layer !== 'mysqli') // MySQL search backend runs on MySQL/MariaDB only + { + $this->markTestSkipped($sql_layer . ': MySQL search is not supported'); + } + + parent::setUp(); + } + + protected function create_search_index($backend = null) + { + parent::create_search_index($backend); + + // Try optimizing posts table after creating search index. + // Some versions of MariaDB might not return any results in the search + // until the table has been optimized or the index deleted and re-created. + $this->db->sql_return_on_error(true); + $sql = 'OPTIMIZE TABLE ' . POSTS_TABLE; + $this->db->sql_query($sql); + $this->db->sql_return_on_error(false); + } } diff --git a/tests/functional/search/native_test.php b/tests/functional/search/native_test.php index 9908b9cdaa3..5b8d8f22062 100644 --- a/tests/functional/search/native_test.php +++ b/tests/functional/search/native_test.php @@ -11,12 +11,12 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; /** * @group functional */ class phpbb_functional_search_native_test extends phpbb_functional_search_base { - protected $search_backend = '\phpbb\search\fulltext_native'; + protected $search_backend = 'phpbb\search\backend\fulltext_native'; } diff --git a/tests/functional/search/postgres_test.php b/tests/functional/search/postgres_test.php index a76cc13493c..6851a29e803 100644 --- a/tests/functional/search/postgres_test.php +++ b/tests/functional/search/postgres_test.php @@ -11,13 +11,23 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; /** * @group functional */ class phpbb_functional_search_postgres_test extends phpbb_functional_search_base { - protected $search_backend = '\phpbb\search\fulltext_postgres'; + protected $search_backend = 'phpbb\search\backend\fulltext_postgres'; + protected function setUp(): void + { + $sql_layer = substr(self::$config['dbms'], strlen('phpbb\\db\\driver\\')); + if ($sql_layer !== 'postgres') // PostgreSQL search backend runs on PostgreSQL only + { + $this->markTestSkipped($sql_layer . ': PostgreSQL search is not supported'); + } + + parent::setUp(); + } } diff --git a/tests/functional/search/sphinx_test.php b/tests/functional/search/sphinx_test.php index 4bf1ab0e163..01ccd1bb7f1 100644 --- a/tests/functional/search/sphinx_test.php +++ b/tests/functional/search/sphinx_test.php @@ -11,17 +11,39 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; /** * @group functional */ class phpbb_functional_search_sphinx_test extends phpbb_functional_search_base { - protected $search_backend = '\phpbb\search\fulltext_sphinx'; + protected $search_backend = 'phpbb\search\backend\fulltext_sphinx'; - public function test_search_backend() + protected function setUp(): void { - $this->markTestIncomplete('Sphinx Tests are not supported'); + $sql_layer = substr(self::$config['dbms'], strlen('phpbb\\db\\driver\\')); + if ($sql_layer !== 'mysqli') // Sphinx search backend runs on MySQL/MariaDB only so far + { + $this->markTestSkipped($sql_layer . ': Sphinx search is not supported'); + } + + parent::setUp(); + } + + protected function create_search_index($backend = null) + { + parent::create_search_index($backend); + $this->purge_cache(); + + if (!$backend || $this->search_backend == $backend) + { + $output = $retval = null; + + // After creating phpBB search index, build Sphinx index + exec('sudo -S service sphinxsearch stop', $output, $retval); // Attempt to stop sphinxsearch service in case it's running + exec('sudo -S indexer --all', $output, $retval); // Run sphinxsearch indexer + exec('sudo -S service sphinxsearch start', $output, $retval); // Attempt to start sphinxsearch service again + } } } diff --git a/tests/functional/session_page_update_test.php b/tests/functional/session_page_update_test.php new file mode 100644 index 00000000000..66b610f01d5 --- /dev/null +++ b/tests/functional/session_page_update_test.php @@ -0,0 +1,49 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ + +class phpbb_functional_session_page_update_test extends phpbb_functional_test_case +{ + public function setUp(): void + { + parent::setUp(); + + // Delete previous session info for admin user + $sql = 'DELETE FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = 2'; + $this->db->sql_query($sql); + + $this->login(); + } + + public function test_session_page_update() + { + // Request index page + self::request('GET', 'index.php'); + $this->assertEquals(200, self::$client->getInternalResponse()->getStatusCode(), 'Failed asserting that status of index page is 200'); + + $sql = 'SELECT session_page FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = 2 ORDER BY session_time DESC'; + $this->db->sql_query_limit($sql, 1); + $this->assertEquals('index.php', $this->db->sql_fetchfield('session_page'), 'Failed asserting that session_page is index.php for admin user'); + + // Request non-existent url + self::request('GET', 'nonexistent.jpg', [], false); + $this->assertEquals(404, self::$client->getInternalResponse()->getStatusCode(), 'Failed asserting that status of non-existent image is 404'); + + $this->db->sql_query_limit($sql, 1); + // User page should not be updated to non-existent one + $this->assertEquals('index.php', $this->db->sql_fetchfield('session_page'), 'Failed asserting that session page has not changed after 404'); + } +} diff --git a/tests/functional/smilies_test.php b/tests/functional/smilies_test.php new file mode 100644 index 00000000000..3a77ec89f63 --- /dev/null +++ b/tests/functional/smilies_test.php @@ -0,0 +1,46 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_smilies_test extends phpbb_functional_test_case +{ + public function test_smilies_mode() + { + $this->login(); + + // Get smilies data + $sql_ary = [ + 'SELECT' => 's.smiley_url, MIN(s.emotion) AS emotion, MIN(s.code) AS code, s.smiley_width, s.smiley_height, MIN(s.smiley_order) AS min_smiley_order', + 'FROM' => [ + SMILIES_TABLE => 's', + ], + 'GROUP_BY' => 's.smiley_url, s.smiley_width, s.smiley_height', + 'ORDER_BY' => $this->db->sql_quote('min_smiley_order'), + ]; + $sql = $this->db->sql_build_query('SELECT', $sql_ary); + $result = $this->db->sql_query($sql); + $smilies = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + + // Visit smilies page + $crawler = self::request('GET', 'posting.php?mode=smilies'); + foreach ($smilies as $index => $smiley) + { + $this->assertStringContainsString($smiley['smiley_url'], + $crawler->filter('div[class="inner"] > a > img')->eq($index)->attr('src') + ); + } + } +} diff --git a/tests/functional/subforum_test.php b/tests/functional/subforum_test.php new file mode 100644 index 00000000000..91a7e777542 --- /dev/null +++ b/tests/functional/subforum_test.php @@ -0,0 +1,112 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** + * @group functional + */ +class phpbb_functional_subforum_test extends phpbb_functional_test_case +{ + public function test_setup_forums() + { + $this->login(); + $this->admin_login(); + + $forum_name = 'Subforum Test #1'; + $crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}"); + $form = $crawler->selectButton('addforum')->form([ + 'forum_name' => $forum_name, + ]); + $crawler = self::submit($form); + $form = $crawler->selectButton('update')->form([ + 'forum_perm_from' => 2, + ]); + self::submit($form); + $forum_id = self::get_forum_id($forum_name); + + // 'Feeds #1.1' is a sub-forum of 'Feeds #1' + $forum_name = 'Subforum Test #1.1'; + $crawler = self::request('GET', "adm/index.php?i=acp_forums&sid={$this->sid}&icat=6&mode=manage&parent_id={$forum_id}"); + $form = $crawler->selectButton('addforum')->form([ + 'forum_name' => $forum_name, + ]); + $crawler = self::submit($form); + $form = $crawler->selectButton('update')->form([ + 'forum_perm_from' => 2, + ]); + self::submit($form); + $forum_id = self::get_forum_id('Subforum Test #1.1'); + + // 'Feeds #news' will be used for feed.php?mode=news + $crawler = self::request('GET', "adm/index.php?i=acp_forums&sid={$this->sid}&icat=6&mode=manage&parent_id={$forum_id}"); + $form = $crawler->selectButton('addforum')->form([ + 'forum_name' => 'Subforum Test #1.1.1', + ]); + $crawler = self::submit($form); + $form = $crawler->selectButton('update')->form([ + 'forum_perm_from' => 2, + ]); + self::submit($form); + } + + /** + * @depends test_setup_forums + */ + public function test_display_subforums() + { + $crawler = self::request('GET', "index.php?sid={$this->sid}"); + $this->assertStringContainsString('Subforum Test #1.1', $crawler->html()); + $this->assertStringContainsString('Subforum Test #1.1.1', $crawler->html()); + } + + /** + * @depends test_display_subforums + */ + public function test_display_subforums_limit() + { + $this->login(); + $this->admin_login(); + + // Disable listing subforums + $forum_id = $this->get_forum_id('Subforum Test #1'); + $crawler = self::request('GET', "adm/index.php?i=acp_forums&sid={$this->sid}&icat=7&mode=manage&parent_id=0&f={$forum_id}&action=edit"); + $form = $crawler->selectButton('submit')->form([ + 'display_subforum_limit' => 1, + ]); + self::submit($form); + + $crawler = self::request('GET', "index.php?sid={$this->sid}"); + $this->assertStringContainsString('Subforum Test #1.1', $crawler->html()); + $this->assertStringNotContainsString('Subforum Test #1.1.1', $crawler->html()); + } + + protected function get_forum_id($forum_name) + { + $forum_id = 0; + + $sql = 'SELECT * + FROM ' . FORUMS_TABLE . ' + WHERE ' . $this->db->sql_in_set('forum_name', $forum_name); + $result = $this->db->sql_query($sql); + while ($row = $this->db->sql_fetchrow($result)) + { + if ($row['forum_name'] == $forum_name) + { + $forum_id = (int) $row['forum_id']; + break; + } + } + $this->db->sql_freeresult($result); + + return $forum_id; + } +} diff --git a/tests/functional/switch_permissions_test.php b/tests/functional/switch_permissions_test.php new file mode 100644 index 00000000000..0dbcf3b2b06 --- /dev/null +++ b/tests/functional/switch_permissions_test.php @@ -0,0 +1,118 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** + * @group functional + */ +class phpbb_functional_switch_permissions_test extends phpbb_functional_test_case +{ + private const TEST_USER = 'switch-permissions-test'; + + protected function setUp(): void + { + parent::setUp(); + + $this->login(); + $this->admin_login(); + + $this->add_lang(['common', 'ucp']); + } + + public function test_switch_permissions_acp() + { + $user_id = $this->create_user(self::TEST_USER); + + // Open user administration page for new user + $crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u={$user_id}&sid={$this->sid}"); + + // Use permissions + $link = $crawler->selectLink($this->lang('USE_PERMISSIONS'))->link(); + $crawler = self::$client->click($link); + + // Check that we switched permissions to test user + $this->assertStringContainsString( + str_replace('
      ', '
      ', $this->lang('PERMISSIONS_TRANSFERRED', self::TEST_USER)), + $crawler->html() + ); + + // Check that ACP pages get forced to acp main with restore permission info + $this->add_lang('acp/common'); + $crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u={$user_id}&sid={$this->sid}"); + $this->assertStringContainsString( + $this->lang('PERMISSIONS_TRANSFERRED'), + $crawler->text() + ); + + // Check that restore permissions link exists + $crawler = self::$client->request('GET', '../index.php?sid=' . $this->sid); + $this->assertStringContainsString( + $this->lang('RESTORE_PERMISSIONS'), + $crawler->text() + ); + + // Check that restore permissions works + $crawler = self::$client->request('GET', 'ucp.php?mode=restore_perm&sid=' . $this->sid); + $this->assertStringContainsString( + $this->lang('PERMISSIONS_RESTORED'), + $crawler->text() + ); + } + + /** + * @depends test_switch_permissions_acp + */ + public function test_switch_permissions_ucp() + { + $sql = 'SELECT user_id + FROM ' . USERS_TABLE . " + WHERE username = '" . self::TEST_USER . "'"; + $result = $this->db->sql_query($sql); + $user_id = $this->db->sql_fetchfield('user_id'); + $this->db->sql_freeresult($result); + + // Open memberlist profile page for user + $crawler = self::request('GET', "memberlist.php?mode=viewprofile&u={$user_id}&sid={$this->sid}"); + + // Use permissions + $link = $crawler->selectLink($this->lang('USE_PERMISSIONS'))->link(); + $crawler = self::$client->click($link); + + // Check that we switched permissions to test user + $this->assertStringContainsString( + str_replace('
      ', '
      ', $this->lang('PERMISSIONS_TRANSFERRED', self::TEST_USER)), + $crawler->html() + ); + + // Check that UCP pages don't get forced to UCP main with restore permission info + $this->add_lang(['memberlist', 'ucp']); + $crawler = self::request('GET', "ucp.php?i=ucp_profile&mode=profile_info&sid={$this->sid}"); + $this->assertStringContainsString( + $this->lang('EDIT_PROFILE'), + $crawler->text() + ); + + // Check that restore permissions link exists + $crawler = self::$client->request('GET', 'index.php?sid=' . $this->sid); + $this->assertStringContainsString( + $this->lang('RESTORE_PERMISSIONS'), + $crawler->text() + ); + + // Check that restore permissions works + $crawler = self::$client->request('GET', 'ucp.php?mode=restore_perm&sid=' . $this->sid); + $this->assertStringContainsString( + $this->lang('PERMISSIONS_RESTORED'), + $crawler->text() + ); + } +} diff --git a/tests/functional/ucp_allow_pm_test.php b/tests/functional/ucp_allow_pm_test.php index 2d41296ddf0..3859024d58e 100644 --- a/tests/functional/ucp_allow_pm_test.php +++ b/tests/functional/ucp_allow_pm_test.php @@ -16,15 +16,15 @@ */ class phpbb_functional_ucp_allow_pm_test extends phpbb_functional_test_case { - static protected $data = array(); + protected static $data = array(); - public function __construct() + protected function setUp(): void { - parent::__construct(); + parent::setUp(); - $this->backupStaticAttributesBlacklist += array( - 'phpbb_functional_ucp_allow_pm_test' => array('data'), - ); + $this->setBackupStaticPropertiesExcludeList([ + 'phpbb_functional_ucp_allow_pm_test' => ['data'], + ]); } // user A sends a PM to user B where B accepts PM @@ -64,11 +64,10 @@ public function test_disabled_pm_admin_to_user() // enable or disable PM for a user, like from ucp protected function set_user_allow_pm($user_id, $allow) { - $db = $this->get_db(); $sql = 'UPDATE ' . USERS_TABLE . " SET user_allow_pm = " . $allow . " WHERE user_id = " . $user_id; - $result = $db->sql_query($sql); - $db->sql_freeresult($result); + $result = $this->db->sql_query($sql); + $this->db->sql_freeresult($result); } } diff --git a/tests/functional/ucp_attachments_test.php b/tests/functional/ucp_attachments_test.php new file mode 100644 index 00000000000..fbd352ea28f --- /dev/null +++ b/tests/functional/ucp_attachments_test.php @@ -0,0 +1,377 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** + * @group functional + */ +class phpbb_functional_ucp_attachments_test extends phpbb_functional_test_case +{ + private $path; + + protected function setUp(): void + { + parent::setUp(); + $this->path = __DIR__ . '/fixtures/files/'; + $this->add_lang('posting'); + + if (!$this->user_exists('ucp-file-test')) + { + $this->create_user('ucp-file-test'); + } + } + + protected function tearDown(): void + { + $iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/'); + foreach ($iterator as $fileinfo) + { + if ($fileinfo->isDot() + || $fileinfo->isDir() + || $fileinfo->getFilename() === 'index.htm' + || $fileinfo->getFilename() === '.htaccess' + ) + { + continue; + } + + unlink($fileinfo->getPathname()); + } + } + + private function upload_file($filename, $mimetype) + { + $crawler = self::$client->request( + 'GET', + 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid + ); + + $file_form_data = array_merge(['add_file' => $this->lang('ADD_FILE')], $this->get_hidden_fields($crawler, 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid)); + + $file = array( + 'tmp_name' => $this->path . $filename, + 'name' => $filename, + 'type' => $mimetype, + 'size' => filesize($this->path . $filename), + 'error' => UPLOAD_ERR_OK, + ); + + $crawler = self::$client->request( + 'POST', + 'posting.php?mode=reply&t=1&sid=' . $this->sid, + $file_form_data, + array('fileupload' => $file) + ); + + return $crawler; + } + + private function upload_file_pm($filename, $mimetype) + { + $crawler = self::$client->request( + 'GET', + 'ucp.php?i=pm&mode=compose&sid=' . $this->sid + ); + + $file_form_data = array_merge(['add_file' => $this->lang('ADD_FILE')], $this->get_hidden_fields($crawler, 'ucp.php?i=pm&mode=compose&sid=' . $this->sid)); + + $file = array( + 'tmp_name' => $this->path . $filename, + 'name' => $filename, + 'type' => $mimetype, + 'size' => filesize($this->path . $filename), + 'error' => UPLOAD_ERR_OK, + ); + + $crawler = self::$client->request( + 'POST', + 'ucp.php?i=pm&mode=compose&sid=' . $this->sid, + $file_form_data, + array('fileupload' => $file) + ); + + return $crawler; + } + + public function test_ucp_list_attachments() + { + $this->login('ucp-file-test'); + $this->add_lang(['common', 'posting']); + $crawler = $this->upload_file('valid.jpg', 'image/jpeg'); + + // Ensure there was no error message rendered + $this->assertStringNotContainsString('

      ' . $this->lang('INFORMATION') . '

      ', $this->get_content()); + + // Also the file name should be in the first row of the files table + $this->assertEquals('valid.jpg', $crawler->filter('span.file-name > a')->text()); + + $attach_link = $crawler->filter('span.file-name > a')->attr('href'); + preg_match('#download/attachment/([0-9]+)/valid.jpg#', $attach_link, $match); + $attach_id = $match[1]; + + // Submit post + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'message' => 'This is a test', + ]); + $crawler = self::submit($form); + + $this->assertStringContainsString('This is a test', $crawler->text()); + $this->assertEquals('valid.jpg', $crawler->filter('img.postimage')->attr('alt')); + + // Navigate to ucp attachments for user + $crawler = self::request('GET', 'ucp.php?i=ucp_attachments&mode=attachments&sid=' . $this->sid); + $this->assertEquals(1, $crawler->filter('.attachment-filename')->count()); + + $attachment_filename = $crawler->filter('.attachment-filename'); + $this->assertEquals('valid.jpg', $attachment_filename->attr('title')); + $this->assertStringContainsString('app.php/download/attachment/' . $attach_id . '/valid.jpg', $attachment_filename->attr('href')); + $this->assertFalse($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled')); + } + + public function test_ucp_delete_expired_attachment() + { + $this->login('ucp-file-test'); + $this->add_lang(['common', 'posting']); + + $this->set_flood_interval(0); + + $crawler = $this->upload_file('valid.jpg', 'image/jpeg'); + + // Ensure there was no error message rendered + $this->assertStringNotContainsString('

      ' . $this->lang('INFORMATION') . '

      ', $this->get_content()); + + // Also the file name should be in the first row of the files table + $this->assertEquals('valid.jpg', $crawler->filter('span.file-name > a')->text()); + + $attach_link = $crawler->filter('span.file-name > a')->attr('href'); + preg_match('#download/attachment/([0-9]+)/valid.jpg#', $attach_link, $match); + $attach_id = $match[1]; + + // Submit post + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'message' => 'This is a test', + ]); + $crawler = self::submit($form); + $post_url = $crawler->getUri(); + $post_id = $this->get_parameter_from_link($post_url, 'p'); + + $this->assertStringContainsString('This is a test', $crawler->text()); + $this->assertEquals('valid.jpg', $crawler->filter('img.postimage')->attr('alt')); + $this->set_flood_interval(15); + + // Navigate to ucp attachments for user + $crawler = self::request('GET', 'ucp.php?i=ucp_attachments&mode=attachments&sid=' . $this->sid); + $crawler->filter('.attachment-filename')->each(function ($node, $i) use ($attach_id, &$attachment_node) + { + if (strpos($node->attr('href'), 'download/attachment/' . $attach_id . '/valid.jpg') !== false) + { + $attachment_node = $node; + } + }); + $this->assertNotNull($attachment_node); + + $this->assertEquals('valid.jpg', $attachment_node->attr('title')); + $this->assertStringContainsString('download/attachment/' . $attach_id . '/valid.jpg', $attachment_node->attr('href')); + + $this->logout(); + + // Switch to admin user + $this->login(); + $this->admin_login(); + $this->add_lang(['acp/board', 'acp/common']); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=post&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[edit_time]' => 1, + 'config[delete_time]' => 1, + ]); + + self::submit($form); + + // Update post time to at least one minute before current time + $sql = 'UPDATE ' . POSTS_TABLE . ' + SET post_time = post_time - ' . 60 . ' + WHERE post_id = ' . (int) $post_id; + $this->db->sql_query($sql); + + // Log out and back in as test user + $this->logout(); + $this->login('ucp-file-test'); + + // Navigate to ucp attachments for user, deleting should be disabled + $crawler = self::request('GET', 'ucp.php?i=ucp_attachments&mode=attachments&sid=' . $this->sid); + $crawler->filter('.attachment-filename')->each(function ($node, $i) use ($attach_id, &$attachment_node) + { + if (strpos($node->attr('href'), 'download/attachment/' . $attach_id . '/valid.jpg') !== false) + { + $attachment_node = $node; + } + }); + + $this->assertEquals('valid.jpg', $attachment_node->attr('title')); + $this->assertStringContainsString('download/attachment/' . $attach_id . '/valid.jpg', $attachment_node->attr('href')); + $this->assertTrue($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled')); + + // It should not be possible to delete the attachment + $crawler = self::request('POST', 'ucp.php?i=ucp_attachments&mode=attachments&sid=' . $this->sid, [ + 'delete' => true, + 'attachment[' . $attach_id . ']' => $attach_id, + ]); + + $this->assertNotContainsLang('DELETE_ATTACHMENT_CONFIRM', $crawler->text()); + + $crawler->filter('.attachment-filename')->each(function ($node, $i) use ($attach_id, &$attachment_node) + { + if (strpos($node->attr('href'), 'download/attachment/' . $attach_id . '/valid.jpg') !== false) + { + $attachment_node = $node; + } + }); + $this->assertEquals('valid.jpg', $attachment_node->attr('title')); + $this->assertStringContainsString('download/attachment/' . $attach_id . '/valid.jpg', $attachment_node->attr('href')); + $this->assertTrue($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled')); + + $this->logout(); + + // Switch to admin user + $this->login(); + $this->admin_login(); + $this->add_lang(['acp/board', 'acp/common']); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=post&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[edit_time]' => 0, + 'config[delete_time]' => 0, + ]); + + self::submit($form); + + // Update post time to original one + $sql = 'UPDATE ' . POSTS_TABLE . ' + SET post_time = post_time + ' . 60 . ' + WHERE post_id = ' . (int) $post_id; + $this->db->sql_query($sql); + } + + public function test_pm_attachment() + { + $this->set_flood_interval(0); + // Switch to admin user + $this->login(); + $this->admin_login(); + $this->add_lang(['common', 'acp/attachments', 'acp/board', 'acp/common']); + + $crawler = self::request('GET', 'adm/index.php?i=acp_attachments&mode=attach&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[allow_pm_attach]' => 1, + ]); + self::submit($form); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=message&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[pm_edit_time]' => 60, + ]); + self::submit($form); + + $crawler = self::request('GET', 'adm/index.php?i=acp_attachments&mode=ext_groups&action=edit&g=1&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'allow_in_pm' => 1, + ]); + self::submit($form); + + $this->logout(); + $this->login('ucp-file-test'); + $this->add_lang(['ucp']); + $crawler = $this->upload_file_pm('valid.jpg', 'image/jpeg'); + + $attach_link = $crawler->filter('span.file-name > a')->attr('href'); + preg_match('#download/attachment/([0-9]+)/valid.jpg#', $attach_link, $match); + $attach_id = $match[1]; + + $form = $crawler->selectButton($this->lang('ADD'))->form([ + 'username_list' => 'admin' + ]); + $crawler = self::submit($form); + + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'subject' => 'Test PM', + 'message' => 'This is a test', + ]); + $crawler = self::submit($form); + + $this->assertContainsLang('MESSAGE_STORED', $crawler->text()); + $refresh_data = explode(';', $crawler->filterXpath("//meta[@http-equiv='refresh']")->attr('content')); + $pm_url = trim($refresh_data[1]); + + $pm_id = $this->get_parameter_from_link($pm_url, 'p'); + + // Navigate to ucp attachments for user + $crawler = self::request('GET', 'ucp.php?i=ucp_attachments&mode=attachments&sid=' . $this->sid); + $crawler->filter('.attachment-filename')->each(function ($node, $i) use ($attach_id, &$attachment_node) + { + if (strpos($node->attr('href'), 'download/attachment/' . $attach_id . '/valid.jpg') !== false) + { + $attachment_node = $node; + } + }); + $this->assertNotNull($attachment_node); + + $this->assertEquals('valid.jpg', $attachment_node->attr('title')); + $this->assertStringContainsString('download/attachment/' . $attach_id . '/valid.jpg', $attachment_node->attr('href')); + $this->assertFalse($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled')); + + // Update message time to 60 minutes later + $sql = 'UPDATE ' . PRIVMSGS_TABLE . ' + SET message_time = message_time - ' . 60 * 60 . ' + WHERE msg_id = ' . (int) $pm_id; + $this->db->sql_query($sql); + + $crawler = self::request('GET', 'ucp.php?i=ucp_attachments&mode=attachments&sid=' . $this->sid); + $crawler->filter('.attachment-filename')->each(function ($node, $i) use ($attach_id, &$attachment_node) + { + if (strpos($node->attr('href'), 'download/attachment/' . $attach_id . '/valid.jpg') !== false) + { + $attachment_node = $node; + } + }); + $this->assertNotNull($attachment_node); + + $this->assertEquals('valid.jpg', $attachment_node->attr('title')); + $this->assertStringContainsString('download/attachment/' . $attach_id . '/valid.jpg', $attachment_node->attr('href')); + $this->assertTrue($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled')); + + $this->set_flood_interval(15); + + // Switch to admin user and disable extra settings again + $this->logout(); + $this->login(); + $this->admin_login(); + $this->add_lang(['common', 'acp/attachments', 'acp/board', 'acp/common']); + + $crawler = self::request('GET', 'adm/index.php?i=acp_attachments&mode=attach&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[allow_pm_attach]' => 0, + ]); + self::submit($form); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=message&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'config[pm_edit_time]' => 0, + ]); + self::submit($form); + + $crawler = self::request('GET', 'adm/index.php?i=acp_attachments&mode=ext_groups&action=edit&g=1&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + $form['allow_in_pm']->untick(); + self::submit($form); + } +} diff --git a/tests/functional/ucp_groups_test.php b/tests/functional/ucp_groups_test.php index cd18a0fcae8..6e18d610ce8 100644 --- a/tests/functional/ucp_groups_test.php +++ b/tests/functional/ucp_groups_test.php @@ -11,15 +11,13 @@ * */ -require_once dirname(__FILE__) . '/common_groups_test_case.php'; +require_once __DIR__ . '/common_groups_test_case.php'; /** * @group functional */ class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_test_case { - protected $db; - protected function get_url() { return 'ucp.php?i=groups&mode=manage&action=edit'; @@ -27,10 +25,6 @@ protected function get_url() protected function get_teampage_settings() { - if (!isset($this->db)) - { - $this->db = $this->get_db(); - } $sql = 'SELECT g.group_legend AS group_legend, t.teampage_position AS group_teampage FROM ' . GROUPS_TABLE . ' g LEFT JOIN ' . TEAMPAGE_TABLE . ' t @@ -51,7 +45,75 @@ public function test_ucp_groups_teampage() $form = $this->get_group_manage_form(); $teampage_settings = $this->get_teampage_settings(); $crawler = self::submit($form); - $this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text()); + $this->assertStringContainsString($this->lang('GROUP_UPDATED'), $crawler->text()); $this->assertEquals($teampage_settings, $this->get_teampage_settings()); } + + public function test_create_request_group() + { + $this->login(); + $this->admin_login(); + $this->add_lang('acp/groups'); + + $crawler = self::request('GET', 'adm/index.php?i=acp_groups&mode=manage&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + $crawler = self::submit($form, array('group_name' => 'request-group')); + + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + $crawler = self::submit($form, array('group_name' => 'request-group')); + + $this->assertContainsLang('GROUP_CREATED', $crawler->filter('#main')->text()); + + $group_id = $this->get_group_id('request-group'); + + // Make admin group leader + $crawler = self::request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=list&g=' . $group_id . '&sid=' . $this->sid); + $form = $crawler->filter('input[name=addusers]')->selectButton($this->lang('SUBMIT'))->form(); + $crawler = self::submit($form, [ + 'leader' => 1, + 'usernames' => 'admin', + ]); + + $this->assertContainsLang('GROUP_MODS_ADDED', $crawler->filter('#main')->text()); + } + + /** + * @depends test_create_request_group + */ + public function test_request_group_membership() + { + $this->create_user('request-group-user'); + $this->login('request-group-user'); + $this->add_lang('groups'); + + $group_id = $this->get_group_id('request-group'); + + $crawler = self::request('GET', 'ucp.php?i=ucp_groups&mode=membership&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + $crawler = self::submit($form, ['selected' => $group_id, 'action' => 'join']); + $this->assertContainsLang('GROUP_JOIN_PENDING_CONFIRM', $crawler->text()); + + $form = $crawler->selectButton($this->lang('YES'))->form(); + $crawler = self::submit($form); + $this->assertContainsLang('GROUP_JOINED_PENDING', $crawler->text()); + } + + /** + * @depends test_request_group_membership + */ + public function test_approve_group_membership() + { + $this->login(); + $this->add_lang('acp/groups'); + + $group_id = $this->get_group_id('request-group'); + $crawler = self::request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=list&g=' . $group_id . '&sid=' . $this->sid); + $form = $crawler->filter('input[name=update]')->selectButton($this->lang('SUBMIT'))->form(); + $crawler = self::submit($form, [ + 'mark' => [$crawler->filter('input[name="mark[]"]')->first()->attr('value')], + 'action' => 'approve', + ]); + + $this->assertContainsLang('USERS_APPROVED', $crawler->text()); + } } diff --git a/tests/functional/ucp_pm_test.php b/tests/functional/ucp_pm_test.php index ddd5c8d7917..283df83292d 100644 --- a/tests/functional/ucp_pm_test.php +++ b/tests/functional/ucp_pm_test.php @@ -16,7 +16,7 @@ */ class phpbb_functional_ucp_pm_test extends phpbb_functional_test_case { - public function setUp() + protected function setUp(): void { parent::setUp(); $this->login(); diff --git a/tests/functional/ucp_preferences_test.php b/tests/functional/ucp_preferences_test.php index 7ef325dc4b8..4824676c092 100644 --- a/tests/functional/ucp_preferences_test.php +++ b/tests/functional/ucp_preferences_test.php @@ -37,6 +37,9 @@ public function test_submitting_preferences_view() $this->assertContainsLang('PREFERENCES_UPDATED', $crawler->filter('#message')->text()); } + /** + * @depends test_submitting_preferences_view + */ public function test_submitting_invalid_preferences_view() { $this->add_lang('ucp'); @@ -66,6 +69,9 @@ public function test_submitting_invalid_preferences_view() $this->assertContainsLang('WRONG_DATA_TOPIC_SK', $crawler->filter('#cp-main')->text()); } + /** + * @depends test_submitting_invalid_preferences_view + */ public function test_read_preferences_view() { $this->add_lang('ucp'); @@ -82,4 +88,28 @@ public function test_read_preferences_view() $this->assertEquals('a', $form->get('post_sd')->getValue()); $this->assertEquals('1', $form->get('post_st')->getValue()); } + + /** + * @depends test_read_preferences_view + */ + public function test_reset_preferences_default() + { + $this->add_lang('ucp'); + $this->login(); + + $crawler = self::request('GET', 'ucp.php?i=ucp_prefs&mode=view'); + $this->assertContainsLang('UCP_PREFS_VIEW', $crawler->filter('#cp-main h2')->text()); + + $form = $crawler->selectButton('Submit')->form(array( + 'topic_sk' => 't', + 'topic_sd' => 'd', + 'topic_st' => '0', + 'post_sk' => 't', + 'post_sd' => 'a', + 'post_st' => '0', + )); + + $crawler = self::submit($form); + $this->assertContainsLang('PREFERENCES_UPDATED', $crawler->filter('#message')->text()); + } } diff --git a/tests/functional/ucp_profile_test.php b/tests/functional/ucp_profile_test.php index e7abba92556..f8ac77cfae4 100644 --- a/tests/functional/ucp_profile_test.php +++ b/tests/functional/ucp_profile_test.php @@ -19,6 +19,7 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case public function test_submitting_profile_info() { $this->add_lang('ucp'); + $this->add_lang('memberlist'); $this->login(); $crawler = self::request('GET', 'ucp.php?i=ucp_profile&mode=profile_info'); @@ -26,11 +27,10 @@ public function test_submitting_profile_info() $form = $crawler->selectButton('Submit')->form(array( 'pf_phpbb_facebook' => 'phpbb', - 'pf_phpbb_googleplus' => 'phpbb', 'pf_phpbb_location' => 'Bertie´s Empire', 'pf_phpbb_skype' => 'phpbb.skype.account', 'pf_phpbb_twitter' => 'phpbb_twitter', - 'pf_phpbb_youtube' => 'phpbb.youtube', + 'pf_phpbb_youtube' => 'user/phpbb.youtube', )); $crawler = self::submit($form); @@ -40,10 +40,67 @@ public function test_submitting_profile_info() $form = $crawler->selectButton('Submit')->form(); $this->assertEquals('phpbb', $form->get('pf_phpbb_facebook')->getValue()); - $this->assertEquals('phpbb', $form->get('pf_phpbb_googleplus')->getValue()); $this->assertEquals('Bertie´s Empire', $form->get('pf_phpbb_location')->getValue()); $this->assertEquals('phpbb.skype.account', $form->get('pf_phpbb_skype')->getValue()); $this->assertEquals('phpbb_twitter', $form->get('pf_phpbb_twitter')->getValue()); - $this->assertEquals('phpbb.youtube', $form->get('pf_phpbb_youtube')->getValue()); + $this->assertEquals('user/phpbb.youtube', $form->get('pf_phpbb_youtube')->getValue()); + + $crawler = self::request('GET', 'memberlist.php?mode=viewprofile&un=admin'); + $link = $crawler->selectLink($this->lang('VIEW_YOUTUBE_PROFILE')); + $this->assertSame('https://youtube.com/user/phpbb.youtube', $link->attr('href')); + } + + public function test_submitting_emoji() + { + $this->add_lang('ucp'); + $this->login(); + + $crawler = self::request('GET', 'ucp.php?i=ucp_profile&mode=profile_info'); + $this->assertContainsLang('UCP_PROFILE_PROFILE_INFO', $crawler->filter('#cp-main h2')->text()); + + $form = $crawler->selectButton('Submit')->form([ + 'pf_phpbb_location' => '😁', // grinning face with smiling eyes Emoji + ]); + $crawler = self::submit($form); + $this->assertContainsLang('PROFILE_UPDATED', $crawler->filter('#message')->text()); + + $crawler = self::request('GET', 'ucp.php?i=ucp_profile&mode=profile_info'); + $form = $crawler->selectButton('Submit')->form(); + $this->assertEquals('😁', $form->get('pf_phpbb_location')->getValue()); + } + + public function test_autologin_keys_manage() + { + $this->add_lang('ucp'); + $this->login('admin', true); + + $crawler = self::request('GET', 'ucp.php?i=ucp_profile&mode=autologin_keys'); + $this->assertContainsLang('UCP_PROFILE_AUTOLOGIN_KEYS', $crawler->filter('#cp-main h2')->text()); + + $profile_url = $crawler->filter('a[title="Profile"]')->attr('href'); + $user_id = $this->get_parameter_from_link($profile_url, 'u'); + + $sql_ary = [ + 'SELECT' => 'sk.key_id', + 'FROM' => [SESSIONS_KEYS_TABLE => 'sk'], + 'WHERE' => 'sk.user_id = ' . (int) $user_id, + 'ORDER_BY' => 'sk.last_login ASC', + ]; + $result = $this->db->sql_query_limit($this->db->sql_build_query('SELECT', $sql_ary), 1); + $key_id = substr($this->db->sql_fetchfield('key_id'), 0, 8); + $this->db->sql_freeresult($result); + + $this->assertStringContainsString($key_id, $crawler->filter('label[for="' . $key_id . '"]')->text()); + + $form = $crawler->selectButton('submit')->form(); + foreach ($form['keys'] as $key) + { + $key->tick(); + } + $crawler = self::submit($form); + $this->assertStringContainsString($this->lang('AUTOLOGIN_SESSION_KEYS_DELETED'), $crawler->filter('html')->text()); + + $crawler = self::request('GET', 'ucp.php?i=ucp_profile&mode=autologin_keys'); + $this->assertStringContainsString($this->lang('PROFILE_NO_AUTOLOGIN_KEYS'), $crawler->filter('tbody > tr > td[class="bg1"]')->text()); } } diff --git a/tests/functional/user_password_reset_test.php b/tests/functional/user_password_reset_test.php index 3da78407cfd..f7943a900c5 100644 --- a/tests/functional/user_password_reset_test.php +++ b/tests/functional/user_password_reset_test.php @@ -18,108 +18,159 @@ class phpbb_functional_user_password_reset_test extends phpbb_functional_test_ca { protected $user_data; + protected const TEST_USER = 'reset-password-test-user'; + + protected const TEST_EMAIL = 'reset-password-test-user@test.com'; + public function test_password_reset() { $this->add_lang('ucp'); - $user_id = $this->create_user('reset-password-test-user'); + $user_id = $this->create_user(self::TEST_USER, self::TEST_EMAIL); + // test without email $crawler = self::request('GET', "ucp.php?mode=sendpassword&sid={$this->sid}"); + $this->assertStringContainsString('app.php/user/forgot_password', $crawler->getUri()); + $form = $crawler->selectButton('submit')->form(); + $crawler = self::submit($form); + $this->assertContainsLang('NO_EMAIL_USER', $crawler->text()); + + // test with non-existent email + $crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}"); $form = $crawler->selectButton('submit')->form(array( - 'username' => 'reset-password-test-user', + 'email' => 'non-existent@email.com', )); $crawler = self::submit($form); - $this->assertContainsLang('NO_EMAIL_USER', $crawler->text()); + $this->assertContainsLang('PASSWORD_RESET_LINK_SENT', $crawler->text()); - $crawler = self::request('GET', "ucp.php?mode=sendpassword&sid={$this->sid}"); + // test with correct email + $crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}"); + $form = $crawler->selectButton('submit')->form(array( + 'email' => self::TEST_EMAIL, + )); + $crawler = self::submit($form); + $this->assertContainsLang('PASSWORD_RESET_LINK_SENT', $crawler->text()); + + // Check if columns in database were updated for password reset + $this->get_user_data(self::TEST_USER); + $this->assertNotEmpty($this->user_data['reset_token']); + $this->assertNotEmpty($this->user_data['reset_token_expiration']); + $reset_token = $this->user_data['reset_token']; + $reset_token_expiration = $this->user_data['reset_token_expiration']; + + // Check that reset token is only created once per day + $crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}"); + $form = $crawler->selectButton('submit')->form(array( + 'email' => self::TEST_EMAIL, + )); + $crawler = self::submit($form); + $this->assertContainsLang('PASSWORD_RESET_LINK_SENT', $crawler->text()); + + $this->get_user_data(self::TEST_USER); + $this->assertNotEmpty($this->user_data['reset_token']); + $this->assertNotEmpty($this->user_data['reset_token_expiration']); + $this->assertEquals($reset_token, $this->user_data['reset_token']); + $this->assertEquals($reset_token_expiration, $this->user_data['reset_token_expiration']); + + // Create another user with the same email + $this->create_user('reset-password-test-user1', self::TEST_EMAIL); + + // Test that username is now also required + $crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}"); + $form = $crawler->selectButton('submit')->form(array( + 'email' => self::TEST_EMAIL, + )); + $crawler = self::submit($form); + $this->assertContainsLang('EMAIL_NOT_UNIQUE', $crawler->text()); + + // Provide both username and email $form = $crawler->selectButton('submit')->form(array( - 'username' => 'reset-password-test-user', - 'email' => 'nobody@example.com', + 'email' => self::TEST_EMAIL, + 'username' => 'reset-password-test-user1', )); $crawler = self::submit($form); - $this->assertContainsLang('PASSWORD_UPDATED', $crawler->text()); + $this->assertContainsLang('PASSWORD_RESET_LINK_SENT', $crawler->text()); // Check if columns in database were updated for password reset - $this->get_user_data(); - $this->assertNotNull($this->user_data['user_actkey']); - $this->assertNotNull($this->user_data['user_newpasswd']); - - // Make sure we know the password - $db = $this->get_db(); - $this->passwords_manager = $this->get_passwords_manager(); - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_newpasswd = '" . $db->sql_escape($this->passwords_manager->hash('reset-password-test-user')) . "' - WHERE user_id = " . $user_id; - $db->sql_query($sql); + $this->get_user_data('reset-password-test-user1'); + $this->assertNotEmpty($this->user_data['reset_token']); + $this->assertNotEmpty($this->user_data['reset_token_expiration']); + $this->assertGreaterThan(time(), $this->user_data['reset_token_expiration']); } public function test_login_after_reset() { - $this->login('reset-password-test-user'); + $this->login(self::TEST_USER); } - public function data_activate_new_password() + public static function data_reset_user_password() { - return array( - array('WRONG_ACTIVATION', false, 'FOOBAR'), - array('ALREADY_ACTIVATED', 2, 'FOOBAR'), - array('PASSWORD_ACTIVATED', false, false), - array('ALREADY_ACTIVATED', false, false), - ); + return [ + ['RESET_TOKEN_EXPIRED_OR_INVALID', 0, 'abcdef'], + ['NO_USER', ' ', 'abcdef'], + ['NO_RESET_TOKEN', 0, ' '], + ['RESET_TOKEN_EXPIRED_OR_INVALID', 2, ''], + ['RESET_TOKEN_EXPIRED_OR_INVALID', 1e7, ''], + ['', 0, ''], + ['NO_RESET_TOKEN', 0, ''], // already reset + ]; } /** - * @dataProvider data_activate_new_password - */ - public function test_activate_new_password($expected, $user_id, $act_key) + * @dataProvider data_reset_user_password + */ + public function test_reset_user_password($expected, $user_id, $token) { $this->add_lang('ucp'); - $this->get_user_data(); - $user_id = (!$user_id) ? $this->user_data['user_id'] : $user_id; - $act_key = (!$act_key) ? $this->user_data['user_actkey'] : $act_key; + $this->get_user_data(self::TEST_USER); + $user_id = !$user_id ? $this->user_data['user_id'] : $user_id; + $token = !$token ? $this->user_data['reset_token'] : $token; - $crawler = self::request('GET', "ucp.php?mode=activate&u=$user_id&k=$act_key&sid={$this->sid}"); - $this->assertContainsLang($expected, $crawler->text()); + $crawler = self::request('GET', "app.php/user/reset_password?u=$user_id&token=" . urlencode($token)); + + if ($expected) + { + $this->assertContainsLang($expected, $crawler->text()); + } + else + { + $form = $crawler->filter('input[type=submit]')->form(); + $values = array_merge($form->getValues(), [ + 'new_password' => self::TEST_USER, + 'new_password_confirm' => self::TEST_USER, + ]); + $crawler = self::submit($form, $values); + $this->assertContainsLang('PASSWORD_RESET', $crawler->text()); + } } public function test_login() { $this->add_lang('ucp'); $crawler = self::request('GET', 'ucp.php'); - $this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text()); + $this->assertStringContainsString($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text()); $form = $crawler->selectButton($this->lang('LOGIN'))->form(); - $crawler = self::submit($form, array('username' => 'reset-password-test-user', 'password' => 'reset-password-test-user')); - $this->assertNotContains($this->lang('LOGIN'), $crawler->filter('.navbar')->text()); - - $cookies = self::$cookieJar->all(); - - // The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie - foreach ($cookies as $cookie); - { - if (substr($cookie->getName(), -4) == '_sid') - { - $this->sid = $cookie->getValue(); - } - } + $crawler = self::submit($form, array('username' => self::TEST_USER, 'password' => self::TEST_USER)); + $this->assertStringNotContainsString($this->lang('LOGIN'), $crawler->filter('.navbar')->text()); $this->logout(); $crawler = self::request('GET', 'ucp.php'); - $this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text()); + $this->assertStringContainsString($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text()); $form = $crawler->selectButton($this->lang('LOGIN'))->form(); // Try logging in with the old password - $crawler = self::submit($form, array('username' => 'reset-password-test-user', 'password' => 'reset-password-test-userreset-password-test-user')); - $this->assertContains($this->lang('LOGIN_ERROR_PASSWORD', '', ''), $crawler->filter('html')->text()); + $crawler = self::submit($form, array('username' => self::TEST_USER, 'password' => 'reset-password-test-userreset-password-test-user')); + $this->assertStringContainsString($this->lang('LOGIN_ERROR_PASSWORD', '', ''), $crawler->filter('html')->text()); } /** * @depends test_login */ - public function test_acivateAfterDeactivate() + public function test_activateAfterDeactivate() { // User is active, actkey should not exist - $this->get_user_data(); + $this->get_user_data(self::TEST_USER); $this->assertEmpty($this->user_data['user_actkey']); $this->login(); @@ -131,7 +182,7 @@ public function test_acivateAfterDeactivate() $this->assertContainsLang('FIND_USERNAME', $crawler->filter('html')->text()); $form = $crawler->selectButton('Submit')->form(); - $crawler = self::submit($form, array('username' => 'reset-password-test-user')); + $crawler = self::submit($form, array('username' => self::TEST_USER)); // Deactivate account and go back to overview of current user $this->assertContainsLang('USER_TOOLS', $crawler->filter('html')->text()); @@ -143,7 +194,7 @@ public function test_acivateAfterDeactivate() $crawler = self::request('GET', preg_replace('#(.+)(adm/index.php.+)#', '$2', $link->getUri())); // Ensure again that actkey is empty after deactivation - $this->get_user_data(); + $this->get_user_data(self::TEST_USER); $this->assertEmpty($this->user_data['user_actkey']); // Force reactivation of account and check that act key is not empty anymore @@ -152,18 +203,57 @@ public function test_acivateAfterDeactivate() $crawler = self::submit($form, array('action' => 'reactivate')); $this->assertContainsLang('FORCE_REACTIVATION_SUCCESS', $crawler->filter('html')->text()); - $this->get_user_data(); + $this->get_user_data(self::TEST_USER); $this->assertNotEmpty($this->user_data['user_actkey']); + + // Logout and try resending activation email, account is deactivated though + $this->logout(); + $this->add_lang('ucp'); + + $crawler = self::request('GET', 'ucp.php?mode=resend_act'); + $this->assertContainsLang('UCP_RESEND', $crawler->filter('html')->text()); + $form = $crawler->filter('input[name=submit]')->selectButton('Submit')->form(); + $crawler = self::submit($form, [ + 'username' => self::TEST_USER, + 'email' => self::TEST_EMAIL, + ]); + $this->assertContainsLang('ACCOUNT_DEACTIVATED', $crawler->filter('html')->text()); + } + + /** + * @depends test_activateAfterDeactivate + */ + public function test_resendActivation() + { + // User is deactivated and should have actkey, actkey should not exist + $this->get_user_data(self::TEST_USER); + $this->assertNotEmpty($this->user_data['user_actkey']); + + // Change reason for inactivity + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_inactive_reason = ' . INACTIVE_REMIND . ' + WHERE user_id = ' . (int) $this->user_data['user_id']; + $this->db->sql_query($sql); + + $this->add_lang('ucp'); + + $crawler = self::request('GET', 'ucp.php?mode=resend_act'); + $this->assertContainsLang('UCP_RESEND', $crawler->filter('html')->text()); + $form = $crawler->filter('input[name=submit]')->selectButton('Submit')->form(); + $crawler = self::submit($form, [ + 'username' => self::TEST_USER, + 'email' => self::TEST_EMAIL, + ]); + $this->assertContainsLang('ACTIVATION_ALREADY_SENT', $crawler->filter('html')->text()); } - protected function get_user_data() + protected function get_user_data($username) { - $db = $this->get_db(); - $sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey, user_inactive_reason + $sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_actkey, user_inactive_reason, reset_token, reset_token_expiration FROM ' . USERS_TABLE . " - WHERE username = 'reset-password-test-user'"; - $result = $db->sql_query($sql); - $this->user_data = $db->sql_fetchrow($result); - $db->sql_freeresult($result); + WHERE username = '" . $this->db->sql_escape($username) . "'"; + $result = $this->db->sql_query($sql); + $this->user_data = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); } } diff --git a/tests/functional/viewforum_paging_test.php b/tests/functional/viewforum_paging_test.php index 4a574bebbb7..0a2cd38b3a2 100644 --- a/tests/functional/viewforum_paging_test.php +++ b/tests/functional/viewforum_paging_test.php @@ -127,8 +127,8 @@ public function test_viewforum_first_page() $this->assertEquals(2, $crawler->filter('div.pagination')->count()); $top_pagination = $crawler->filter('div.pagination')->eq(0); $this->assertEquals(3, $top_pagination->filter('li')->count(), 'Number of pagination items on page 1 does not match'); - $this->assertContains('1', $top_pagination->filter('li')->eq(0)->text()); - $this->assertContains('2', $top_pagination->filter('li')->eq(1)->text()); + $this->assertStringContainsString('1', $top_pagination->filter('li')->eq(0)->text()); + $this->assertStringContainsString('2', $top_pagination->filter('li')->eq(1)->text()); $this->assertContainsLang('NEXT', $top_pagination->filter('li')->eq(2)->text()); } @@ -157,14 +157,12 @@ public function test_viewforum_second_page() $top_pagination = $crawler->filter('div.pagination')->eq(0); $this->assertEquals(3, $top_pagination->filter('li')->count(), 'Number of pagination items on page 2 does not match'); $this->assertContainsLang('PREVIOUS', $top_pagination->filter('li')->eq(0)->text()); - $this->assertContains('1', $top_pagination->filter('li')->eq(1)->text()); - $this->assertContains('2', $top_pagination->filter('li')->eq(2)->text()); + $this->assertStringContainsString('1', $top_pagination->filter('li')->eq(1)->text()); + $this->assertStringContainsString('2', $top_pagination->filter('li')->eq(2)->text()); } protected function assert_forum_details($forum_id, $details, $additional_error_message = '') { - $this->db = $this->get_db(); - $sql = 'SELECT ' . implode(', ', array_keys($details)) . ' FROM phpbb_forums WHERE forum_id = ' . (int) $forum_id; @@ -203,8 +201,6 @@ protected function set_post_settings($settings) */ protected function load_ids($data) { - $this->db = $this->get_db(); - if (!empty($data['forums'])) { $sql = 'SELECT * diff --git a/tests/functional/viewonline_test.php b/tests/functional/viewonline_test.php new file mode 100644 index 00000000000..5887d36c5ba --- /dev/null +++ b/tests/functional/viewonline_test.php @@ -0,0 +1,124 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_viewonline_test extends phpbb_functional_test_case +{ + protected function get_forum_name_by_topic_id($topic_id) + { + // Forum info + $sql = 'SELECT f.forum_name + FROM ' . FORUMS_TABLE . ' f,' . TOPICS_TABLE . ' t + WHERE t.forum_id = f.forum_id + AND t.topic_id = ' . (int) $topic_id; + $result = $this->db->sql_query($sql); + $forum_name = $this->db->sql_fetchfield('forum_name'); + $this->db->sql_freeresult($result, 1800); // cache for 30 minutes + + return $forum_name; + } + + protected function get_forum_name_by_forum_id($forum_id) + { + // Forum info + $sql = 'SELECT forum_name + FROM ' . FORUMS_TABLE . ' + WHERE forum_id = ' . (int) $forum_id; + $result = $this->db->sql_query($sql); + $forum_name = $this->db->sql_fetchfield('forum_name'); + $this->db->sql_freeresult($result, 1800); // cache for 30 minutes + + return $forum_name; + } + + public function test_viewonline() + { + $this->create_user('viewonline-test-user1'); + + // Log in as test user + self::$client->restart(); + $this->login('viewonline-test-user1'); + $crawler = self::request('GET', 'posting.php?mode=reply&t=1&sid=' . $this->sid); + $this->assertContainsLang('POST_REPLY', $crawler->text()); + // Log in as another user + self::$client->restart(); + $this->login(); + // PHP goes faster than DBMS, make sure session data got written to the database + sleep(1); + $crawler = self::request('GET', 'app.php/members/online'); + // Make sure posting reply page is in the list + $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); + $this->assertStringContainsString($this->lang('REPLYING_MESSAGE', $this->get_forum_name_by_topic_id(1)), $crawler->text()); + + // Log in as test user + self::$client->restart(); + $this->login('viewonline-test-user1'); + $crawler = self::request('GET', 'posting.php?mode=post&f=2&sid=' . $this->sid); + $this->assertContainsLang('POST_TOPIC', $crawler->text()); + // Log in as another user + self::$client->restart(); + $this->login(); + // PHP goes faster than DBMS, make sure session data got written to the database + sleep(1); + $crawler = self::request('GET', 'app.php/members/online'); + // Make sure posting message page is in the list + $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); + $this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text()); + + // Log in as test user + self::$client->restart(); + $this->login('viewonline-test-user1'); + $test_post_data = $this->create_post(2, 1, 'Viewonline test post #1', 'Viewonline test post message'); + $crawler = self::request('GET', 'posting.php?mode=edit&p=' . $test_post_data['post_id'] . '&sid=' . $this->sid); + $this->assertContainsLang('EDIT_POST', $crawler->text()); + // Log in as another user + self::$client->restart(); + $this->login(); + // PHP goes faster than DBMS, make sure session data got written to the database + sleep(1); + $crawler = self::request('GET', 'app.php/members/online'); + // Make sure posting message page is in the list + $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); + $this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text()); + + // Log in as test user + self::$client->restart(); + $this->login('viewonline-test-user1'); + self::request('GET', 'viewtopic.php?t=1&sid=' . $this->sid); + // Log in as another user + self::$client->restart(); + $this->login(); + // PHP goes faster than DBMS, make sure session data got written to the database + sleep(1); + $crawler = self::request('GET', 'app.php/members/online'); + // Make sure reading topic page is in the list + $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); + $this->assertStringContainsString($this->lang('READING_TOPIC', $this->get_forum_name_by_topic_id(1)), $crawler->text()); + + // Log in as test user + self::$client->restart(); + $this->login('viewonline-test-user1'); + self::request('GET', 'viewforum.php?f=2&sid=' . $this->sid); + // Log in as another user + self::$client->restart(); + $this->login(); + // PHP goes faster than DBMS, make sure session data got written to the database + sleep(1); + $crawler = self::request('GET', 'app.php/members/online'); + // Make sure reading forum page is in the list + $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); + $this->assertStringContainsString($this->lang('READING_FORUM', $this->get_forum_name_by_forum_id(2)), $crawler->text()); + } +} diff --git a/tests/functional/visibility_disapprove_test.php b/tests/functional/visibility_disapprove_test.php index 6f6edba4227..95b371ac4fb 100644 --- a/tests/functional/visibility_disapprove_test.php +++ b/tests/functional/visibility_disapprove_test.php @@ -60,7 +60,7 @@ public function test_create_posts() $post = $this->create_topic($this->data['forums']['Disapprove Test #1'], 'Disapprove Test Topic #1', 'This is a test topic posted by the testing framework.'); $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - $this->assertContains('Disapprove Test Topic #1', $crawler->filter('html')->text()); + $this->assertStringContainsString('Disapprove Test Topic #1', $crawler->filter('html')->text()); $this->data['topics']['Disapprove Test Topic #1'] = (int) $post['topic_id']; $this->data['posts']['Disapprove Test Topic #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); @@ -83,7 +83,7 @@ public function test_create_posts() $post2 = $this->create_post($this->data['forums']['Disapprove Test #1'], $post['topic_id'], 'Re: Disapprove Test Topic #1-#2', 'This is a test post posted by the testing framework.', array(), 'POST_STORED_MOD'); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #1']}&sid={$this->sid}"); - $this->assertNotContains('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text()); + $this->assertStringNotContainsString('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text()); $this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array( 'forum_posts_approved' => 1, @@ -99,7 +99,7 @@ public function test_create_posts() $post = $this->create_topic($this->data['forums']['Disapprove Test #1'], 'Disapprove Test Topic #2', 'This is a test topic posted by the testing framework.', array(), 'POST_STORED_MOD'); $crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Disapprove Test #1']}&sid={$this->sid}"); - $this->assertNotContains('Disapprove Test Topic #2', $crawler->filter('html')->text()); + $this->assertStringNotContainsString('Disapprove Test Topic #2', $crawler->filter('html')->text()); $this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array( 'forum_posts_approved' => 1, @@ -155,8 +155,8 @@ public function test_disapprove_post() $this->add_lang('viewtopic'); $this->add_lang('mcp'); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #1']}&sid={$this->sid}"); - $this->assertContains('Disapprove Test Topic #1', $crawler->filter('html')->text()); - $this->assertContains('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text()); + $this->assertStringContainsString('Disapprove Test Topic #1', $crawler->filter('html')->text()); + $this->assertStringContainsString('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text()); $form = $crawler->selectButton($this->lang('DISAPPROVE'))->form(); $crawler = self::submit($form); @@ -176,11 +176,11 @@ public function test_disapprove_post() $link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link(); $link_url = $link->getUri(); - $this->assertContains('viewtopic.php?f=' . $this->data['forums']['Disapprove Test #1'] . '&t=' . $this->data['topics']['Disapprove Test Topic #1'], $link_url); + $this->assertStringContainsString('viewtopic.php?t=' . $this->data['topics']['Disapprove Test Topic #1'], $link_url); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #1']}&sid={$this->sid}"); - $this->assertContains('Disapprove Test Topic #1', $crawler->filter('html')->text()); - $this->assertNotContains('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text()); + $this->assertStringContainsString('Disapprove Test Topic #1', $crawler->filter('html')->text()); + $this->assertStringNotContainsString('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text()); } public function test_disapprove_topic() @@ -214,7 +214,7 @@ public function test_disapprove_topic() $this->add_lang('viewtopic'); $this->add_lang('mcp'); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #2']}&sid={$this->sid}"); - $this->assertContains('Disapprove Test Topic #2', $crawler->filter('html')->text()); + $this->assertStringContainsString('Disapprove Test Topic #2', $crawler->filter('html')->text()); $form = $crawler->selectButton($this->lang('DISAPPROVE'))->form(); $crawler = self::submit($form); @@ -234,17 +234,15 @@ public function test_disapprove_topic() $link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link(); $link_url = $link->getUri(); - $this->assertContains('viewforum.php?f=' . $this->data['forums']['Disapprove Test #1'], $link_url); + $this->assertStringContainsString('viewforum.php?f=' . $this->data['forums']['Disapprove Test #1'], $link_url); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #2']}&sid={$this->sid}", array(), false); self::assert_response_html(404); - $this->assertNotContains('Disapprove Test Topic #2', $crawler->filter('html')->text()); + $this->assertStringNotContainsString('Disapprove Test Topic #2', $crawler->filter('html')->text()); } protected function assert_forum_details($forum_id, $details, $additional_error_message = '') { - $this->db = $this->get_db(); - $sql = 'SELECT ' . implode(', ', array_keys($details)) . ' FROM phpbb_forums WHERE forum_id = ' . (int) $forum_id; @@ -255,23 +253,8 @@ protected function assert_forum_details($forum_id, $details, $additional_error_m $this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}"); } - protected function set_flood_interval($flood_interval) - { - $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post'); - - $form = $crawler->selectButton('Submit')->form(); - $values = $form->getValues(); - - $values["config[flood_interval]"] = $flood_interval; - $form->setValues($values); - $crawler = self::submit($form); - $this->assertGreaterThan(0, $crawler->filter('.successbox')->count()); - } - protected function load_ids($data) { - $this->db = $this->get_db(); - if (!empty($data['forums'])) { $sql = 'SELECT * diff --git a/tests/functional/visibility_reapprove_test.php b/tests/functional/visibility_reapprove_test.php index 5af2ddafa46..af0f553c0a4 100644 --- a/tests/functional/visibility_reapprove_test.php +++ b/tests/functional/visibility_reapprove_test.php @@ -60,7 +60,7 @@ public function test_create_posts() $post = $this->create_topic($this->data['forums']['Reapprove Test #1'], 'Reapprove Test Topic #1', 'This is a test topic posted by the testing framework.'); $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - $this->assertContains('Reapprove Test Topic #1', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Reapprove Test Topic #1', $crawler->filter('h2')->text()); $this->data['topics']['Reapprove Test Topic #1'] = (int) $post['topic_id']; $this->data['posts']['Reapprove Test Topic #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); @@ -83,7 +83,7 @@ public function test_create_posts() $post2 = $this->create_post($this->data['forums']['Reapprove Test #1'], $post['topic_id'], 'Re: Reapprove Test Topic #1-#2', 'This is a test post posted by the testing framework.', array(), 'POST_STORED_MOD'); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}"); - $this->assertNotContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text()); + $this->assertStringNotContainsString('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text()); $this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array( 'forum_posts_approved' => 1, @@ -99,7 +99,7 @@ public function test_create_posts() $post = $this->create_topic($this->data['forums']['Reapprove Test #1'], 'Reapprove Test Topic #2', 'This is a test topic posted by the testing framework.', array(), 'POST_STORED_MOD'); $crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Reapprove Test #1']}&sid={$this->sid}"); - $this->assertNotContains('Reapprove Test Topic #2', $crawler->filter('html')->text()); + $this->assertStringNotContainsString('Reapprove Test Topic #2', $crawler->filter('html')->text()); $this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array( 'forum_posts_approved' => 1, @@ -146,8 +146,8 @@ public function test_approve_post() $this->add_lang('viewtopic'); $this->add_lang('mcp'); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}"); - $this->assertContains('Reapprove Test Topic #1', $crawler->filter('h2')->text()); - $this->assertContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text()); + $this->assertStringContainsString('Reapprove Test Topic #1', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text()); $form = $crawler->selectButton($this->lang('APPROVE'))->form(); $crawler = self::submit($form); @@ -167,11 +167,11 @@ public function test_approve_post() $link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link(); $link_url = $link->getUri(); - $this->assertContains('viewtopic.php?f=' . $this->data['forums']['Reapprove Test #1'] . '&t=' . $this->data['topics']['Reapprove Test Topic #1'], $link_url); + $this->assertStringContainsString('viewtopic.php?t=' . $this->data['topics']['Reapprove Test Topic #1'], $link_url); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}"); - $this->assertContains('Reapprove Test Topic #1', $crawler->filter('h2')->text()); - $this->assertContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text()); + $this->assertStringContainsString('Reapprove Test Topic #1', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text()); } public function test_approve_topic() @@ -206,7 +206,7 @@ public function test_approve_topic() $this->add_lang('viewtopic'); $this->add_lang('mcp'); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #2']}&sid={$this->sid}"); - $this->assertContains('Reapprove Test Topic #2', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Reapprove Test Topic #2', $crawler->filter('h2')->text()); $form = $crawler->selectButton($this->lang('APPROVE'))->form(); $crawler = self::submit($form); @@ -226,10 +226,10 @@ public function test_approve_topic() $link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link(); $link_url = $link->getUri(); - $this->assertContains('viewtopic.php?f=' . $this->data['topic']['Reapprove Test Topic #2'], $link_url); + $this->assertStringContainsString('viewtopic.php?t=' . $this->data['topics']['Reapprove Test Topic #2'], $link_url); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #2']}&sid={$this->sid}"); - $this->assertContains('Reapprove Test Topic #2', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Reapprove Test Topic #2', $crawler->filter('h2')->text()); } public function test_edit_posts() @@ -264,7 +264,7 @@ public function test_edit_posts() $this->add_user_group('NEWLY_REGISTERED', array('reapprove_testuser')); // Test editing a post - $posting_url = "posting.php?mode=edit&f={$this->data['forums']['Reapprove Test #1']}&p={$this->data['posts']['Re: Reapprove Test Topic #1-#2']}&sid={$this->sid}"; + $posting_url = "posting.php?mode=edit&p={$this->data['posts']['Re: Reapprove Test Topic #1-#2']}&sid={$this->sid}"; $form_data = array( 'message' => 'Post edited by testing framework', 'subject' => 'Re: Reapprove Test Topic #1-#2', @@ -273,8 +273,8 @@ public function test_edit_posts() $this->submit_post($posting_url, 'EDIT_POST', $form_data, 'POST_EDITED_MOD'); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}"); - $this->assertNotContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text()); - $this->assertNotContains('Post edited by testing framework', $crawler->filter('#page-body')->text()); + $this->assertStringNotContainsString('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text()); + $this->assertStringNotContainsString('Post edited by testing framework', $crawler->filter('#page-body')->text()); $this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array( 'forum_posts_approved' => 2, @@ -287,7 +287,7 @@ public function test_edit_posts() ), 'after editing post'); // Test editing a topic - $posting_url = "posting.php?mode=edit&f={$this->data['forums']['Reapprove Test #1']}&p={$this->data['posts']['Reapprove Test Topic #2']}&sid={$this->sid}"; + $posting_url = "posting.php?mode=edit&p={$this->data['posts']['Reapprove Test Topic #2']}&sid={$this->sid}"; $form_data = array( 'message' => 'Post edited by testing framework', 'subject' => 'Reapprove Test Topic #2', @@ -297,8 +297,8 @@ public function test_edit_posts() $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #2']}&sid={$this->sid}", array(), false); self::assert_response_html(404); - $this->assertNotContains('Reapprove Test Topic #2', $crawler->filter('#page-body')->text()); - $this->assertNotContains('Post edited by testing framework', $crawler->filter('#page-body')->text()); + $this->assertStringNotContainsString('Reapprove Test Topic #2', $crawler->filter('#page-body')->text()); + $this->assertStringNotContainsString('Post edited by testing framework', $crawler->filter('#page-body')->text()); $this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array( 'forum_posts_approved' => 1, @@ -314,8 +314,8 @@ public function test_edit_posts() $this->login(); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}"); - $this->assertContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text()); - $this->assertContains('Post edited by testing framework', $crawler->filter('#page-body')->text()); + $this->assertStringContainsString('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text()); + $this->assertStringContainsString('Post edited by testing framework', $crawler->filter('#page-body')->text()); } public function test_approve_post_again() @@ -339,8 +339,6 @@ public function test_reset_flood_interval() protected function assert_forum_details($forum_id, $details, $additional_error_message = '') { - $this->db = $this->get_db(); - $sql = 'SELECT ' . implode(', ', array_keys($details)) . ' FROM phpbb_forums WHERE forum_id = ' . (int) $forum_id; @@ -351,23 +349,8 @@ protected function assert_forum_details($forum_id, $details, $additional_error_m $this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}"); } - protected function set_flood_interval($flood_interval) - { - $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post'); - - $form = $crawler->selectButton('Submit')->form(); - $values = $form->getValues(); - - $values["config[flood_interval]"] = $flood_interval; - $form->setValues($values); - $crawler = self::submit($form); - $this->assertGreaterThan(0, $crawler->filter('.successbox')->count()); - } - protected function load_ids($data) { - $this->db = $this->get_db(); - if (!empty($data['forums'])) { $sql = 'SELECT * diff --git a/tests/functional/visibility_softdelete_test.php b/tests/functional/visibility_softdelete_test.php index 6450c00c1e1..9e8d29ab620 100644 --- a/tests/functional/visibility_softdelete_test.php +++ b/tests/functional/visibility_softdelete_test.php @@ -81,7 +81,7 @@ public function test_create_post() $post = $this->create_topic($this->data['forums']['Soft Delete #1'], 'Soft Delete Topic #1', 'This is a test topic posted by the testing framework.'); $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); - $this->assertContains('Soft Delete Topic #1', $crawler->filter('html')->text()); + $this->assertStringContainsString('Soft Delete Topic #1', $crawler->filter('html')->text()); $this->data['topics']['Soft Delete Topic #1'] = (int) $post['topic_id']; $this->data['posts']['Soft Delete Topic #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); @@ -97,9 +97,9 @@ public function test_create_post() // Test creating a reply $post2 = $this->create_post($this->data['forums']['Soft Delete #1'], $post['topic_id'], 'Re: Soft Delete Topic #1-#2', 'This is a test post posted by the testing framework.'); - $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); + $crawler = self::request('GET', "viewtopic.php?p={$post2['post_id']}&sid={$this->sid}"); - $this->assertContains('Re: Soft Delete Topic #1-#2', $crawler->filter('html')->text()); + $this->assertStringContainsString('Re: Soft Delete Topic #1-#2', $crawler->filter('html')->text()); $this->data['posts']['Re: Soft Delete Topic #1-#2'] = (int) $post2['post_id']; $this->assert_forum_details($this->data['forums']['Soft Delete #1'], array( @@ -114,9 +114,9 @@ public function test_create_post() // Test creating another reply $post3 = $this->create_post($this->data['forums']['Soft Delete #1'], $post['topic_id'], 'Re: Soft Delete Topic #1-#3', 'This is another test post posted by the testing framework.'); - $crawler = self::request('GET', "viewtopic.php?t={$post3['topic_id']}&sid={$this->sid}"); + $crawler = self::request('GET', "viewtopic.php?p={$post3['post_id']}&sid={$this->sid}"); - $this->assertContains('Re: Soft Delete Topic #1-#3', $crawler->filter('html')->text()); + $this->assertStringContainsString('Re: Soft Delete Topic #1-#3', $crawler->filter('html')->text()); $this->data['posts']['Re: Soft Delete Topic #1-#3'] = (int) $post3['post_id']; $this->assert_forum_details($this->data['forums']['Soft Delete #1'], array( @@ -177,7 +177,7 @@ public function test_softdelete_post() ), 'after softdelete'); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}"); - $this->assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text()); + $this->assertStringContainsString($this->lang('POST_DISPLAY'), $crawler->text()); } public function test_softdelete_post_no_m_delete() @@ -227,7 +227,7 @@ public function test_softdelete_post_no_m_delete() ), 'after softdelete without m_delete'); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}"); - $this->assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text()); + $this->assertStringContainsString($this->lang('POST_DISPLAY'), $crawler->text()); } public function test_move_softdeleted_post() @@ -278,8 +278,8 @@ public function test_move_softdeleted_post() $this->assertContainsLang('TOPIC_MOVED_SUCCESS', $crawler->text()); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}"); - $this->assertContains('Soft Delete #2', $crawler->filter('.navlinks')->text()); - $this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Soft Delete #2', $crawler->filter('.navlinks')->text()); + $this->assertStringContainsString('Soft Delete Topic #1', $crawler->filter('h2')->text()); $this->assert_forum_details($this->data['forums']['Soft Delete #1'], array( 'forum_posts_approved' => 0, @@ -350,8 +350,8 @@ public function test_softdelete_topic() $this->assertContainsLang('TOPIC_DELETED_SUCCESS', $crawler->text()); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}"); - $this->assertContains('Soft Delete #2', $crawler->filter('.navlinks')->text()); - $this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Soft Delete #2', $crawler->filter('.navlinks')->text()); + $this->assertStringContainsString('Soft Delete Topic #1', $crawler->filter('h2')->text()); $this->assert_forum_details($this->data['forums']['Soft Delete #1'], array( 'forum_posts_approved' => 0, @@ -422,8 +422,8 @@ public function test_move_softdeleted_topic() $this->assertContainsLang('TOPIC_MOVED_SUCCESS', $crawler->text()); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}"); - $this->assertContains('Soft Delete #1', $crawler->filter('.navlinks')->text()); - $this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Soft Delete #1', $crawler->filter('.navlinks')->text()); + $this->assertStringContainsString('Soft Delete Topic #1', $crawler->filter('h2')->text()); $this->assert_forum_details($this->data['forums']['Soft Delete #1'], array( 'forum_posts_approved' => 0, @@ -496,8 +496,8 @@ public function test_restore_post() $this->assertContainsLang('POST_RESTORED_SUCCESS', $crawler->text()); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}"); - $this->assertContains('Soft Delete #1', $crawler->filter('.navlinks')->text()); - $this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Soft Delete #1', $crawler->filter('.navlinks')->text()); + $this->assertStringContainsString('Soft Delete Topic #1', $crawler->filter('h2')->text()); $this->assert_forum_details($this->data['forums']['Soft Delete #1'], array( 'forum_posts_approved' => 1, @@ -575,8 +575,8 @@ public function test_split_topic() $this->assertContainsLang('TOPIC_SPLIT_SUCCESS', $crawler->text()); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}"); - $this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text()); - $this->assertNotContains('Re: Soft Delete Topic #1-#2', $crawler->text()); + $this->assertStringContainsString('Soft Delete Topic #1', $crawler->filter('h2')->text()); + $this->assertStringNotContainsString('Re: Soft Delete Topic #1-#2', $crawler->text()); $this->assert_forum_details($this->data['forums']['Soft Delete #1'], array( 'forum_posts_approved' => 1, @@ -601,7 +601,16 @@ public function test_split_topic() // Assert new topic title is indexed as well $this->add_lang('search'); self::request('GET', "search.php?keywords=bang&sid={$this->sid}"); - $this->assertContains(sprintf($this->lang['FOUND_SEARCH_MATCHES'][1], 1), self::get_content()); + + // Sphinx search doesn't apply to unapproved or softdeleted posts + if (strpos($this->get_search_type(), 'fulltext_sphinx')) + { + $this->assertStringContainsString(sprintf($this->lang['FOUND_SEARCH_MATCHES'][2], 0), self::get_content()); + } + else + { + $this->assertStringContainsString(sprintf($this->lang['FOUND_SEARCH_MATCHES'][1], 1), self::get_content()); + } } public function test_move_topic_back() @@ -689,7 +698,7 @@ public function test_merge_topics() $this->assertContainsLang('POSTS_MERGED_SUCCESS', $crawler->text()); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}"); - $this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Soft Delete Topic #1', $crawler->filter('h2')->text()); $this->assertContainsLang('POST_DELETED_ACTION', $crawler->filter('body')->text()); $this->assertContainsLang('BOOKMARK_TOPIC_REMOVE', $crawler->filter('body')->text()); @@ -774,8 +783,6 @@ public function test_fork_topic() public function assert_forum_details($forum_id, $details, $additional_error_message = '') { - $this->db = $this->get_db(); - $sql = 'SELECT ' . implode(', ', array_keys($details)) . ' FROM phpbb_forums WHERE forum_id = ' . (int) $forum_id; @@ -788,8 +795,6 @@ public function assert_forum_details($forum_id, $details, $additional_error_mess public function load_ids($data) { - $this->db = $this->get_db(); - if (!empty($data['forums'])) { $sql = 'SELECT * diff --git a/tests/functional/visibility_unapproved_posts_test.php b/tests/functional/visibility_unapproved_posts_test.php new file mode 100644 index 00000000000..2d019379819 --- /dev/null +++ b/tests/functional/visibility_unapproved_posts_test.php @@ -0,0 +1,339 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_visibility_unapproved_posts_test extends phpbb_functional_test_case +{ + protected $data = []; + + public function test_setup_forums() + { + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}"); + $form = $crawler->selectButton('addforum')->form([ + 'forum_name' => 'Unapproved Posts Test #1', + ]); + $crawler = self::submit($form); + $form = $crawler->selectButton('update')->form([ + 'forum_perm_from' => 2, + ]); + $crawler = self::submit($form); + + // Set flood interval to 0 + $this->set_flood_interval(0); + } + + public function test_create_posts() + { + $this->login(); + $this->load_ids([ + 'forums' => [ + 'Unapproved Posts Test #1', + ], + ]); + + $this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [ + 'forum_posts_approved' => 0, + 'forum_posts_unapproved' => 0, + 'forum_posts_softdeleted' => 0, + 'forum_topics_approved' => 0, + 'forum_topics_unapproved' => 0, + 'forum_topics_softdeleted' => 0, + 'forum_last_post_id' => 0, + ], 'initial comparison'); + + // Test creating topic #1 + $post = $this->create_topic($this->data['forums']['Unapproved Posts Test #1'], 'Unapproved Posts Test Topic #1', 'This is a test topic posted by the testing framework.'); + $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); + + $this->assertStringContainsString('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text()); + $this->data['topics']['Unapproved Posts Test Topic #1'] = (int) $post['topic_id']; + $this->data['posts']['Unapproved Posts Test Topic #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); + + $this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [ + 'forum_posts_approved' => 1, + 'forum_posts_unapproved' => 0, + 'forum_posts_softdeleted' => 0, + 'forum_topics_approved' => 1, + 'forum_topics_unapproved' => 0, + 'forum_topics_softdeleted' => 0, + 'forum_last_post_id' => $this->data['posts']['Unapproved Posts Test Topic #1'], + ], 'after creating topic #1'); + + $this->logout(); + $this->create_user('unapproved_posts_test_user#1'); + $this->add_user_group('NEWLY_REGISTERED', ['unapproved_posts_test_user#1']); + $this->login('unapproved_posts_test_user#1'); + + // Test creating a reply + $post2 = $this->create_post($this->data['forums']['Unapproved Posts Test #1'], $post['topic_id'], 'Re: Unapproved Posts Test Topic #1-#2', 'This is a test post posted by the testing framework.', [], 'POST_STORED_MOD'); + + $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}"); + $this->assertStringNotContainsString('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text()); + + $this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [ + 'forum_posts_approved' => 1, + 'forum_posts_unapproved' => 1, + 'forum_posts_softdeleted' => 0, + 'forum_topics_approved' => 1, + 'forum_topics_unapproved' => 0, + 'forum_topics_softdeleted' => 0, + 'forum_last_post_id' => $this->data['posts']['Unapproved Posts Test Topic #1'], + ], 'after replying'); + + // Test creating topic #2 + $post = $this->create_topic($this->data['forums']['Unapproved Posts Test #1'], 'Unapproved Posts Test Topic #2', 'This is a test topic posted by the testing framework.', [], 'POST_STORED_MOD'); + $crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}"); + + $this->assertStringNotContainsString('Unapproved Posts Test Topic #2', $crawler->filter('html')->text()); + + $this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [ + 'forum_posts_approved' => 1, + 'forum_posts_unapproved' => 2, + 'forum_posts_softdeleted' => 0, + 'forum_topics_approved' => 1, + 'forum_topics_unapproved' => 1, + 'forum_topics_softdeleted' => 0, + 'forum_last_post_id' => $this->data['posts']['Unapproved Posts Test Topic #1'], + ], 'after creating topic #2'); + + $this->logout(); + } + + public function test_view_unapproved_post_disabled() + { + // user who created post + $this->login('unapproved_posts_test_user#1'); + $this->load_ids([ + 'forums' => [ + 'Unapproved Posts Test #1', + ], + 'topics' => [ + 'Unapproved Posts Test Topic #1', + 'Unapproved Posts Test Topic #2', + ], + 'posts' => [ + 'Unapproved Posts Test Topic #1', + 'Re: Unapproved Posts Test Topic #1-#2', + 'Unapproved Posts Test Topic #2', + ], + ]); + + $this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [ + 'forum_posts_approved' => 1, + 'forum_posts_unapproved' => 2, + 'forum_posts_softdeleted' => 0, + 'forum_topics_approved' => 1, + 'forum_topics_unapproved' => 1, + 'forum_topics_softdeleted' => 0, + 'forum_last_post_id' => $this->data['posts']['Unapproved Posts Test Topic #1'], + ], 'before approving post'); + + $this->add_lang('posting'); + $this->add_lang('viewtopic'); + $this->add_lang('mcp'); + + // should be able to see topic 1 but not unapproved post + $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}"); + $this->assertStringContainsString('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text()); + $this->assertStringNotContainsString('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text()); + $this->assertStringNotContainsString('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text()); + + // should not be able to see topic 2 + $crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}"); + $this->assertStringNotContainsString('Unapproved Posts Test Topic #2', $crawler->filter('html')->text()); + $this->logout(); + + // another user + $this->create_user('unapproved_posts_test_user#2'); + $this->login('unapproved_posts_test_user#2'); + + $this->add_lang(['posting', 'viewtopic', 'mcp']); + + // should be able to see topic 1 but not unapproved post + $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}"); + $this->assertStringContainsString('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text()); + $this->assertStringNotContainsString('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text()); + $this->assertStringNotContainsString('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text()); + + // should not be able to see topic 2 + $crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}"); + $this->assertStringNotContainsString('Unapproved Posts Test Topic #2', $crawler->filter('html')->text()); + } + + public function test_view_unapproved_post_enabled() + { + $this->config_display_unapproved_posts_state(true); + + // user who created post + $this->login('unapproved_posts_test_user#1'); + $this->load_ids([ + 'forums' => [ + 'Unapproved Posts Test #1', + ], + 'topics' => [ + 'Unapproved Posts Test Topic #1', + 'Unapproved Posts Test Topic #2', + ], + 'posts' => [ + 'Unapproved Posts Test Topic #1', + 'Re: Unapproved Posts Test Topic #1-#2', + 'Unapproved Posts Test Topic #2', + ], + ]); + + $this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [ + 'forum_posts_approved' => 1, + 'forum_posts_unapproved' => 2, + 'forum_posts_softdeleted' => 0, + 'forum_topics_approved' => 1, + 'forum_topics_unapproved' => 1, + 'forum_topics_softdeleted' => 0, + 'forum_last_post_id' => $this->data['posts']['Unapproved Posts Test Topic #1'], + ], 'before approving post'); + + $this->add_lang('posting'); + $this->add_lang('viewtopic'); + $this->add_lang('mcp'); + + // should be able to see topic 1 and unapproved post + $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}"); + $this->assertStringContainsString('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text()); + $this->assertStringContainsString('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text()); + $this->assertStringContainsString('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text()); + + // should be able to see topic 2 + $crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}"); + $this->assertStringContainsString('Unapproved Posts Test Topic #2', $crawler->filter('html')->text()); + + // should be able to see post in topic 2 + $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #2']}&sid={$this->sid}"); + $this->assertStringContainsString('Unapproved Posts Test Topic #2', $crawler->filter('#page-body')->text()); + $this->assertStringContainsString('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text()); + $this->logout(); + + // another user + $this->login('unapproved_posts_test_user#2'); + + $this->add_lang('posting'); + $this->add_lang('viewtopic'); + $this->add_lang('mcp'); + + // should be able to see topic 1 but not unapproved post + $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}"); + $this->assertStringContainsString('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text()); + $this->assertStringNotContainsString('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text()); + $this->assertStringNotContainsString('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text()); + + // should not be able to see topic 2 + $crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}"); + $this->assertStringNotContainsString('Unapproved Posts Test Topic #2', $crawler->filter('html')->text()); + $this->logout(); + } + + public function test_reset_flood_interval() + { + $this->login(); + $this->admin_login(); + + // Set flood interval back to 15 + $this->set_flood_interval(15); + } + + protected function assert_forum_details($forum_id, $details, $additional_error_message = '') + { + $sql = 'SELECT ' . implode(', ', array_keys($details)) . ' + FROM phpbb_forums + WHERE forum_id = ' . (int) $forum_id; + $result = $this->db->sql_query($sql); + $data = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}"); + } + + protected function load_ids($data) + { + if (!empty($data['forums'])) + { + $sql = 'SELECT forum_id, forum_name + FROM phpbb_forums + WHERE ' . $this->db->sql_in_set('forum_name', $data['forums']); + $result = $this->db->sql_query($sql); + while ($row = $this->db->sql_fetchrow($result)) + { + if (in_array($row['forum_name'], $data['forums'])) + { + $this->data['forums'][$row['forum_name']] = (int) $row['forum_id']; + } + } + $this->db->sql_freeresult($result); + } + + if (!empty($data['topics'])) + { + $sql = 'SELECT * + FROM phpbb_topics + WHERE ' . $this->db->sql_in_set('topic_title', $data['topics']); + $result = $this->db->sql_query($sql); + while ($row = $this->db->sql_fetchrow($result)) + { + if (in_array($row['topic_title'], $data['topics'])) + { + $this->data['topics'][$row['topic_title']] = (int) $row['topic_id']; + } + } + $this->db->sql_freeresult($result); + } + + if (!empty($data['posts'])) + { + $sql = 'SELECT * + FROM phpbb_posts + WHERE ' . $this->db->sql_in_set('post_subject', $data['posts']); + $result = $this->db->sql_query($sql); + while ($row = $this->db->sql_fetchrow($result)) + { + if (in_array($row['post_subject'], $data['posts'])) + { + $this->data['posts'][$row['post_subject']] = (int) $row['post_id']; + } + } + $this->db->sql_freeresult($result); + } + } + + protected function config_display_unapproved_posts_state($state) + { + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=features"); + + $form = $crawler->selectButton('Submit')->form(); + $values = $form->getValues(); + + // Enable display of unapproved posts to posters + $values['config[display_unapproved_posts]'] = $state; + + $form->setValues($values); + + $crawler = self::submit($form); + self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); + $this->logout(); + } +} diff --git a/tests/functional/visit_installer_test.php b/tests/functional/visit_installer_test.php index b4a75c0b51a..742007fa5f5 100644 --- a/tests/functional/visit_installer_test.php +++ b/tests/functional/visit_installer_test.php @@ -19,12 +19,12 @@ class phpbb_functional_visit_installer_test extends phpbb_functional_test_case public function test_visit_installer() { self::request('GET', 'install/', [], false); - $this->assertContains('', $this->get_content()); + $this->assertStringContainsString('', $this->get_content()); self::request('GET', 'install/index.html', [], false); - $this->assertContains('', $this->get_content()); + $this->assertStringContainsString('', $this->get_content()); self::request('GET', 'install/app.php'); - $this->assertContains('installation system', $this->get_content()); + $this->assertStringContainsString('installation system', $this->get_content()); } } diff --git a/tests/functions/build_hidden_fields_for_query_params_test.php b/tests/functions/build_hidden_fields_for_query_params_test.php deleted file mode 100644 index aee7a569d4e..00000000000 --- a/tests/functions/build_hidden_fields_for_query_params_test.php +++ /dev/null @@ -1,73 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -class phpbb_build_hidden_fields_for_query_params_test extends phpbb_test_case -{ - public function build_hidden_fields_for_query_params_test_data() - { - return array( - // get - // post - // exclude - // expected - array( - array('foo' => 'bar'), - array(), - array(), - "", - ), - array( - array('foo' => 'bar', 'a' => 'b'), - array(), - array(), - "", - ), - array( - array('a' => 'quote"', 'b' => ''), - array(), - array(), - "", - ), - array( - array('a' => "quotes'\""), - array(), - array(), - "", - ), - array( - array('foo' => 'bar', 'a' => 'b'), - array('a' => 'c'), - array(), - "", - ), - // strict equality check - array( - array('foo' => 'bar', 'a' => '0'), - array('a' => ''), - array(), - "", - ), - ); - } - - /** - * @dataProvider build_hidden_fields_for_query_params_test_data - */ - public function test_build_hidden_fields_for_query_params($get, $post, $exclude, $expected) - { - $request = new phpbb_mock_request($get, $post); - $result = phpbb_build_hidden_fields_for_query_params($request, $exclude); - - $this->assertEquals($expected, $result); - } -} diff --git a/tests/functions/build_url_test.php b/tests/functions/build_url_test.php index 95b20050d73..da38cae6353 100644 --- a/tests/functions/build_url_test.php +++ b/tests/functions/build_url_test.php @@ -13,15 +13,18 @@ class phpbb_build_url_test extends phpbb_test_case { - protected function setUp() + protected function setUp(): void { - global $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpbb_path_helper; + global $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpbb_path_helper, $config; parent::setUp(); $phpbb_container = new phpbb_mock_container_builder(); $user = new phpbb_mock_user(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $config = new \phpbb\config\config([ + 'enable_mod_rewrite' => 0, + ]); $phpbb_path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( @@ -33,43 +36,43 @@ protected function setUp() ); $phpbb_container->set('path_helper', $phpbb_path_helper); } - public function build_url_test_data() + public static function build_url_test_data() { return array( array( 'index.php', false, - 'phpBB/index.php?', + 'phpBB/index.php', ), array( 'index.php', 't', - 'phpBB/index.php?', + 'phpBB/index.php', ), array( - 'viewtopic.php?t=5&f=4', + 'viewtopic.php?t=5', false, - 'phpBB/viewtopic.php?t=5&f=4', + 'phpBB/viewtopic.php?t=5', ), array( - 'viewtopic.php?f=2&style=1&t=6', + 'viewtopic.php?style=1&t=6', 'f', 'phpBB/viewtopic.php?style=1&t=6', ), array( - 'viewtopic.php?f=2&style=1&t=6', + 'viewtopic.php?style=1&t=6', array('f', 'style', 't'), - 'phpBB/viewtopic.php?', + 'phpBB/viewtopic.php', ), array( - 'http://test.phpbb.com/viewtopic.php?f=2&style=1&t=6', + 'http://test.phpbb.com/viewtopic.php?style=1&t=6', array('f', 'style', 't'), - 'http://test.phpbb.com/viewtopic.php?', + 'http://test.phpbb.com/viewtopic.php', ), array( - 'posting.php?f=2&mode=delete&p=20%22%3Cscript%3Ealert%281%29%3B%3C%2Fscript%3E', + 'posting.php?mode=delete&p=20%22%3Cscript%3Ealert%281%29%3B%3C%2Fscript%3E', false, - 'phpBB/posting.php?f=2&mode=delete&p=20%22%3Cscript%3Ealert%281%29%3B%3C%2Fscript%3E', + 'phpBB/posting.php?mode=delete&p=20%22%3Cscript%3Ealert%281%29%3B%3C%2Fscript%3E', ) ); } @@ -79,8 +82,9 @@ public function build_url_test_data() */ public function test_build_url($page, $strip_vars, $expected) { - global $user, $phpbb_root_path; + global $config, $user, $phpbb_path_helper, $phpbb_dispatcher, $_SID; + $_SID = ''; $user->page['page'] = $page; $output = build_url($strip_vars); diff --git a/tests/functions/convert_30_dbms_to_31_test.php b/tests/functions/convert_30_dbms_to_31_test.php index 456eb644610..f3fbda79d90 100644 --- a/tests/functions/convert_30_dbms_to_31_test.php +++ b/tests/functions/convert_30_dbms_to_31_test.php @@ -13,12 +13,11 @@ class phpbb_convert_30_dbms_to_31_test extends phpbb_test_case { - public function convert_30_dbms_to_31_data() + public static function convert_30_dbms_to_31_data() { return array( array('mssql_odbc'), array('mssqlnative'), - array('mysql'), array('mysqli'), array('oracle'), array('postgres'), @@ -31,9 +30,7 @@ public function convert_30_dbms_to_31_data() public function test_convert_30_dbms_to_31($input) { $expected = "phpbb\\db\\driver\\$input"; - - $config_php_file = new \phpbb\config_php_file('', ''); - $output = $config_php_file->convert_30_dbms_to_31($input); + $output = \phpbb\config_php_file::convert_30_dbms_to_31($input); $this->assertEquals($expected, $output); } diff --git a/tests/functions/fixtures/banned_users.xml b/tests/functions/fixtures/banned_users.xml index cec3f4e51fc..082f210ca33 100644 --- a/tests/functions/fixtures/banned_users.xml +++ b/tests/functions/fixtures/banned_users.xml @@ -1,38 +1,69 @@ - +
      ban_userid - ban_exclude + ban_modeban_end - - 1 - 1 - 0 - 2 - 0 + user 0 3 - 0 + user 0 4 - 0 + user 2 5 - 0 - 999999999999999999999 + user + 2147485547 6 - 0 + user + 3 + +
      + + user_id + username_clean + user_permissions + user_sig + + 2 + admin + + + + 3 + user3 + + + + + 4 + user4 + + + + + 5 + user5 + + + + + 6 + user6 + +
      diff --git a/tests/functions/fixtures/user_delete.xml b/tests/functions/fixtures/user_delete.xml index 4c4479d29bd..65df5616be5 100644 --- a/tests/functions/fixtures/user_delete.xml +++ b/tests/functions/fixtures/user_delete.xml @@ -40,7 +40,7 @@ 2 897a897b797c8789997d7979879 auth.provider.oauth.service.google - {"accessToken":"ya29.YPHwCWVkrvwu1kgbYKiDNYaQ451ZuHy9OEQAGVME8if-WBzR-v7a9ftxbx41kaL)5VLEXB-6qJEvri","endOfLife":1429959670,"extraParams":{"token_type":"Bearer","id_token":"eyJhbGciOiJSUzI1NiIsImupZCI6IjE0YuRjNzc2MDQwYjUyNDZmNTI5OWFkZDVlMmQ1NWNOPTdjMDdlZTAifQ.eyJpc3MiOiJhY2NvdW90cy5nb78nbGUuY29tIiwic3ViIjoiMTExMDMwNwerNjM4MTM5NTQwMTM1IiwiYXpwIjoiOTk3MzUwMTY0NzE0LWhwOXJrYjZpcjM4MW80YjV1NjRpaGtmM29zMnRvbWxhLmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29tIiwiZW1haWwiOiJtYXJjLmFsZXhhbmRlci4zN0BnbWFpbC5jb20iLCJhdF9oYXNoIjoiWHk2b1JabnVZUWRfRTZDeDV0RkItdyIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJhdWQiOiI5OTczNTAxNjQ3MTQtaHA5cmtiNmlyMzgxbzRiNXU2NGloa2Yzb3MydG9tbGEuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJpYXQiOjE0Mjk5NTYwNzEsImV4cCI6MTQyOTk1OTY3MX0.C5gfSzjqwlRRvVMuTP6jfWIuEHMXn55oYHsSA3eh97n2BZL0TZHhUm4K206Fgucd6ufAphan4l0J7y6tMAHLZPr-kk6KDINxWnPG-up99reblGutay0lRYjMCcrhJAOql8EI1bi84GyliZFYHL67pE0ZtSf-CMb1CeH18TFe-Fk"},"refreshToken":null,"token_class":"OAuth\\\\OAuth2\\\\Token\\\\StdOAuth2Token"} + {"accessToken":"ya29.YPHwCWVkrvwu1kgbYKiDNYaQ451ZuHy9OEQAGVME8if-WBzR-v7a9ftxbx41kaL)5VLEXB-6qJEvri","endOfLife":1429959670,"extraParams":{"token_type":"Bearer","id_token":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTUxNjIzOTAyMn0.KMUFsIDTnFmyG3nMiGM6H9FNFUROf3wh7SmqJp-QV30"},"refreshToken":null,"token_class":"OAuth\\\\OAuth2\\\\Token\\\\StdOAuth2Token"} diff --git a/tests/functions/fixtures/validate_email.xml b/tests/functions/fixtures/validate_email.xml index eb4fd90217f..4fa9bd03d07 100644 --- a/tests/functions/fixtures/validate_email.xml +++ b/tests/functions/fixtures/validate_email.xml @@ -1,19 +1,46 @@ + + ban_id + ban_mode + ban_item + ban_start + ban_end + ban_reason + ban_reason_display + + 1 + email + banned@example.com + 0 + 0 + + + + + 2 + email + banned2@example.com + 0 + 0 + just because + just because + +
      user_idusernameusername_cleanuser_permissionsuser_sig - user_email_hash + user_email 1 admin admin - 143317126117 + admin@example.com
      diff --git a/tests/functions/generate_string_list.php b/tests/functions/generate_string_list.php index 6eddb1395e1..3b531398ad4 100644 --- a/tests/functions/generate_string_list.php +++ b/tests/functions/generate_string_list.php @@ -15,7 +15,7 @@ class phpbb_generate_string_list_test extends phpbb_test_case { public $user; - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -29,7 +29,7 @@ public function setUp() $this->user->add_lang('common'); } - public function generate_string_list_data() + public static function generate_string_list_data() { return array( array( diff --git a/tests/functions/get_formatted_filesize_test.php b/tests/functions/get_formatted_filesize_test.php index 290515b64f4..d2a94453f65 100644 --- a/tests/functions/get_formatted_filesize_test.php +++ b/tests/functions/get_formatted_filesize_test.php @@ -13,7 +13,7 @@ class phpbb_get_formatted_filesize_test extends phpbb_test_case { - public function get_formatted_filesize_test_data() + public static function get_formatted_filesize_test_data() { return array( // exact powers of 2 diff --git a/tests/functions/get_preg_expression_test.php b/tests/functions/get_preg_expression_test.php index b8254b03ea5..5b98d706462 100644 --- a/tests/functions/get_preg_expression_test.php +++ b/tests/functions/get_preg_expression_test.php @@ -13,7 +13,7 @@ class phpbb_functions_get_preg_expression_test extends phpbb_test_case { - public function data_path_remove_dot_trailing_slash() + public static function data_path_remove_dot_trailing_slash() { return array( array('./../', '$2', '/..'), diff --git a/tests/functions/get_remote_file_test.php b/tests/functions/get_remote_file_test.php deleted file mode 100644 index 75e5a6dc61a..00000000000 --- a/tests/functions/get_remote_file_test.php +++ /dev/null @@ -1,80 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -/** -* @group slow -*/ -class phpbb_functions_get_remote_file extends phpbb_test_case -{ - public function test_version_phpbb_com() - { - global $phpbb_container; - $phpbb_container = new phpbb_mock_container_builder(); - $phpbb_container->set('file_downloader', new \phpbb\file_downloader()); - - $hostname = 'version.phpbb.com'; - - if (!phpbb_checkdnsrr($hostname, 'A')) - { - $this->markTestSkipped(sprintf( - 'Could not find a DNS record for hostname %s. ' . - 'Assuming network is down.', - $hostname - )); - } - - $errstr = $errno = null; - $file = get_remote_file($hostname, '/phpbb', '30x.txt', $errstr, $errno); - - $this->assertNotEquals( - 0, - strlen($file), - 'Failed asserting that the response is not empty.' - ); - - $this->assertSame( - '', - $errstr, - 'Failed asserting that the error string is empty.' - ); - - $this->assertSame( - 0, - $errno, - 'Failed asserting that the error number is 0 (i.e. no error occurred).' - ); - - $lines = explode("\n", $file); - - $this->assertGreaterThanOrEqual( - 2, - count($lines), - 'Failed asserting that the version file has at least two lines.' - ); - - $this->assertStringStartsWith( - '3.', - $lines[0], - "Failed asserting that the first line of the version file starts with '3.'" - ); - - $this->assertNotSame( - false, - filter_var($lines[1], FILTER_VALIDATE_URL), - 'Failed asserting that the second line of the version file is a valid URL.' - ); - - $this->assertContains('http', $lines[1]); - $this->assertContains('phpbb.com', $lines[1], '', true); - } -} diff --git a/tests/functions/language_select_test.php b/tests/functions/language_select_test.php index 2d1296d72fd..5445866fd89 100644 --- a/tests/functions/language_select_test.php +++ b/tests/functions/language_select_test.php @@ -15,17 +15,73 @@ class phpbb_functions_language_select_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/language_select.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/language_select.xml'); } - static public function language_select_data() + public static function language_select_data() { - return array( - array('', ''), - array('en', ''), - array('cs', ''), - array('de', ''), - ); + return [ + [ + '', + [ + [ + 'selected' => false, + 'value' => 'cs', + 'label' => 'Čeština', + ], + [ + 'selected' => false, + 'value' => 'en', + 'label' => 'English', + ], + ] + ], + [ + 'en', + [ + [ + 'selected' => false, + 'value' => 'cs', + 'label' => 'Čeština', + ], + [ + 'selected' => true, + 'value' => 'en', + 'label' => 'English', + ], + ] + ], + [ + 'cs', + [ + [ + 'selected' => true, + 'value' => 'cs', + 'label' => 'Čeština', + ], + [ + 'selected' => false, + 'value' => 'en', + 'label' => 'English', + ], + ] + ], + [ + 'de', + [ + [ + 'selected' => false, + 'value' => 'cs', + 'label' => 'Čeština', + ], + [ + 'selected' => false, + 'value' => 'en', + 'label' => 'English', + ], + ] + ], + ]; } /** @@ -36,6 +92,8 @@ public function test_language_select($default, $expected) global $db; $db = $this->new_dbal(); - $this->assertEquals($expected, language_select($default)); + $lang_options = phpbb_language_select($db, $default); + + $this->assertEquals($expected, $lang_options); } } diff --git a/tests/functions/make_clickable_email_test.php b/tests/functions/make_clickable_email_test.php index d481bde80d4..5b19f66e8e3 100644 --- a/tests/functions/make_clickable_email_test.php +++ b/tests/functions/make_clickable_email_test.php @@ -13,11 +13,15 @@ class phpbb_functions_make_clickable_email_test extends phpbb_test_case { - protected function setUp() + protected function setUp(): void { parent::setUp(); - global $config, $user, $request, $symfony_request; + global $user, $request, $symfony_request, $config; + $config = new \phpbb\config\config([ + 'force_server_vars' => 0, + 'server_name' => 'testhost', + ]); $user = new phpbb_mock_user(); $request = new phpbb_mock_request(); $symfony_request = new \phpbb\symfony_request($request); @@ -26,7 +30,7 @@ protected function setUp() /** * 'e' tag for email addresses html **/ - public function data_test_make_clickable_email_positive() + public static function data_test_make_clickable_email_positive() { return array( array( @@ -147,7 +151,7 @@ public function data_test_make_clickable_email_positive() ); } - public function data_test_make_clickable_email_negative() + public static function data_test_make_clickable_email_negative() { return array( array('foo.example.com'), // @ is missing @@ -206,6 +210,7 @@ public function data_test_make_clickable_email_negative() */ public function test_email_matching_positive($email, $expected) { + global $config, $user, $request, $symfony_request; $this->assertSame($expected, make_clickable($email)); } @@ -214,6 +219,7 @@ public function test_email_matching_positive($email, $expected) */ public function test_email_matching_negative($email, $expected = null) { + global $config, $user, $request, $symfony_request; $expected = ($expected) ?: $email; $this->assertSame($expected, make_clickable($email)); } diff --git a/tests/functions/make_clickable_test.php b/tests/functions/make_clickable_test.php index a6af12b624c..443b78b3a4d 100644 --- a/tests/functions/make_clickable_test.php +++ b/tests/functions/make_clickable_test.php @@ -25,140 +25,186 @@ class phpbb_functions_make_clickable_test extends phpbb_test_case * "postlink" for the rest of URLs * empty for email addresses **/ - public function data_test_make_clickable_url_positive() + public static function data_test_make_clickable_url_positive() { - return array( - array( + return [ + [ 'http://www.phpbb.com/community/', 'http://www.phpbb.com/community/' - ), - array( + ], + [ 'http://www.phpbb.com/path/file.ext#section', 'http://www.phpbb.com/path/file.ext#section' - ), - array( + ], + [ 'ftp://ftp.phpbb.com/', 'ftp://ftp.phpbb.com/' - ), - array( + ], + [ 'sip://bantu@phpbb.com', 'sip://bantu@phpbb.com' - ), - array( + ], + [ 'www.phpbb.com/community/', 'www.phpbb.com/community/' - ), - array( + ], + [ 'http://testhost/viewtopic.php?t=1', 'viewtopic.php?t=1' - ), - array( + ], + [ 'javascript://testhost/viewtopic.php?t=1', 'javascript://testhost/viewtopic.php?t=1' - ), - array( + ], + [ "java\nscri\npt://testhost/viewtopic.php?t=1", "java\nscri\npt://testhost/viewtopic.php?t=1" - ), - array( + ], + [ 'email@domain.com', 'email@domain.com' - ), + ], // Test appending punctuation mark to the URL - array( + [ 'http://testhost/viewtopic.php?t=1!', 'viewtopic.php?t=1!' - ), - array( + ], + [ 'www.phpbb.com/community/?', 'www.phpbb.com/community/?' - ), + ], // Test shortened text for URL > 55 characters long // URL text should be turned into: first 39 chars + ' ... ' + last 10 chars - array( + [ 'http://www.phpbb.com/community/path/to/long/url/file.ext#section', 'http://www.phpbb.com/community/path/to/ ... xt#section' - ), - ); + ], + ]; } - public function data_test_make_clickable_url_idn() + public static function data_test_make_clickable_url_idn() { - return array( - array( + return [ + [ 'http://www.täst.de/community/', 'http://www.täst.de/community/' - ), - array( + ], + [ 'http://www.täst.de/path/file.ext#section', 'http://www.täst.de/path/file.ext#section' - ), - array( + ], + [ 'ftp://ftp.täst.de/', 'ftp://ftp.täst.de/' - ), - array( + ], + [ 'javascript://täst.de/', 'javascript://täst.de/' - ), - array( + ], + [ 'sip://bantu@täst.de', 'sip://bantu@täst.de' - ), - array( + ], + [ 'www.täst.de/community/', 'www.täst.de/community/' - ), + ], // Test appending punctuation mark to the URL - array( + [ 'http://домен.рф/viewtopic.php?t=1!', 'http://домен.рф/viewtopic.php?t=1!' - ), - array( + ], + [ 'www.домен.рф/сообщество/?', 'www.домен.рф/сообщество/?' - ), + ], // Test shortened text for URL > 55 characters long // URL text should be turned into: first 39 chars + ' ... ' + last 10 chars - array( + [ 'http://www.домен.рф/сообщество/путь/по/длинной/ссылке/file.ext#section', 'http://www.домен.рф/сообщество/путь/по/ ... xt#section' - ), + ], // IDN with invalid characters shouldn't be parsed correctly (only 'valid' part) - array( + [ 'http://www.täst╫.de', 'http://www.täst╫.de' - ), + ], // IDN in emails is unsupported yet - array('почта@домен.рф', 'почта@домен.рф'), - ); + ['почта@домен.рф', 'почта@домен.рф'], + ]; } - public function data_test_make_clickable_local_url_idn() + public static function data_test_make_clickable_local_url_idn() { - return array( - array( + return [ + [ 'http://www.домен.рф/viewtopic.php?t=1', 'viewtopic.php?t=1' - ), + ], // Test appending punctuation mark to the URL - array( + [ 'http://www.домен.рф/viewtopic.php?t=1!', 'viewtopic.php?t=1!' - ), - array( + ], + [ 'http://www.домен.рф/сообщество/?', 'сообщество/?' - ), - ); + ], + ]; } - protected function setUp() + public static function data_test_make_clickable_custom_classes() + { + return [ + [ + 'http://www.домен.рф/viewtopic.php?t=1', + 'http://www.домен.рф', + 'class1', + 'viewtopic.php?t=1' + ], + [ + 'http://www.домен.рф/viewtopic.php?t=1!', + false, + 'class2', + 'http://www.домен.рф/viewtopic.php?t=1!' + ], + [ + 'http://www.домен.рф/сообщество/?', + false, + 'class3', + 'http://www.домен.рф/сообщество/?' + ], + [ + 'www.phpbb.com/community/', + false, + 'class2', + 'www.phpbb.com/community/' + ], + [ + 'http://testhost/viewtopic.php?t=1', + false, + 'class1', + 'viewtopic.php?t=1' + ], + [ + 'email@domain.com', + false, + 'class-email', + 'email@domain.com' + ], + ]; + } + + protected function setUp(): void { parent::setUp(); - global $config, $user, $request, $symfony_request; + global $user, $request, $symfony_request, $config; + $config = new \phpbb\config\config([ + 'force_server_vars' => 0, + 'server_name' => 'testhost', + ]); $user = new phpbb_mock_user(); $request = new phpbb_mock_request(); $symfony_request = new \phpbb\symfony_request($request); @@ -166,25 +212,29 @@ protected function setUp() /** * @dataProvider data_test_make_clickable_url_positive + * @dataProvider data_test_make_clickable_url_idn */ public function test_urls_matching_positive($url, $expected) { + global $user, $request, $symfony_request, $config; $this->assertSame($expected, make_clickable($url)); } /** - * @dataProvider data_test_make_clickable_url_idn + * @dataProvider data_test_make_clickable_local_url_idn */ - public function test_urls_matching_idn($url, $expected) + public function test_local_urls_matching_idn($url, $expected) { - $this->assertSame($expected, make_clickable($url)); + global $user, $request, $symfony_request, $config; + $this->assertSame($expected, make_clickable($url, "http://www.домен.рф")); } /** - * @dataProvider data_test_make_clickable_local_url_idn + * @dataProvider data_test_make_clickable_custom_classes */ - public function test_local_urls_matching_idn($url, $expected) + public function test_make_clickable_custom_classes($url, $server_url, $class, $expected) { - $this->assertSame($expected, make_clickable($url, "http://www.домен.рф")); + global $user, $request, $symfony_request, $config; + $this->assertSame($expected, make_clickable($url, $server_url, $class)); } } diff --git a/tests/functions/obtain_online_test.php b/tests/functions/obtain_online_test.php index 77b10798024..2beb14d8261 100644 --- a/tests/functions/obtain_online_test.php +++ b/tests/functions/obtain_online_test.php @@ -13,12 +13,14 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case { + protected $db; + public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/obtain_online.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/obtain_online.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -31,7 +33,7 @@ protected function setUp() ); } - static public function obtain_guest_count_data() + public static function obtain_guest_count_data() { return array( array(0, 2), @@ -51,7 +53,7 @@ public function test_obtain_guest_count($forum_id, $expected) $this->assertEquals($expected, obtain_guest_count($forum_id)); } - static public function obtain_users_online_data() + public static function obtain_users_online_data() { return array( array(0, false, array( @@ -121,7 +123,7 @@ public function test_obtain_users_online($forum_id, $display_guests, $expected) $this->assertEquals($expected, obtain_users_online($forum_id)); } - static public function obtain_users_online_string_data() + public static function obtain_users_online_string_data() { return array( array(0, false, array( @@ -160,7 +162,8 @@ public function test_obtain_users_online_string($forum_id, $display_guests, $exp global $config, $user, $auth, $phpbb_dispatcher; $config['load_online_guests'] = $display_guests; - $user = new phpbb_mock_lang(); + $user = new phpbb_mock_user(); + $user->data['user_id'] = 100; $user->lang = $this->load_language(); $auth = $this->createMock('\phpbb\auth\auth'); $acl_get_map = array( diff --git a/tests/functions/parse_cfg_file_test.php b/tests/functions/parse_cfg_file_test.php index 017a931f28f..0ac63a13a3e 100644 --- a/tests/functions/parse_cfg_file_test.php +++ b/tests/functions/parse_cfg_file_test.php @@ -11,9 +11,9 @@ * */ -class phpbb_functions_parse_cfg_file extends phpbb_test_case +class phpbb_functions_parse_cfg_file_test extends phpbb_test_case { - public function parse_cfg_file_data() + public static function parse_cfg_file_data() { return array( array( diff --git a/tests/functions/phpbb_get_banned_user_ids.php b/tests/functions/phpbb_get_banned_user_ids.php index 6f7607132e4..b0c0307d84a 100644 --- a/tests/functions/phpbb_get_banned_user_ids.php +++ b/tests/functions/phpbb_get_banned_user_ids.php @@ -11,16 +11,57 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_get_banned_user_ids_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/banned_users.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/banned_users.xml'); } - public function phpbb_get_banned_user_ids_data() + protected function setUp(): void + { + global $db, $phpbb_container, $phpbb_root_path, $phpEx; + + $db = $this->new_dbal(); + + parent::setUp(); + + $phpbb_container = new phpbb_mock_container_builder(); + $config = new \phpbb\config\config([]); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $language = new phpbb\language\language(new phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $user = new phpbb\user($language, '\phpbb\datetime'); + $user->data['user_email'] = ''; + + $cache = new \phpbb\cache\service( + new \phpbb\cache\driver\dummy(), + $config, + $db, + $phpbb_dispatcher, + $phpbb_root_path, + $phpEx + ); + $cache->get_driver()->purge(); + + $ban_type_email = new \phpbb\ban\type\email($db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_user = new \phpbb\ban\type\user($db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_ip = new \phpbb\ban\type\ip($db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $phpbb_container->set('ban.type.email', $ban_type_email); + $phpbb_container->set('ban.type.user', $ban_type_user); + $phpbb_container->set('ban.type.ip', $ban_type_ip); + $collection = new \phpbb\di\service_collection($phpbb_container); + $collection->add('ban.type.email'); + $collection->add('ban.type.user'); + $collection->add('ban.type.ip'); + $phpbb_log = new \phpbb\log\dummy(); + + $ban_manager = new \phpbb\ban\manager($collection, $cache->get_driver(), $db, $language, $phpbb_log, $user, 'phpbb_bans', 'phpbb_users'); + $phpbb_container->set('ban.manager', $ban_manager); + } + + public static function phpbb_get_banned_user_ids_data() { return array( // Input to phpbb_get_banned_user_ids (user_id list, ban_end) @@ -35,6 +76,11 @@ public function phpbb_get_banned_user_ids_data() array(array(1, 2, 4, 5, 6), false), array(2 => 2), ), + array( + // True to get users currently banned, but should only return passed user IDs + array(array(5, 6, 7), true), + array(5 => 5), + ), array( // Unix timestamp to get users banned until that time array(array(1, 2, 4, 5, 6), 2), @@ -43,15 +89,6 @@ public function phpbb_get_banned_user_ids_data() ); } - public function setUp() - { - global $db; - - $db = $this->new_dbal(); - - return parent::setUp(); - } - /** * @dataProvider phpbb_get_banned_user_ids_data */ diff --git a/tests/functions/phpbb_get_install_redirect_test.php b/tests/functions/phpbb_get_install_redirect_test.php new file mode 100644 index 00000000000..3b3b65f964f --- /dev/null +++ b/tests/functions/phpbb_get_install_redirect_test.php @@ -0,0 +1,68 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class phpbb_get_install_redirect_test extends phpbb_test_case +{ + public static function data_redirect(): array + { + return [ + [ + ['REQUEST_URI' => '/foo/bar/'], + '/foo/bar/install/app.php', + ], + [ + ['REQUEST_URI' => '/foo/bar/index.php'], + '/foo/bar/install/app.php', + ], + [ + ['REQUEST_URI' => '/foo/bar'], + '/foo/install/app.php', + ], + [ + ['REQUEST_URI' => '/foo/'], + '/foo/install/app.php', + ], + [ + ['REQUEST_URI' => '/foo/index.php'], + '/foo/install/app.php', + ], + [ + [ + 'REQUEST_URI' => '/foo/bar/', + 'PHP_SELF' => '/foo/bar/index.php' + ], + '/foo/bar/install/app.php', + ], + [ + [ + 'REQUEST_URI' => '', + 'PHP_SELF' => '/foo/bar/index.php' + ], + '/foo/bar/install/app.php', + ], + ]; + } + + /** + * @backupGlobals enabled + * @dataProvider data_redirect + */ + public function test_install_redirect($server_vars, $expected) + { + $phpbb_root_path = '/'; + $phpEx = 'php'; + + $_SERVER = array_merge($_SERVER, $server_vars); + $this->assertEquals($expected, phpbb_get_install_redirect($phpbb_root_path, $phpEx)); + } +} diff --git a/tests/functions/quoteattr_test.php b/tests/functions/quoteattr_test.php index dbad7a99d8a..a84ad174835 100644 --- a/tests/functions/quoteattr_test.php +++ b/tests/functions/quoteattr_test.php @@ -13,7 +13,7 @@ class phpbb_quoteattr_test extends phpbb_test_case { - public function quoteattr_test_data() + public static function quoteattr_test_data() { return array( array('foo', null, '"foo"'), diff --git a/tests/functions/short_ipv6__test.php b/tests/functions/short_ipv6__test.php new file mode 100644 index 00000000000..d62f652746f --- /dev/null +++ b/tests/functions/short_ipv6__test.php @@ -0,0 +1,49 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class short_ipv6__test extends phpbb_test_case +{ + public static function data_short_ipv6(): array + { + return [ + ['::1', 0, ''], + ['::1', 1, '0000:0000'], + ['::1', 2, '0000:0000:0000'], + ['::1', 3, '0000:0000:0000:0000'], + ['::1', 4, '0000:0000:0000:0000:0000:0000:0000:1'], + ['2001:db8:3333:4444:5555:6666:7777:8888', 0, ''], + ['2001:db8:3333:4444:5555:6666:7777:8888', 1, '2001:db8'], + ['2001:db8:3333:4444:5555:6666:7777:8888', 2, '2001:db8:3333'], + ['2001:db8:3333:4444:5555:6666:7777:8888', 3, '2001:db8:3333:4444'], + ['2001:db8:3333:4444:5555:6666:7777:8888', 4, '2001:db8:3333:4444:5555:6666:7777:8888'], + ['::ffff:192.168.1.1', 0, ''], + ['::ffff:192.168.1.1', 1, '0000:0000'], + ['::ffff:192.168.1.1', 2, '0000:0000:0000'], + ['::ffff:192.168.1.1', 3, '0000:0000:0000:0000'], + ['::ffff:192.168.1.1', 4, '0000:0000:0000:0000:0000:0000:ffff:192.168.1.1'], + ['FADE:BAD::192.168.0.1', 0, ''], + ['FADE:BAD::192.168.0.1', 1, 'fade:bad'], + ['FADE:BAD::192.168.0.1', 2, 'fade:bad:0000'], + ['FADE:BAD::192.168.0.1', 3, 'fade:bad:0000:0000'], + ['FADE:BAD::192.168.0.1', 4, 'fade:bad:0000:0000:0000:0000:c0a8:1'], + ]; + } + + /** + * @dataProvider data_short_ipv6 + */ + public function test_short_ipv6($ip, $length, $expected) + { + $this->assertEquals($expected, short_ipv6($ip, $length)); + } +} diff --git a/tests/functions/style_select_test.php b/tests/functions/style_select_test.php index 27f0e68c884..b3b4b42598e 100644 --- a/tests/functions/style_select_test.php +++ b/tests/functions/style_select_test.php @@ -15,19 +15,124 @@ class phpbb_functions_style_select_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/style_select.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/style_select.xml'); } - static public function style_select_data() + public static function style_select_data() { - return array( - array('', false, ''), - array('', true, ''), - array('1', false, ''), - array('1', true, ''), - array('3', false, ''), - array('3', true, ''), - ); + return [ + [ + '', + false, + [ + [ + 'value' => '1', + 'selected' => false, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + ] + ], + [ + '', + true, + [ + [ + 'value' => '1', + 'selected' => false, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + [ + 'value' => '3', + 'selected' => false, + 'label' => 'zoo', + ], + ] + ], + [ + '1', + false, + [ + [ + 'value' => '1', + 'selected' => true, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + ] + ], + [ + '1', + true, + [ + [ + 'value' => '1', + 'selected' => true, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + [ + 'value' => '3', + 'selected' => false, + 'label' => 'zoo', + ], + ] + ], + [ + '3', + false, + [ + [ + 'value' => '1', + 'selected' => false, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + ] + ], + [ + '3', + true, + [ + [ + 'value' => '1', + 'selected' => false, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + [ + 'value' => '3', + 'selected' => true, + 'label' => 'zoo', + ], + ] + ], + ]; } /** diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php index db9b6e0c904..956c61b15dd 100644 --- a/tests/functions/user_delete_test.php +++ b/tests/functions/user_delete_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_functions_user_delete_test extends phpbb_database_test_case { @@ -20,10 +20,10 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_delete.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/user_delete.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -33,6 +33,7 @@ protected function setUp() $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); + $user->data['user_id'] = 2; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $phpbb_container = new phpbb_mock_container_builder(); $config = new \phpbb\config\config(array( @@ -60,21 +61,40 @@ protected function setUp() // Set up passwords manager $passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers)); - $oauth_provider = new \phpbb\auth\provider\oauth\oauth( - $db, + $plugins = new \phpbb\di\service_collection($phpbb_container); + $plugins->add('core.captcha.plugins.qa'); + $phpbb_container->set( + 'captcha.factory', + new \phpbb\captcha\factory($phpbb_container, $plugins) + ); + $phpbb_container->set( + 'core.captcha.plugins.qa', + new \phpbb\captcha\plugins\qa('', '', '') + ); + // Set up passwords manager + $db_auth_provider = new \phpbb\auth\provider\db( + new \phpbb\captcha\factory($phpbb_container, $plugins), $config, + $db, $passwords_manager, + $user + ); + + $oauth_provider = new \phpbb\auth\provider\oauth\oauth( + $config, + $db, + $db_auth_provider, + $phpbb_dispatcher, + $lang, $request, + $oauth_provider_collection, $user, 'phpbb_oauth_tokens', 'phpbb_oauth_states', 'phpbb_oauth_accounts', - $oauth_provider_collection, 'phpbb_users', - $phpbb_container, - $phpbb_dispatcher, - $this->phpbb_root_path, - $this->php_ext + $phpbb_root_path, + $phpEx ); $provider_collection->offsetSet('auth.provider.oauth', $oauth_provider); @@ -82,6 +102,12 @@ protected function setUp() $phpbb_container->set('auth.provider.oauth.service.google', $oauth_provider_google); $phpbb_container->set('auth.provider_collection', $provider_collection); $phpbb_container->set('notification_manager', $notification_manager); + + $phpbb_container->setParameter('tables.auth_provider_oauth_token_storage', 'phpbb_oauth_tokens'); + $phpbb_container->setParameter('tables.auth_provider_oauth_states', 'phpbb_oauth_states'); + $phpbb_container->setParameter('tables.auth_provider_oauth_account_assoc', 'phpbb_oauth_accounts'); + + $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); } public function test_user_delete() diff --git a/tests/functions/validate_date_test.php b/tests/functions/validate_date_test.php index 9dc0db46d69..60b44b1534d 100644 --- a/tests/functions/validate_date_test.php +++ b/tests/functions/validate_date_test.php @@ -11,14 +11,14 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_date_test extends phpbb_test_case { protected $helper; - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/functions/validate_email_test.php b/tests/functions/validate_email_test.php index 7f8b2679d46..f30e1e5c059 100644 --- a/tests/functions/validate_email_test.php +++ b/tests/functions/validate_email_test.php @@ -7,9 +7,9 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/../mock/user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../mock/user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_email_test extends phpbb_database_test_case { @@ -19,10 +19,10 @@ class phpbb_functions_validate_email_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/validate_email.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/validate_email.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/functions/validate_hex_colour_test.php b/tests/functions/validate_hex_colour_test.php index b2c4862458f..c82cce140be 100644 --- a/tests/functions/validate_hex_colour_test.php +++ b/tests/functions/validate_hex_colour_test.php @@ -11,11 +11,11 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_functions_validate_hex_colour_test extends phpbb_test_case { - public function positive_match_data() + public static function positive_match_data() { return array( array('a00'), @@ -27,7 +27,7 @@ public function positive_match_data() ); } - public function negative_match_data() + public static function negative_match_data() { return array( // Invalid prefix @@ -53,7 +53,7 @@ public function negative_match_data() ); } - public function optional_only_data() + public static function optional_only_data() { return array( // The empty colour, i.e. "no colour". @@ -61,19 +61,19 @@ public function optional_only_data() ); } - public function strict_negative_match_data() + public static function strict_negative_match_data() { return array_merge( - $this->negative_match_data(), - $this->optional_only_data() + self::negative_match_data(), + self::optional_only_data() ); } - public function nonstrict_positive_match_data() + public static function nonstrict_positive_match_data() { return array_merge( - $this->positive_match_data(), - $this->optional_only_data() + self::positive_match_data(), + self::optional_only_data() ); } diff --git a/tests/functions/validate_jabber_test.php b/tests/functions/validate_jabber_test.php deleted file mode 100644 index 23811a94c0c..00000000000 --- a/tests/functions/validate_jabber_test.php +++ /dev/null @@ -1,83 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; - -class phpbb_functions_validate_jabber_test extends phpbb_test_case -{ - protected $helper; - - protected function setUp() - { - parent::setUp(); - - $this->helper = new phpbb_functions_validate_data_helper($this); - } - - public function test_validate_jabber() - { - $this->helper->assert_valid_data(array( - 'empty' => array( - array(), - '', - array('jabber'), - ), - 'no_seperator' => array( - array('WRONG_DATA'), - 'testjabber.ccc', - array('jabber'), - ), - 'no_user' => array( - array('WRONG_DATA'), - '@jabber.ccc', - array('jabber'), - ), - 'no_realm' => array( - array('WRONG_DATA'), - 'user@', - array('jabber'), - ), - 'dot_realm' => array( - array('WRONG_DATA'), - 'user@.....', - array('jabber'), - ), - '-realm' => array( - array('WRONG_DATA'), - 'user@-jabber.ccc', - array('jabber'), - ), - 'realm-' => array( - array('WRONG_DATA'), - 'user@jabber.ccc-', - array('jabber'), - ), - 'correct' => array( - array(), - 'user@jabber.09A-z.org', - array('jabber'), - ), - 'prohibited' => array( - array('WRONG_DATA'), - 'u@ser@jabber.ccc.org', - array('jabber'), - ), - 'prohibited_char' => array( - array('WRONG_DATA'), - 'uer@jabber.ccc.org', - array('jabber'), - ), - )); - } -} diff --git a/tests/functions/validate_lang_iso_test.php b/tests/functions/validate_lang_iso_test.php index 81b56055e60..6264e215646 100644 --- a/tests/functions/validate_lang_iso_test.php +++ b/tests/functions/validate_lang_iso_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_lang_iso_test extends phpbb_database_test_case { @@ -21,10 +21,10 @@ class phpbb_functions_validate_lang_iso_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/language_select.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/language_select.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/functions/validate_match_test.php b/tests/functions/validate_match_test.php index 811bed3e334..a03d0375074 100644 --- a/tests/functions/validate_match_test.php +++ b/tests/functions/validate_match_test.php @@ -11,14 +11,14 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_match_test extends phpbb_test_case { protected $helper; - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/functions/validate_num_test.php b/tests/functions/validate_num_test.php index 798468759c2..c97da1276da 100644 --- a/tests/functions/validate_num_test.php +++ b/tests/functions/validate_num_test.php @@ -11,14 +11,14 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_num_test extends phpbb_test_case { protected $helper; - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -30,7 +30,7 @@ public function test_validate_num() $this->helper->assert_valid_data(array( 'empty' => array( array(), - '', + null, // '' < 0 is true since PHP 8.0, hence use null instead of '' (empty string) array('num'), ), 'zero' => array( @@ -54,7 +54,7 @@ public function test_validate_num() array('num', false, 2, 3), ), 'string' => array( - array(), + version_compare(PHP_VERSION, '7.5', '<=') ? [] : ['TOO_LARGE'], // See https://wiki.php.net/rfc/string_to_number_comparison 'foobar', array('num'), ), diff --git a/tests/functions/validate_password_test.php b/tests/functions/validate_password_test.php index 5e34c8babac..56be2b6441b 100644 --- a/tests/functions/validate_password_test.php +++ b/tests/functions/validate_password_test.php @@ -11,21 +11,21 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_password_test extends phpbb_test_case { protected $helper; - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->helper = new phpbb_functions_validate_data_helper($this); } - public function validate_password_data() + public static function validate_password_data() { return array( array('PASS_TYPE_ANY', array( diff --git a/tests/functions/validate_string_test.php b/tests/functions/validate_string_test.php index 7aca14c3343..4a79dcd6c73 100644 --- a/tests/functions/validate_string_test.php +++ b/tests/functions/validate_string_test.php @@ -11,14 +11,14 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_string_test extends phpbb_test_case { protected $helper; - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/functions/validate_user_email_test.php b/tests/functions/validate_user_email_test.php index 8dcec881036..e1f8526e218 100644 --- a/tests/functions/validate_user_email_test.php +++ b/tests/functions/validate_user_email_test.php @@ -11,9 +11,9 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/../mock/user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../mock/user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_user_email_test extends phpbb_database_test_case { @@ -23,16 +23,50 @@ class phpbb_functions_validate_user_email_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/validate_email.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/validate_email.xml'); } - protected function setUp() + protected function setUp(): void { + global $cache, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $config; + parent::setUp(); + $phpbb_container = new phpbb_mock_container_builder(); + $config = new \phpbb\config\config([ + 'allow_emailreuse' => 0, + ]); $this->db = $this->new_dbal(); - $this->user = new phpbb_mock_user; + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $language = new phpbb\language\language(new phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $this->user = new phpbb\user($language, '\phpbb\datetime'); + $this->user->data['user_email'] = ''; $this->helper = new phpbb_functions_validate_data_helper($this); + + $cache = new \phpbb\cache\service( + new \phpbb\cache\driver\dummy(), + $config, + $this->db, + $phpbb_dispatcher, + $phpbb_root_path, + $phpEx + ); + $cache->get_driver()->purge(); + + $ban_type_email = new \phpbb\ban\type\email($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_user = new \phpbb\ban\type\user($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_ip = new \phpbb\ban\type\ip($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $phpbb_container->set('ban.type.email', $ban_type_email); + $phpbb_container->set('ban.type.user', $ban_type_user); + $phpbb_container->set('ban.type.ip', $ban_type_ip); + $collection = new \phpbb\di\service_collection($phpbb_container); + $collection->add('ban.type.email'); + $collection->add('ban.type.user'); + $collection->add('ban.type.ip'); + $phpbb_log = new \phpbb\log\dummy(); + + $ban_manager = new \phpbb\ban\manager($collection, $cache->get_driver(), $this->db, $language, $phpbb_log, $this->user, 'phpbb_bans', 'phpbb_users'); + $phpbb_container->set('ban.manager', $ban_manager); } /** @@ -47,7 +81,6 @@ protected function set_validation_prerequisites($check_mx) $config['email_check_mx'] = $check_mx; $db = $this->db; $user = $this->user; - $user->optionset('banned_users', array('banned@example.com')); } public static function validate_user_email_data() @@ -58,7 +91,8 @@ public static function validate_user_email_data() array('valid_complex', array(), "'%$~test@example.com"), array('invalid', array('EMAIL_INVALID'), 'fööbar@example.com'), array('taken', array('EMAIL_TAKEN'), 'admin@example.com'), - array('banned', array('EMAIL_BANNED'), 'banned@example.com'), + array('banned', ['just because'], 'banned2@example.com'), + array('banned', ['EMAIL_BANNED'], 'banned@example.com') ); } @@ -67,6 +101,8 @@ public static function validate_user_email_data() */ public function test_validate_user_email($case, $errors, $email) { + global $config, $db, $user; + $this->set_validation_prerequisites(false); $this->helper->assert_valid_data(array( @@ -92,6 +128,8 @@ public static function validate_user_email_mx_data() */ public function test_validate_user_email_mx($case, $errors, $email) { + global $config, $db, $user; + $this->set_validation_prerequisites(true); $this->helper->assert_valid_data(array( diff --git a/tests/functions/validate_username_test.php b/tests/functions/validate_username_test.php index d310f58036e..0da6b99a6c5 100644 --- a/tests/functions/validate_username_test.php +++ b/tests/functions/validate_username_test.php @@ -11,11 +11,11 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/../mock/cache.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../mock/cache.php'; +require_once __DIR__ . '/validate_data_helper.php'; -class phpbb_functions_validate_data_test extends phpbb_database_test_case +class phpbb_functions_validate_username_test extends phpbb_database_test_case { protected $db; protected $cache; @@ -23,10 +23,10 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/validate_username.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/validate_username.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -35,7 +35,7 @@ protected function setUp() $this->helper = new phpbb_functions_validate_data_helper($this); } - public function validate_username_data() + public static function validate_username_data() { return array( array('USERNAME_CHARS_ANY', array( @@ -47,9 +47,11 @@ public function validate_username_data() 'foobar_letter_num' => array(), 'foobar_letter_num_sp' => array(), 'foobar_quot' => array('INVALID_CHARS'), + 'foobar_emoji' => array('INVALID_EMOJIS'), 'barfoo_disallow' => array('USERNAME_DISALLOWED'), 'admin_taken' => array('USERNAME_TAKEN'), 'group_taken' => array('USERNAME_TAKEN'), + 'a d m i n i ᠎strator' => array('INVALID_CHARS'), )), array('USERNAME_ALPHA_ONLY', array( 'foobar_allow' => array(), @@ -60,9 +62,11 @@ public function validate_username_data() 'foobar_letter_num' => array(), 'foobar_letter_num_sp' => array('INVALID_CHARS'), 'foobar_quot' => array('INVALID_CHARS'), + 'foobar_emoji' => array('INVALID_EMOJIS'), 'barfoo_disallow' => array('USERNAME_DISALLOWED'), 'admin_taken' => array('USERNAME_TAKEN'), 'group_taken' => array('INVALID_CHARS'), + 'a d m i n i ᠎strator' => array('INVALID_CHARS'), )), array('USERNAME_ALPHA_SPACERS', array( 'foobar_allow' => array(), @@ -73,9 +77,11 @@ public function validate_username_data() 'foobar_letter_num' => array(), 'foobar_letter_num_sp' => array('INVALID_CHARS'), 'foobar_quot' => array('INVALID_CHARS'), + 'foobar_emoji' => array('INVALID_EMOJIS'), 'barfoo_disallow' => array('USERNAME_DISALLOWED'), 'admin_taken' => array('USERNAME_TAKEN'), 'group_taken' => array('USERNAME_TAKEN'), + 'a d m i n i ᠎strator' => array('INVALID_CHARS'), )), array('USERNAME_LETTER_NUM', array( 'foobar_allow' => array(), @@ -86,9 +92,11 @@ public function validate_username_data() 'foobar_letter_num' => array(), 'foobar_letter_num_sp' => array('INVALID_CHARS'), 'foobar_quot' => array('INVALID_CHARS'), + 'foobar_emoji' => array('INVALID_EMOJIS'), 'barfoo_disallow' => array('USERNAME_DISALLOWED'), 'admin_taken' => array('USERNAME_TAKEN'), 'group_taken' => array('INVALID_CHARS'), + 'a d m i n i ᠎strator' => array('INVALID_CHARS'), )), array('USERNAME_LETTER_NUM_SPACERS', array( 'foobar_allow' => array(), @@ -99,9 +107,11 @@ public function validate_username_data() 'foobar_letter_num' => array(), 'foobar_letter_num_sp' => array(), 'foobar_quot' => array('INVALID_CHARS'), + 'foobar_emoji' => array('INVALID_EMOJIS'), 'barfoo_disallow' => array('USERNAME_DISALLOWED'), 'admin_taken' => array('USERNAME_TAKEN'), 'group_taken' => array('USERNAME_TAKEN'), + 'a d m i n i ᠎strator' => array('INVALID_CHARS'), )), array('USERNAME_ASCII', array( 'foobar_allow' => array(), @@ -112,9 +122,11 @@ public function validate_username_data() 'foobar_letter_num' => array(), 'foobar_letter_num_sp' => array('INVALID_CHARS'), 'foobar_quot' => array('INVALID_CHARS'), + 'foobar_emoji' => array('INVALID_EMOJIS'), 'barfoo_disallow' => array('USERNAME_DISALLOWED'), 'admin_taken' => array('USERNAME_TAKEN'), 'group_taken' => array('USERNAME_TAKEN'), + 'a d m i n i ᠎strator' => array('INVALID_CHARS'), )), ); } @@ -124,11 +136,13 @@ public function validate_username_data() */ public function test_validate_username($allow_name_chars, $expected) { - global $cache, $config, $db; + global $cache, $config, $db, $user; $db = $this->db; $cache = $this->cache; $cache->put('_disallowed_usernames', array('barfoo')); + $user = new phpbb_mock_user(); + $user->data['username_clean'] = 'username'; $config['allow_name_chars'] = $allow_name_chars; @@ -173,6 +187,11 @@ public function test_validate_username($allow_name_chars, $expected) '"foobar"', array('username'), ), + 'foobar_emoji' => array( + $expected['foobar_emoji'], + 'username😮', + array('username'), + ), 'barfoo_disallow' => array( $expected['barfoo_disallow'], 'barfoo', @@ -188,6 +207,11 @@ public function test_validate_username($allow_name_chars, $expected) 'foobar_group', array('username'), ), + 'a d m i n i ᠎strator' => array( + $expected['a d m i n i ᠎strator'], + 'a d m i n i ᠎strator', + array('username'), + ), )); } } diff --git a/tests/functions/validate_with_method_test.php b/tests/functions/validate_with_method_test.php index 37e05d412a3..d79d5f3c870 100644 --- a/tests/functions/validate_with_method_test.php +++ b/tests/functions/validate_with_method_test.php @@ -11,14 +11,14 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_with_method_test extends phpbb_test_case { protected $helper; - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/functions_acp/build_cfg_template_test.php b/tests/functions_acp/build_cfg_template_test.php index 2e3a8adac73..4ddd891f81a 100644 --- a/tests/functions_acp/build_cfg_template_test.php +++ b/tests/functions_acp/build_cfg_template_test.php @@ -11,11 +11,11 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case { - public function build_cfg_template_text_data() + public static function build_cfg_template_text_data() { return array( array( @@ -24,7 +24,15 @@ public function build_cfg_template_text_data() array('config_key_name' => '1'), 'config_key_name', array(), - '', + [ + 'tag' => 'input', + 'id' => 'key_name', + 'type' => 'text', + 'name' => 'config[config_key_name]', + 'size' => 20, + 'maxlength' => 255, + 'value' => '1', + ], ), array( array('password', 20, 128), @@ -32,7 +40,15 @@ public function build_cfg_template_text_data() array('config_key_name' => '2'), 'config_key_name', array(), - '', + [ + 'tag' => 'input', + 'id' => 'key_name', + 'type' => 'password', + 'name' => 'config[config_key_name]', + 'size' => 20, + 'maxlength' => 128, + 'value' => '********', + ], ), array( array('text', 0, 255), @@ -40,7 +56,15 @@ public function build_cfg_template_text_data() array('config_key_name' => '3'), 'config_key_name', array(), - '', + [ + 'tag' => 'input', + 'id' => 'key_name', + 'type' => 'text', + 'name' => 'config[config_key_name]', + 'maxlength' => 255, + 'value' => '3', + 'size' => '', + ], ), ); } @@ -50,16 +74,17 @@ public function build_cfg_template_text_data() */ public function test_build_cfg_template_text($tpl_type, $key, $new, $config_key, $vars, $expected) { - global $user, $phpbb_dispatcher; + global $user, $phpbb_dispatcher, $language; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $user = new phpbb_mock_user(); - $user->lang = new phpbb_mock_lang(); + $language = new phpbb_mock_lang(); + $user->lang = $language; - $this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); + $this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); } - public function build_cfg_template_dimension_data() + public static function build_cfg_template_dimension_data() { return array( array( @@ -68,7 +93,24 @@ public function build_cfg_template_dimension_data() array('config_key_name_width' => 10, 'config_key_name_height' => 20), 'config_key_name', array(), - ' x ', + [ + 'tag' => 'dimension', + 'width' => [ + 'id' => 'number_key_name', + 'type' => 'number', + 'name' => 'config[config_key_name_width]', + 'min' => 5, + 'max' => 15, + 'value' => 10, + ], + 'height' => [ + 'type' => 'number', + 'name' => 'config[config_key_name_height]', + 'min' => 5, + 'max' => 15, + 'value' => 20, + ], + ], ), array( array('dimension', 0, 15), @@ -76,7 +118,24 @@ public function build_cfg_template_dimension_data() array('config_key_name_width' => 10, 'config_key_name_height' => 20), 'config_key_name', array(), - ' x ', + [ + 'tag' => 'dimension', + 'width' => [ + 'id' => 'number_key_name', + 'type' => 'number', + 'name' => 'config[config_key_name_width]', + 'min' => 0, + 'max' => 15, + 'value' => 10, + ], + 'height' => [ + 'type' => 'number', + 'name' => 'config[config_key_name_height]', + 'min' => 0, + 'max' => 15, + 'value' => 20, + ], + ], ), ); } @@ -92,10 +151,10 @@ public function test_build_cfg_template_dimension($tpl_type, $key, $new, $config $user = new phpbb_mock_user(); $user->lang = new phpbb_mock_lang(); - $this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); + $this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); } - public function build_cfg_template_number_data() + public static function build_cfg_template_number_data() { return array( array( @@ -104,7 +163,15 @@ public function build_cfg_template_number_data() array('config_key_name' => 10), 'config_key_name', array(), - '', + [ + 'tag' => 'input', + 'id' => 'number_key_name', + 'type' => 'number', + 'name' => 'config[config_key_name]', + 'min' => 5, + 'max' => 15, + 'value' => 10, + ], ), array( array('number', -1, 9999), @@ -112,7 +179,31 @@ public function build_cfg_template_number_data() array('config_key_name' => 10), 'config_key_name', array(), - '', + [ + 'tag' => 'input', + 'id' => 'number_key_name', + 'type' => 'number', + 'name' => 'config[config_key_name]', + 'min' => -1, + 'max' => 9999, + 'value' => 10, + ], + ), + array( + array('number', 0, 9999), + 'number_key_name', + array('config_key_name' => 10), + 'config_key_name', + array(), + [ + 'tag' => 'input', + 'id' => 'number_key_name', + 'type' => 'number', + 'name' => 'config[config_key_name]', + 'min' => 0, + 'max' => 9999, + 'value' => 10, + ], ), ); } @@ -128,10 +219,10 @@ public function test_build_cfg_template_number($tpl_type, $key, $new, $config_ke $user = new phpbb_mock_user(); $user->lang = new phpbb_mock_lang(); - $this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); + $this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); } - public function build_cfg_template_textarea_data() + public static function build_cfg_template_textarea_data() { return array( array( @@ -140,7 +231,14 @@ public function build_cfg_template_textarea_data() array('config_key_name' => 'phpBB'), 'config_key_name', array(), - '', + [ + 'tag' => 'textarea', + 'id' => 'key_name', + 'name' => 'config[config_key_name]', + 'rows' => 5, + 'cols' => 30, + 'content' => 'phpBB', + ] ), ); } @@ -156,45 +254,229 @@ public function test_build_cfg_template_textarea($tpl_type, $key, $new, $config_ $user = new phpbb_mock_user(); $user->lang = new phpbb_mock_lang(); - $this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); + $this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); } - public function build_cfg_template_radio_data() + public static function build_cfg_template_radio_data() { - return array( - array( - array('radio', 'enabled_disabled'), + return [ + [ + ['radio', 'enabled_disabled'], 'key_name', - array('config_key_name' => '0'), + ['config_key_name' => '0'], 'config_key_name', - array(), - '', - ), - array( - array('radio', 'enabled_disabled'), + [], + [ + 'tag' => 'radio', + 'buttons' => [ + [ + 'id' => 'key_name', + 'type' => 'radio', + 'value' => 1, + 'name' => 'config[config_key_name]', + 'label' => 'ENABLED', + 'checked' => false, + ], + [ + 'type' => 'radio', + 'value' => 0, + 'checked' => true, + 'name' => 'config[config_key_name]', + 'label' => 'DISABLED', + ], + ], + ], + ], + [ + ['radio'], 'key_name', - array('config_key_name' => '1'), + ['config_key_name' => '0'], 'config_key_name', - array(), - '', - ), - array( - array('radio', 'yes_no'), + ['function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'ENABLED', 0 => 'DISABLED']]], + [ + 'tag' => 'radio', + 'buttons' => [ + [ + 'id' => 'key_name', + 'type' => 'radio', + 'value' => 1, + 'name' => 'config[config_key_name]', + 'label' => 'ENABLED', + 'checked' => false, + ], + [ + 'type' => 'radio', + 'value' => 0, + 'checked' => true, + 'name' => 'config[config_key_name]', + 'label' => 'DISABLED', + ], + ], + ], + ], + [ + ['radio', 'enabled_disabled'], 'key_name', - array('config_key_name' => '0'), + ['config_key_name' => '1'], 'config_key_name', - array(), - '', - ), - array( - array('radio', 'yes_no'), + [], + [ + 'tag' => 'radio', + 'buttons' => [ + [ + 'id' => 'key_name', + 'type' => 'radio', + 'value' => 1, + 'name' => 'config[config_key_name]', + 'label' => 'ENABLED', + 'checked' => true, + ], + [ + 'type' => 'radio', + 'value' => 0, + 'checked' => false, + 'name' => 'config[config_key_name]', + 'label' => 'DISABLED', + ], + ], + ], + ], + [ + ['radio'], 'key_name', - array('config_key_name' => '1'), + ['config_key_name' => '1'], 'config_key_name', - array(), - '', - ), - ); + ['function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'ENABLED', 0 => 'DISABLED']]], + [ + 'tag' => 'radio', + 'buttons' => [ + [ + 'id' => 'key_name', + 'type' => 'radio', + 'value' => 1, + 'name' => 'config[config_key_name]', + 'label' => 'ENABLED', + 'checked' => true, + ], + [ + 'type' => 'radio', + 'value' => 0, + 'checked' => false, + 'name' => 'config[config_key_name]', + 'label' => 'DISABLED', + ], + ], + ], + ], + [ + ['radio', 'yes_no'], + 'key_name', + ['config_key_name' => '0'], + 'config_key_name', + [], + [ + 'tag' => 'radio', + 'buttons' => [ + [ + 'id' => 'key_name', + 'type' => 'radio', + 'value' => 1, + 'name' => 'config[config_key_name]', + 'label' => 'YES', + 'checked' => false, + ], + [ + 'type' => 'radio', + 'value' => 0, + 'checked' => true, + 'name' => 'config[config_key_name]', + 'label' => 'NO', + ], + ], + ], + ], + [ + ['radio'], + 'key_name', + ['config_key_name' => '0'], + 'config_key_name', + ['function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'YES', 0 => 'NO']]], + [ + 'tag' => 'radio', + 'buttons' => [ + [ + 'id' => 'key_name', + 'type' => 'radio', + 'value' => 1, + 'name' => 'config[config_key_name]', + 'label' => 'YES', + 'checked' => false, + ], + [ + 'type' => 'radio', + 'value' => 0, + 'checked' => true, + 'name' => 'config[config_key_name]', + 'label' => 'NO', + ], + ], + ], + ], + [ + ['radio', 'yes_no'], + 'key_name', + ['config_key_name' => '1'], + 'config_key_name', + [], + [ + 'tag' => 'radio', + 'buttons' => [ + [ + 'id' => 'key_name', + 'type' => 'radio', + 'value' => 1, + 'name' => 'config[config_key_name]', + 'label' => 'YES', + 'checked' => true, + ], + [ + 'type' => 'radio', + 'value' => 0, + 'checked' => false, + 'name' => 'config[config_key_name]', + 'label' => 'NO', + ], + ], + ], + ], + [ + ['radio'], + 'key_name', + ['config_key_name' => '1'], + 'config_key_name', + ['function' => 'phpbb_build_radio', 'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'YES', 0 => 'NO']]], + [ + 'tag' => 'radio', + 'buttons' => [ + [ + 'id' => 'key_name', + 'type' => 'radio', + 'value' => 1, + 'name' => 'config[config_key_name]', + 'label' => 'YES', + 'checked' => true, + ], + [ + 'type' => 'radio', + 'value' => 0, + 'checked' => false, + 'name' => 'config[config_key_name]', + 'label' => 'NO', + ], + ], + ], + ], + ]; } /** @@ -202,16 +484,15 @@ public function build_cfg_template_radio_data() */ public function test_build_cfg_template_radio($tpl_type, $key, $new, $config_key, $vars, $expected) { - global $user, $phpbb_dispatcher; + global $language, $phpbb_dispatcher; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user = new phpbb_mock_user(); - $user->lang = new phpbb_mock_lang(); + $language = new \phpbb_mock_lang(); - $this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); + $this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); } - public function build_cfg_template_append_data() + public static function build_cfg_template_append_data() { return array( array( @@ -220,7 +501,15 @@ public function build_cfg_template_append_data() array('config_key_name' => 'phpBB'), 'config_key_name', array('append' => 'Bertie is cool!'), - 'Bertie is cool!', + [ + 'tag' => 'textarea', + 'id' => 'key_name', + 'name' => 'config[config_key_name]', + 'rows' => 5, + 'cols' => 30, + 'content' => 'phpBB', + 'append' => 'Bertie is cool!', + ] ), ); } @@ -236,29 +525,83 @@ public function test_build_cfg_template_append($tpl_type, $key, $new, $config_ke $user = new phpbb_mock_user(); $user->lang = new phpbb_mock_lang(); - $this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); + $this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); } - public function build_cfg_template_select_data() + public static function build_cfg_template_select_data() { - return array( - array( - array('select'), + return [ + [ + ['select'], 'key_name', - array('config_key_name' => '0'), + ['config_key_name' => '0'], 'config_key_name', - array('method' => 'select_helper'), - '', - ), - array( - array('select', 8), + ['method' => 'select_helper'], + [ + 'tag' => 'select', + 'class' => false, + 'id' => 'key_name', + 'data' => [], + 'name' => 'config[config_key_name]', + 'toggleable' => false, + 'options' => [ + [ + 'value' => 1, + 'label' => 'First_Option', + 'selected' => false, + ], + [ + 'value' => 2, + 'label' => 'Second_Option', + 'selected' => true, + ], + [ + 'value' => 3, + 'label' => 'Third_Option', + 'selected' => false, + ] + ], + 'group_only' => false, + 'size' => 1, + 'multiple' => false, + ], + ], + [ + ['select', 8], 'key_name', - array('config_key_name' => '1'), + ['config_key_name' => '1'], 'config_key_name', - array('method' => 'select_helper'), - '', - ), - ); + ['method' => 'select_helper'], + [ + 'tag' => 'select', + 'class' => false, + 'id' => 'key_name', + 'data' => [], + 'name' => 'config[config_key_name]', + 'toggleable' => false, + 'options' => [ + [ + 'value' => 1, + 'label' => 'First_Option', + 'selected' => false, + ], + [ + 'value' => 2, + 'label' => 'Second_Option', + 'selected' => true, + ], + [ + 'value' => 3, + 'label' => 'Third_Option', + 'selected' => false, + ] + ], + 'group_only' => false, + 'size' => 8, + 'multiple' => false, + ], + ], + ]; } /** @@ -266,26 +609,28 @@ public function build_cfg_template_select_data() */ public function test_build_cfg_template_select($tpl_type, $key, $new, $config_key, $vars, $expected) { - global $module, $user, $phpbb_dispatcher; + global $module, $user, $phpbb_dispatcher, $language; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $user = new phpbb_mock_user(); - $user->lang = new phpbb_mock_lang(); + $language = new phpbb_mock_lang(); + $user->lang = $language; $user->module = $this; $module = $user; - $this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); + $this->assertEquals($expected, phpbb_build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); } public function select_helper() { - return build_select( - array( - '1' => 'First_Option', - '2' => 'Second_Option', - '3' => 'Third_Option', - ), - '2' - ); + return [ + 'options' => build_select( + [ + '1' => 'First_Option', + '2' => 'Second_Option', + '3' => 'Third_Option', + ], + '2'), + ]; } } diff --git a/tests/functions_acp/build_select_test.php b/tests/functions_acp/build_select_test.php index ebdc58fd649..693eabe3c9c 100644 --- a/tests/functions_acp/build_select_test.php +++ b/tests/functions_acp/build_select_test.php @@ -11,11 +11,11 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; -class phpbb_functions_acp_built_select_test extends phpbb_test_case +class phpbb_functions_acp_build_select_test extends phpbb_test_case { - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -25,7 +25,7 @@ protected function setUp() $user->lang = new phpbb_mock_lang(); } - public function build_select_data() + public static function build_select_data() { return array( array( @@ -34,7 +34,18 @@ public function build_select_data() 'second' => 'SEC_OPTION', ), false, - '', + [ + [ + 'value' => 'test', + 'label' => 'TEST', + 'selected' => false, + ], + [ + 'value' => 'second', + 'label' => 'SEC_OPTION', + 'selected' => false, + ], + ], ), array( array( @@ -42,7 +53,18 @@ public function build_select_data() 'second' => 'SEC_OPTION', ), 'test', - '', + [ + [ + 'value' => 'test', + 'label' => 'TEST', + 'selected' => true, + ], + [ + 'value' => 'second', + 'label' => 'SEC_OPTION', + 'selected' => false, + ], + ], ), array( array( @@ -50,7 +72,18 @@ public function build_select_data() 'second' => 'SEC_OPTION', ), 'second', - '', + [ + [ + 'value' => 'test', + 'label' => 'TEST', + 'selected' => false, + ], + [ + 'value' => 'second', + 'label' => 'SEC_OPTION', + 'selected' => true, + ], + ], ), ); } @@ -60,6 +93,10 @@ public function build_select_data() */ public function test_build_select($option_ary, $option_default, $expected) { + global $language; + + $language = new phpbb_mock_lang(); + $this->assertEquals($expected, build_select($option_ary, $option_default)); } } diff --git a/tests/functions_acp/h_radio_test.php b/tests/functions_acp/h_radio_test.php deleted file mode 100644 index 5ae4e91ea2b..00000000000 --- a/tests/functions_acp/h_radio_test.php +++ /dev/null @@ -1,130 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; - -class phpbb_functions_acp_h_radio_test extends phpbb_test_case -{ - protected function setUp() - { - parent::setUp(); - - global $user; - - $user = new phpbb_mock_user(); - $user->lang = new phpbb_mock_lang(); - } - - public function h_radio_data() - { - return array( - array( - 'test_name', - array( - 'test' => 'TEST', - 'second' => 'SEC_OPTION', - ), - false, - false, - false, - '', - ), - array( - 'test_name', - array( - 'test' => 'TEST', - 'second' => 'SEC_OPTION', - ), - 'test', - false, - false, - '', - ), - array( - 'test_name', - array( - 'test' => 'TEST', - 'second' => 'SEC_OPTION', - ), - false, - 'test_id', - false, - '', - ), - array( - 'test_name', - array( - 'test' => 'TEST', - 'second' => 'SEC_OPTION', - ), - 'test', - 'test_id', - false, - '', - ), - - array( - 'test_name', - array( - 'test' => 'TEST', - 'second' => 'SEC_OPTION', - ), - false, - false, - 'k', - '', - ), - array( - 'test_name', - array( - 'test' => 'TEST', - 'second' => 'SEC_OPTION', - ), - 'test', - false, - 'k', - '', - ), - array( - 'test_name', - array( - 'test' => 'TEST', - 'second' => 'SEC_OPTION', - ), - false, - 'test_id', - 'k', - '', - ), - array( - 'test_name', - array( - 'test' => 'TEST', - 'second' => 'SEC_OPTION', - ), - 'test', - 'test_id', - 'k', - '', - ), - ); - } - - /** - * @dataProvider h_radio_data - */ - public function test_h_radio($name, $input_ary, $input_default, $id, $key, $expected) - { - $this->assertEquals($expected, h_radio($name, $input_ary, $input_default, $id, $key)); - } -} diff --git a/tests/functions_acp/insert_config_array_test.php b/tests/functions_acp/insert_config_array_test.php index 1264b35bf42..f61b6dceacc 100644 --- a/tests/functions_acp/insert_config_array_test.php +++ b/tests/functions_acp/insert_config_array_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; class phpbb_functions_insert_config_array_test extends phpbb_test_case { @@ -27,7 +27,7 @@ public function config_display_vars() ); } - public function insert_config_array_data() + public static function insert_config_array_data() { return array( array( // Add a new config after 1st array item diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php index 5c31888291c..a94e9b1405e 100644 --- a/tests/functions_acp/validate_config_vars_test.php +++ b/tests/functions_acp/validate_config_vars_test.php @@ -11,24 +11,25 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case { - protected function setUp() + protected function setUp(): void { parent::setUp(); - global $user; + global $language, $user; $user = new phpbb_mock_user(); $user->lang = new phpbb_mock_lang(); + $language = $user->lang; } /** * Data sets that don't throw an error. */ - public function validate_config_vars_fit_data() + public static function validate_config_vars_fit_data() { return array( array( @@ -44,6 +45,7 @@ public function validate_config_vars_fit_data() 'test_int_32' => array('lang' => 'TEST_INT', 'validate' => 'int:32'), 'test_int_32_64' => array('lang' => 'TEST_INT', 'validate' => 'int:32:64'), 'test_lang' => array('lang' => 'TEST_LANG', 'validate' => 'lang'), + 'test_url' => array('lang' => 'TEST_URL', 'validate' => 'url'), /* 'test_sp' => array('lang' => 'TEST_SP', 'validate' => 'script_path'), 'test_rpath' => array('lang' => 'TEST_RPATH', 'validate' => 'rpath'), @@ -64,6 +66,7 @@ public function validate_config_vars_fit_data() 'test_int_32' => 32, 'test_int_32_64' => 48, 'test_lang' => 'en', + 'test_url' => 'http://foobar.com', ), ), ); @@ -83,7 +86,7 @@ public function test_validate_config_vars_fit($test_data, $cfg_array) /** * Data sets that throw the error. */ - public function validate_config_vars_error_data() + public static function validate_config_vars_error_data() { return array( array( @@ -148,6 +151,11 @@ public function validate_config_vars_error_data() array('test_lang' => 'this_is_no_language'), array('WRONG_DATA_LANG'), ), + array( + array('test_url' => array('lang' => 'TEST_URL', 'validate' => 'url')), + array('test_url' => 'javascript://foobar.com'), + array('URL_INVALID TEST_URL'), + ), ); } @@ -161,100 +169,4 @@ public function test_validate_config_vars_error($test_data, $cfg_array, $expecte $this->assertEquals($expected, $phpbb_error); } - - public function data_validate_path_linux() - { - return array( - array('/usr/bin', 'absolute_path', true), - array('/usr/bin/', 'absolute_path:50:200', true), - array('/usr/bin/which', 'absolute_path', 'DIRECTORY_NOT_DIR'), - array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'), - array('C:\Windows', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'), - array('.', 'absolute_path', true), - array('', 'absolute_path', true), - array('mkdir /foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'), - // Make sure above command didn't do anything - array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'), - ); - } - - /** - * @dataProvider data_validate_path_linux - */ - public function test_validate_path_linux($path, $validation_type, $expected) - { - if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux') - { - $this->markTestSkipped('Unable to test linux specific paths on other OS.'); - } - - $error = array(); - $config_ary = array( - 'path' => $path, - ); - - validate_config_vars(array( - 'path' => array('lang' => 'FOOBAR', 'validate' => $validation_type), - ), - $config_ary, - $error - ); - - if ($expected === true) - { - $this->assertEmpty($error); - } - else - { - $this->assertEquals(array($expected), $error); - } - } - - public function data_validate_path_windows() - { - return array( - array('C:\Windows', 'absolute_path', true), - array('C:\Windows\\', 'absolute_path:50:200', true), - array('C:\Windows\explorer.exe', 'absolute_path', 'DIRECTORY_NOT_DIR'), - array('C:\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'), - array('/usr/bin', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'), - array('.', 'absolute_path', true), - array('', 'absolute_path', true), - array('mkdir C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'), - // Make sure above command didn't do anything - array('C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'), - ); - } - - /** - * @dataProvider data_validate_path_windows - */ - public function test_validate_path_windows($path, $validation_type, $expected) - { - if (strtolower(substr(PHP_OS, 0, 3)) !== 'win') - { - $this->markTestSkipped('Unable to test windows specific paths on other OS.'); - } - - $error = array(); - $config_ary = array( - 'path' => $path, - ); - - validate_config_vars(array( - 'path' => array('lang' => 'FOOBAR', 'validate' => $validation_type), - ), - $config_ary, - $error - ); - - if ($expected === true) - { - $this->assertEmpty($error); - } - else - { - $this->assertEquals(array($expected), $error); - } - } } diff --git a/tests/functions_acp/validate_range_test.php b/tests/functions_acp/validate_range_test.php index 9e9154a43c7..16891d936ba 100644 --- a/tests/functions_acp/validate_range_test.php +++ b/tests/functions_acp/validate_range_test.php @@ -11,11 +11,11 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; class phpbb_functions_acp_validate_range_test extends phpbb_test_case { - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -28,7 +28,7 @@ protected function setUp() /** * Data sets that don't throw an error. */ - public function validate_range_data_fit() + public static function validate_range_data_fit() { return array( array(array(array('column_type' => 'BOOL', 'lang' => 'TEST', 'value' => 0))), @@ -74,7 +74,7 @@ public function test_validate_range_fit($test_data) /** * Data sets that throw the SETTING_TOO_LOW-error. */ - public function validate_range_data_too_low() + public static function validate_range_data_too_low() { return array( array(array(array('column_type' => 'BOOL', 'lang' => 'TEST', 'value' => -1))), @@ -109,7 +109,7 @@ public function test_validate_range_too_low($test_data) /** * Data sets that throw the SETTING_TOO_BIG-error. */ - public function validate_range_data_too_big() + public static function validate_range_data_too_big() { return array( array(array(array('column_type' => 'BOOL', 'lang' => 'TEST', 'value' => 2))), @@ -144,7 +144,7 @@ public function test_validate_range_too_big($test_data) /** * Data sets that throw the SETTING_TOO_LONG-error. */ - public function validate_range_data_too_long() + public static function validate_range_data_too_long() { return array( array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => str_repeat('a', 256)))), diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php new file mode 100644 index 00000000000..0b98018aab5 --- /dev/null +++ b/tests/functions_content/get_context_test.php @@ -0,0 +1,235 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use PHPUnit\Framework\TestCase; + +class phpbb_functions_content_get_context_test extends TestCase +{ + /** + * Data provider for get_context test cases. + * + * @return array + */ + public static function data_get_context(): array + { + return [ + 'text contains words and length greater than text' => [ + 'text' => 'This is a sample text containing several words, including sample, text, and words.', + 'words' => ['sample', 'words'], + 'length' => 100, + 'expected' => 'This is a sample text containing several words, including sample, text, and words.', + ], + 'text contains words and length less than text' => [ + 'text' => 'This is a sample text containing several words, including sample, text, and words.', + 'words' => ['sample', 'words'], + 'length' => 50, + 'expected' => 'This is a sample text containing several words ...', + ], + 'text does not contain words' => [ + 'text' => 'This is a sample text containing several words, but none of them match the given words.', + 'words' => ['nonexistent'], + 'length' => 50, + 'expected' => 'This is a sample text containing several words ...', + ], + 'desired length equal to text length' => [ + 'text' => 'Exact length text.', + 'words' => ['Exact', 'text'], + 'length' => 18, + 'expected' => 'Exact length text.', + ], + 'text with html entities' => [ + 'text' => 'This is a sample text containing & and < and > entities.', + 'words' => ['sample', 'containing'], + 'length' => 50, + 'expected' => 'This is a sample text containing & and < and ...', + ], + 'text with html entities and contains last word' => [ + 'text' => 'This is a sample text containing & and < and > entities.', + 'words' => ['sample', 'entities'], + 'length' => 50, + 'expected' => 'This is a sample text ... and < and > entities.', + ], + 'text with multiple spaces and special characters' => [ + 'text' => 'This is a sample text containing several words.', + 'words' => ['sample', 'several'], + 'length' => 50, + 'expected' => 'This is a sample text containing several words.', + ], + 'empty text' => [ + 'text' => '', + 'words' => ['sample', 'words'], + 'length' => 50, + 'expected' => '', + ], + 'empty words array' => [ + 'text' => 'This is a sample text containing several words.', + 'words' => [], + 'length' => 50, + 'expected' => 'This is a sample text containing several words.', + ], + 'zero length' => [ + 'text' => 'This is a sample text.', + 'words' => ['sample'], + 'length' => 0, + 'expected' => 'This is a sample text.', + ], + 'negative length' => [ + 'text' => 'This is a sample text.', + 'words' => ['sample'], + 'length' => -10, + 'expected' => 'This is a sample text.', + ], + 'ellipses_beginning' => [ + 'text' => 'foo foo foo foo foo foo foo foo bar', + 'words' => ['bar'], + 'length' => 10, + 'expected' => '... foo foo bar', + ], + 'ellipsis_end' => [ + 'text' => 'bar foo foo foo foo foo foo foo foo', + 'words' => ['bar'], + 'length' => 10, + 'expected' => 'bar foo foo ...', + ], + 'ellipsis_middle' => [ + 'text' => 'foo word1 foo foo foo foo foo foo foo foo foo word2 foo', + 'words' => ['word1', 'word2'], + 'length' => 10, + 'expected' => '... word1 ... word2 ...', + ], + 'ellipsis_middle2' => [ + 'text' => 'word1 foo foo foo foo foo foo foo foo foo word2', + 'words' => ['word1', 'word2'], + 'length' => 10, + 'expected' => 'word1 ... word2', + ], + ]; + } + + /** + * Data provider for unicode get_context test cases. + * + * @return array + */ + public static function data_get_context_unicode(): array + { + return [ + 'text contains words and length greater than text unicode' => [ + 'text' => 'Это пример текста, содержащего разнообразные слова, включая пример, текст и слова.', + 'words' => ['пример', 'слова'], + 'length' => 100, + 'expected' => 'Это пример текста, содержащего разнообразные слова, включая пример, текст и слова.', + ], + 'text contains words and length less than text unicode' => [ + 'text' => 'Это пример текста, содержащего разнообразные слова, включая шаблон, текст и слова.', + 'words' => ['пример', 'слова'], + 'length' => 50, + 'expected' => 'Это пример текста, содержащего разнообразные слова ...', + ], + 'text does not contain words unicode' => [ + 'text' => 'Это пример текста, содержащего разнообразные слова, но ни одно из них не совпадает с искомыми.', + 'words' => ['nonexistent'], + 'length' => 50, + 'expected' => 'Это пример текста, содержащего разнообразные слова ...', + ], + 'desired length equal to text length unicode' => [ + 'text' => 'Текст точной длины.', + 'words' => ['Текст', 'точной'], + 'length' => 19, + 'expected' => 'Текст точной длины.', + ], + 'text with html entities unicode' => [ + 'text' => 'Это пример текста, содержащего & и < и > лексемы.', + 'words' => ['пример', 'содержащего'], + 'length' => 40, + 'expected' => 'Это пример текста, содержащего & и < и ...', + ], + 'text with html entities and contains last word unicode' => [ + 'text' => 'Это пример текста, содержащего & и < и > лексемы.', + 'words' => ['пример', 'лексемы'], + 'length' => 40, + 'expected' => 'Это пример текста ... и < и > лексемы.', + ], + 'text with multiple spaces and special characters unicode' => [ + 'text' => 'Это пример текста, содержащего разнообразные слова.', + 'words' => ['пример', 'разнообразные'], + 'length' => 50, + 'expected' => 'Это пример текста, содержащего разнообразные слова.', + ], + 'empty text unicode' => [ + 'text' => '', + 'words' => ['пример', 'слова'], + 'length' => 50, + 'expected' => '', + ], + 'empty words array unicode' => [ + 'text' => 'Это пример текста, содержащего разнообразные слова.', + 'words' => [], + 'length' => 50, + 'expected' => 'Это пример текста, содержащего разнообразные слова.', + ], + 'zero length unicode' => [ + 'text' => 'Это пример текста.', + 'words' => ['пример'], + 'length' => 0, + 'expected' => 'Это пример текста.', + ], + 'negative length unicode' => [ + 'text' => 'Это пример текста.', + 'words' => ['sample'], + 'length' => -10, + 'expected' => 'Это пример текста.', + ], + 'ellipses_beginning unicode' => [ + 'text' => 'раз раз раз раз раз раз раз раз два', + 'words' => ['два'], + 'length' => 10, + 'expected' => '... раз раз два', + ], + 'ellipsis_end unicode' => [ + 'text' => 'два раз раз раз раз раз раз раз раз', + 'words' => ['два'], + 'length' => 10, + 'expected' => 'два раз раз ...', + ], + 'ellipsis_middle unicode' => [ + 'text' => 'раз слово1 раз раз раз раз раз раз раз раз раз слово2 раз', + 'words' => ['слово1', 'слово2'], + 'length' => 15, + 'expected' => '... слово1 ... слово2 ...', + ], + 'ellipsis_middle2 unicode' => [ + 'text' => 'слово1 foo foo foo foo foo foo foo foo foo слово2', + 'words' => ['слово1', 'слово2'], + 'length' => 10, + 'expected' => 'слово1 ... слово2', + ], + 'fruits_spanish unicode' => [ + 'text' => 'Manzana,plátano,naranja,fresa,mango,uva,piña,pera,kiwi,cereza,sandía,melón,papaya,arándano,durazno', + 'words' => ['piña'], + 'length' => 20, + 'expected' => '... uva,piña,pera ...', + ] + ]; + } + + /** + * @dataProvider data_get_context + * @dataProvider data_get_context_unicode + */ + public function test_get_context($text, $words, $length, $expected) + { + $this->assertEquals($expected, get_context($text, $words, $length)); + } + +} diff --git a/tests/functions_content/get_username_string_test.php b/tests/functions_content/get_username_string_test.php index ac36e37e933..3abd10be5cb 100644 --- a/tests/functions_content/get_username_string_test.php +++ b/tests/functions_content/get_username_string_test.php @@ -13,7 +13,7 @@ class phpbb_functions_content_get_username_string_test extends phpbb_test_case { - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -30,7 +30,7 @@ public function setUp() $user->lang['GUEST'] = 'Guest'; } - public function get_username_string_profile_data() + public static function get_username_string_profile_data() { global $phpbb_root_path, $phpEx; @@ -49,7 +49,7 @@ public function test_get_username_string_profile($user_id, $username, $user_colo $this->assertEquals($expected, get_username_string('profile', $user_id, $username, $user_colour, $guest_username, $custom_profile_url)); } - public function get_username_string_username_data() + public static function get_username_string_username_data() { return array( array(ANONYMOUS, '', '', false, false, 'Guest'), @@ -68,7 +68,7 @@ public function test_get_username_string_username($user_id, $username, $user_col $this->assertEquals($expected, get_username_string('username', $user_id, $username, $user_colour, $guest_username, $custom_profile_url)); } - public function get_username_string_colour_data() + public static function get_username_string_colour_data() { return array( array(0, '', '', false, false, ''), @@ -86,7 +86,7 @@ public function test_get_username_string_colour($user_id, $username, $user_colou $this->assertEquals($expected, get_username_string('colour', $user_id, $username, $user_colour, $guest_username, $custom_profile_url)); } - public function get_username_string_full_data() + public static function get_username_string_full_data() { global $phpbb_root_path, $phpEx; @@ -107,7 +107,7 @@ public function test_get_username_string_full($user_id, $username, $user_colour, $this->assertEquals($expected, get_username_string('full', $user_id, $username, $user_colour, $guest_username, $custom_profile_url)); } - public function get_username_string_no_profile_data() + public static function get_username_string_no_profile_data() { return array( array(ANONYMOUS, 'Anonymous', '', false, false, 'Anonymous'), diff --git a/tests/functions_content/phpbb_clean_search_string_test.php b/tests/functions_content/phpbb_clean_search_string_test.php index 34ae0575c53..0744fa1764d 100644 --- a/tests/functions_content/phpbb_clean_search_string_test.php +++ b/tests/functions_content/phpbb_clean_search_string_test.php @@ -13,7 +13,7 @@ class phpbb_functions_content_phpbb_clean_search_string_test extends phpbb_test_case { - public function phpbb_clean_search_string_data() + public static function phpbb_clean_search_string_data() { return array( array('*', ''), diff --git a/tests/functions_content/phpbb_format_quote_test.php b/tests/functions_content/phpbb_format_quote_test.php new file mode 100644 index 00000000000..7156ea7317f --- /dev/null +++ b/tests/functions_content/phpbb_format_quote_test.php @@ -0,0 +1,58 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +require_once __DIR__ . '/../../phpBB/includes/message_parser.php'; + +class phpbb_functions_content_phpbb_format_quote_test extends phpbb_test_case +{ + /** @var \phpbb\language\language */ + protected $lang; + + protected function setUp(): void + { + global $cache, $user, $phpbb_root_path, $phpEx; + + $lang_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $this->lang = new \phpbb\language\language($lang_file_loader); + $user = new \phpbb\user($this->lang, '\phpbb\datetime'); + $user->data['user_options'] = 230271; + $cache = new phpbb_mock_cache(); + + parent::setUp(); + } + + public static function data_phpbb_format_quote() + { + return [ + [true, ['author' => 'admin', 'user_id' => 2], '[quote="username"]quoted[/quote]', '', "[quote=admin user_id=2][quote="username"]quoted[/quote][/quote]\n\n"], + [false, ['author' => 'admin', 'user_id' => 2], '[quote="username"]quoted[/quote]', '', "admin wrote:\n> [quote="username"]quoted[/quote]\n"], + [true, ['author' => 'admin', 'user_id' => 2], '[quote="username"]quoted[/quote]', "[url=http://viewtopic.php?p=1#p1]Subject: Foo[/url]\n\n", "[url=http://viewtopic.php?p=1#p1]Subject: Foo[/url]\n\n[quote=admin user_id=2][quote="username"]quoted[/quote][/quote]\n\n"], + [false, ['author' => 'admin', 'user_id' => 2], '[quote="username"]quoted[/quote]', "http://viewtopic.php?p=1#p1 - Subject: Foo\n\n", "http://viewtopic.php?p=1#p1 - Subject: Foo\n\nadmin wrote:\n> [quote="username"]quoted[/quote]\n"], + ]; + } + + + /** + * @dataProvider data_phpbb_format_quote + */ + public function test_phpbb_format_quote($bbcode_status, $quote_attributes, $message, $message_link, $expected) + { + $text_formatter_utils = new \phpbb\textformatter\s9e\utils(); + + $message_parser = new parse_message($message); + + phpbb_format_quote($this->lang, $message_parser, $text_formatter_utils, $bbcode_status, $quote_attributes, $message_link); + + $this->assertEquals($expected, $message_parser->message); + } +} diff --git a/tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php b/tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php index 150b091ceba..c7c0117dec7 100644 --- a/tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php +++ b/tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_database_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_database_helper.php'; class phpbb_update_rows_avoiding_duplicates_notify_status_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/topics_watch_duplicates.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/topics_watch_duplicates.xml'); } public static function fixture_data() diff --git a/tests/functions_database_helper/update_rows_avoiding_duplicates_test.php b/tests/functions_database_helper/update_rows_avoiding_duplicates_test.php index 0e27f129de7..8d4c7459976 100644 --- a/tests/functions_database_helper/update_rows_avoiding_duplicates_test.php +++ b/tests/functions_database_helper/update_rows_avoiding_duplicates_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_database_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_database_helper.php'; class phpbb_update_rows_avoiding_duplicates_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/bookmarks_duplicates.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/bookmarks_duplicates.xml'); } public static function fixture_data() diff --git a/tests/functions_privmsgs/get_max_setting_from_group_test.php b/tests/functions_privmsgs/get_max_setting_from_group_test.php index fbabf1222a6..ffd602b39df 100644 --- a/tests/functions_privmsgs/get_max_setting_from_group_test.php +++ b/tests/functions_privmsgs/get_max_setting_from_group_test.php @@ -11,19 +11,19 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_privmsgs.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_privmsgs.php'; class phpbb_functions_privmsgs_get_max_setting_from_group_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/get_max_setting_from_group.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/get_max_setting_from_group.xml'); } /** @var \phpbb\db\driver\driver_interface */ protected $db; - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -54,11 +54,9 @@ public function test_get_max_setting_from_group($user_id, $expected, $setting) $this->assertEquals($expected, phpbb_get_max_setting_from_group($this->db, $user_id, $setting)); } - /** - * @expectedException InvalidArgumentException - */ public function test_get_max_setting_from_group_throws() { + $this->expectException('InvalidArgumentException'); phpbb_get_max_setting_from_group($this->db, ANONYMOUS, 'not_a_setting'); } } diff --git a/tests/functions_user/delete_user_test.php b/tests/functions_user/delete_user_test.php index 25042d9f1ba..a7bdcdfb2ba 100644 --- a/tests/functions_user/delete_user_test.php +++ b/tests/functions_user/delete_user_test.php @@ -7,7 +7,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_functions_user_delete_user_test extends phpbb_database_test_case { @@ -16,26 +16,34 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/delete_user.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/delete_user.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); - global $cache, $config, $db, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path; + global $cache, $config, $db, $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpEx; $db = $this->db = $this->new_dbal(); + + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $lang = new \phpbb\language\language($lang_loader); + $user = new \phpbb\user($lang, '\phpbb\datetime'); + $config = new \phpbb\config\config(array( 'load_online_time' => 5, - 'search_type' => '\phpbb\search\fulltext_mysql', + 'search_type' => '\phpbb\search\backend\fulltext_mysql', )); $cache = new phpbb_mock_null_cache(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $phpbb_container = new phpbb_mock_container_builder(); $phpbb_container->set('notification_manager', new phpbb_mock_notification_manager()); + + $storage = $this->createMock('\phpbb\storage\storage'); + // Works as a workaround for tests - $phpbb_container->set('attachment.manager', new \phpbb\attachment\delete($config, $db, new \phpbb_mock_event_dispatcher(), new \phpbb\filesystem\filesystem(), new \phpbb\attachment\resync($db), $phpbb_root_path)); + $phpbb_container->set('attachment.manager', new \phpbb\attachment\delete($config, $db, new \phpbb_mock_event_dispatcher(), new \phpbb\attachment\resync($db), $storage)); $phpbb_container->set( 'auth.provider.db', new phpbb_mock_auth_provider() @@ -46,24 +54,36 @@ protected function setUp() 'auth.provider_collection', $provider_collection ); + + $search_backend = $this->createMock(\phpbb\search\backend\search_backend_interface::class); + $search_backend_factory = $this->createMock(\phpbb\search\search_backend_factory::class); + $search_backend_factory->method('get_active')->willReturn($search_backend); + $phpbb_container->set('search.backend_factory', $search_backend_factory); + + + $phpbb_container->setParameter('tables.auth_provider_oauth_token_storage', 'phpbb_oauth_tokens'); + $phpbb_container->setParameter('tables.auth_provider_oauth_states', 'phpbb_oauth_states'); + $phpbb_container->setParameter('tables.auth_provider_oauth_account_assoc', 'phpbb_oauth_accounts'); + + $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); } - public function first_last_post_data() + public static function first_last_post_data() { return array( array( 'retain', false, array( - array('post_id' => 1, 'poster_id' => ANONYMOUS, 'post_username' => ''), + array('post_id' => 1, 'poster_id' => ANONYMOUS, 'post_username' => 'Guest'), array('post_id' => 2, 'poster_id' => ANONYMOUS, 'post_username' => 'Other'), - array('post_id' => 3, 'poster_id' => ANONYMOUS, 'post_username' => ''), + array('post_id' => 3, 'poster_id' => ANONYMOUS, 'post_username' => 'Guest'), array('post_id' => 4, 'poster_id' => ANONYMOUS, 'post_username' => 'Other'), ), array( array( 'topic_id' => 1, - 'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => '', 'topic_first_poster_colour' => '', - 'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => '', 'topic_last_poster_colour' => '', + 'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => 'Guest', 'topic_first_poster_colour' => '', + 'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => 'Guest', 'topic_last_poster_colour' => '', ), array( 'topic_id' => 2, @@ -72,8 +92,8 @@ public function first_last_post_data() ), array( 'topic_id' => 3, - 'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => '', 'topic_first_poster_colour' => '', - 'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => '', 'topic_last_poster_colour' => '', + 'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => 'Guest', 'topic_first_poster_colour' => '', + 'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => 'Guest', 'topic_last_poster_colour' => '', ), array( 'topic_id' => 4, @@ -82,9 +102,9 @@ public function first_last_post_data() ), ), array( - array('forum_id' => 1, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => '', 'forum_last_poster_colour' => ''), + array('forum_id' => 1, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Guest', 'forum_last_poster_colour' => ''), array('forum_id' => 2, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Other', 'forum_last_poster_colour' => ''), - array('forum_id' => 3, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => '', 'forum_last_poster_colour' => ''), + array('forum_id' => 3, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Guest', 'forum_last_poster_colour' => ''), array('forum_id' => 4, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Other', 'forum_last_poster_colour' => ''), ), ), @@ -207,7 +227,7 @@ public function test_first_last_post_info($mode, $retain_username, $expected_pos $this->db->sql_freeresult($result); } - public function report_attachment_data() + public static function report_attachment_data() { return array( array( @@ -291,7 +311,7 @@ public function test_report_attachment_info($mode, $expected_posts, $expected_re $this->db->sql_freeresult($result); } - public function delete_data() + public static function delete_data() { return array( array( @@ -349,7 +369,7 @@ public function test_delete_data($mode, $expected_users, $expected_zebra, $expec $this->db->sql_freeresult($result); $sql = 'SELECT ban_id - FROM ' . BANLIST_TABLE . ' + FROM ' . BANS_TABLE . ' ORDER BY ban_id ASC'; $result = $this->db->sql_query($sql); $this->assertEquals($expected_ban, $this->db->sql_fetchrowset($result), 'Ban table content is mismatching after deleting a user.'); @@ -377,7 +397,7 @@ public function test_delete_data($mode, $expected_users, $expected_zebra, $expec $this->db->sql_freeresult($result); } - public function delete_user_id_data() + public static function delete_user_id_data() { return array( array( diff --git a/tests/functions_user/fixtures/delete_user.xml b/tests/functions_user/fixtures/delete_user.xml index 8de26597229..c149a42429b 100644 --- a/tests/functions_user/fixtures/delete_user.xml +++ b/tests/functions_user/fixtures/delete_user.xml @@ -36,30 +36,42 @@ - +
      ban_idban_userid - ban_email + ban_mode + ban_item + ban_start + ban_endban_reason - ban_give_reason + ban_reason_display 1 2 - + user + 2 + 0 + 0 2 3 - + user + 3 + 0 + 0 3 0 - + user + 0 + 0 + 0 diff --git a/tests/functions_user/group_user_attributes_test.php b/tests/functions_user/group_user_attributes_test.php index 6968b1cd3a4..c0d884e4d8b 100644 --- a/tests/functions_user/group_user_attributes_test.php +++ b/tests/functions_user/group_user_attributes_test.php @@ -11,16 +11,16 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_functions_user_group_user_attributes_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/group_user_attributes.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/group_user_attributes.xml'); } - public function group_user_attributes_data() + public static function group_user_attributes_data() { return array( array( @@ -131,6 +131,7 @@ public function test_group_user_attributes($description, $user_id, $group_id, $g $user = new phpbb_mock_user; $user->ip = ''; + $user->data['user_id'] = $user_id; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); diff --git a/tests/functions_user/whois_test.php b/tests/functions_user/whois_test.php new file mode 100644 index 00000000000..5dfe6f4930f --- /dev/null +++ b/tests/functions_user/whois_test.php @@ -0,0 +1,54 @@ +getMockBuilder('\phpbb\user') + ->setConstructorArgs([ + new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), + '\phpbb\datetime', + ]) + ->getMock(); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $config = new \phpbb\config\config([]); + $request = $this->getMockBuilder('\phpbb\request\request') + ->getMock(); + $symfony_request = $this->getMockBuilder('\phpbb\symfony_request') + ->disableOriginalConstructor() + ->getMock(); + } + + public static function ips_data() + { + return [ + ['2001:4860:4860::8888'], // Google public DNS (ARIN) + ['64.233.161.139'], // google.com (ARIN) + ['1.1.1.1'], // Cloudflare (APNIC via whois:// referral) + ['213.133.116.44'], // Hetzner (RIPE via non-whois:// referral) + ]; + } + + /** + * @dataProvider ips_data + */ + public function test_ip_whois($ip) + { + $ip_whois = user_ipwhois($ip); + $this->assertStringNotContainsString('Query terms are ambiguous', $ip_whois); + $this->assertStringNotContainsString('no entries found', $ip_whois); + $this->assertStringNotContainsString('ERROR', $ip_whois); + $this->assertStringNotContainsString('Allocated to RIPE NCC', $ip_whois); // This only shows if the referral isn't found + } +} diff --git a/tests/group/helper_get_name_string_test.php b/tests/group/helper_get_name_string_test.php new file mode 100644 index 00000000000..154fcb2f626 --- /dev/null +++ b/tests/group/helper_get_name_string_test.php @@ -0,0 +1,115 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +require_once __DIR__ . '/helper_test_case.php'; + +class phpbb_group_helper_get_name_string_test extends phpbb_group_helper_test_case +{ + + public static function get_name_string_profile_data() + { + global $phpbb_root_path, $phpEx; + + return array( + array(0, 'Non existing group', '', false, ''), + array(2, 'Administrators', 'AA0000', false, "{$phpbb_root_path}memberlist.$phpEx?mode=group&g=2"), + array(42, 'Example Group', '', 'http://www.example.org/group.php?mode=show', 'http://www.example.org/group.php?mode=show&g=42'), + ); + } + + /** + * @dataProvider get_name_string_profile_data + */ + public function test_get_name_string_profile($group_id, $group_name, $group_colour, $custom_profile_url, $expected) + { + $this->assertEquals($expected, $this->group_helper->get_name_string('profile', $group_id, $group_name, $group_colour, $custom_profile_url)); + } + + public static function get_name_string_group_name_data() + { + return array( + // Should be fine + array(0, 'BOTS', 'AA0000', false, 'Bots'), + array(1, 'new_group', '', false, 'Some new group'), + array(2, 'group_with_ümlauts', '', 'http://www.example.org/group.php?mode=show', 'Should work'), + + // Should fail and thus return the same + array(3, 'not_uppercase', 'FFFFFF', false, 'not_uppercase'), + array(4, 'Awesome group', '', false, 'Awesome group'), + ); + } + + /** + * @dataProvider get_name_string_group_name_data + */ + public function test_get_name_string_group_name($group_id, $group_name, $group_colour, $custom_profile_url, $expected) + { + $this->assertEquals($expected, $this->group_helper->get_name_string('group_name', $group_id, $group_name, $group_colour, $custom_profile_url)); + } + + public static function get_name_string_colour_data() + { + return array( + array(0, '', '', false, ''), + array(0, '', 'F0F0F0', false, '#F0F0F0'), + array(1, 'Guests', '000000', false, '#000000'), + array(2, 'Administrators', '', false, ''), + ); + } + + /** + * @dataProvider get_name_string_colour_data + */ + public function test_get_name_string_colour($group_id, $group_name, $group_colour, $custom_profile_url, $expected) + { + $this->assertEquals($expected, $this->group_helper->get_name_string('colour', $group_id, $group_name, $group_colour, $custom_profile_url)); + } + + public static function get_name_string_full_data() + { + global $phpbb_root_path, $phpEx; + + return array( + array(0, 'BOTS', '000000', false, 'Bots'), + array(1, 'BOTS', '111111', false, 'Bots'), + array(7, 'new_group', 'FFA500', false, 'Some new group'), + array(14, 'Awesome group', '', 'http://www.example.org/group.php?mode=show', 'Awesome group'), + ); + } + + /** + * @dataProvider get_name_string_full_data + */ + public function test_get_name_string_full($group_id, $group_name, $group_colour, $custom_profile_url, $expected) + { + $this->assertEquals($expected, $this->group_helper->get_name_string('full', $group_id, $group_name, $group_colour, $custom_profile_url)); + } + + public static function get_name_string_no_profile_data() + { + return array( + array(0, 'BOTS', '000000', false, 'Bots'), + array(1, 'new_group', '', false, 'Some new group'), + array(2, 'not_uppercase', 'FF0000', false, 'not_uppercase'), + array(5, 'Awesome group', '', 'http://www.example.org/group.php?mode=show', 'Awesome group'), + ); + } + + /** + * @dataProvider get_name_string_no_profile_data + */ + public function test_get_name_string_no_profile($group_id, $group_name, $group_colour, $custom_profile_url, $expected) + { + $this->assertEquals($expected, $this->group_helper->get_name_string('no_profile', $group_id, $group_name, $group_colour, $custom_profile_url)); + } +} diff --git a/tests/group/helper_get_name_test.php b/tests/group/helper_get_name_test.php new file mode 100644 index 00000000000..d7e906ce9c9 --- /dev/null +++ b/tests/group/helper_get_name_test.php @@ -0,0 +1,31 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +require_once __DIR__ . '/helper_test_case.php'; + +class phpbb_group_helper_get_name_test extends phpbb_group_helper_test_case +{ + public function test_get_name() + { + // They should be totally fine + $this->assertEquals('Bots', $this->group_helper->get_name('Bots')); + $this->assertEquals('Some new group', $this->group_helper->get_name('new_group')); + $this->assertEquals('Should work', $this->group_helper->get_name('group_with_ümlauts')); + + // This should fail (obviously) + $this->assertNotEquals('The key does not contain uppercase letters', $this->group_helper->get_name('not_uppercase')); + + // The key doesn't exist so just return group name... + $this->assertEquals('Awesome group', $this->group_helper->get_name('Awesome group')); + } +} diff --git a/tests/group/helper_get_rank_test.php b/tests/group/helper_get_rank_test.php new file mode 100644 index 00000000000..5d427b49ee2 --- /dev/null +++ b/tests/group/helper_get_rank_test.php @@ -0,0 +1,43 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +require_once __DIR__ . '/helper_test_case.php'; + +class phpbb_group_helper_get_rank_test extends phpbb_group_helper_test_case +{ + public static function get_rank_data() + { + global $phpbb_root_path; + + return array( + array( + array('group_id' => 0, 'group_rank' => 1), + array( + 'title' => 'Site admin', + 'img' => 'Site admin', + 'img_src' => $phpbb_root_path . 'images/ranks/siteadmin.png', + ) + ), + array(array('group_id' => 1, 'group_rank' => 0), array('title' => null, 'img' => null, 'img_src' => null)), + array(array('group_id' => 2, 'group_rank' => 2), array('title' => 'Test member', 'img' => '', 'img_src' => '')), + ); + } + + /** + * @dataProvider get_rank_data + */ + public function test_get_rank($group_data, $expected) + { + $this->assertEquals($expected, $this->group_helper->get_rank($group_data)); + } +} diff --git a/tests/group/helper_test.php b/tests/group/helper_test.php deleted file mode 100644 index 2377a6f47cf..00000000000 --- a/tests/group/helper_test.php +++ /dev/null @@ -1,68 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -class phpbb_group_helper_test extends phpbb_test_case -{ - /** @var \phpbb\group\helper */ - protected $group_helper; - - public function setUp() - { - global $phpbb_root_path, $phpEx; - - // Set up language service - $lang = new \phpbb\language\language( - new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx) - ); - - // Set up language data for testing - $reflection_class = new ReflectionClass('\phpbb\language\language'); - - // Set default language files loaded flag to true - $loaded_flag = $reflection_class->getProperty('common_language_files_loaded'); - $loaded_flag->setAccessible(true); - $loaded_flag->setValue($lang, true); - - // Set up test language data - $lang_array = $reflection_class->getProperty('lang'); - $lang_array->setAccessible(true); - $lang_array->setValue($lang, $this->get_test_language_data_set()); - - // Set up group helper - $this->group_helper = new \phpbb\group\helper($lang); - } - - public function test_get_name() - { - // They should be totally fine - $this->assertEquals('Bots', $this->group_helper->get_name('Bots')); - $this->assertEquals('Some new group', $this->group_helper->get_name('new_group')); - $this->assertEquals('Should work', $this->group_helper->get_name('group_with_ümlauts')); - - // This should fail (obviously) - $this->assertNotEquals('They key does not contain uppercase letters', $this->group_helper->get_name('not_uppercase')); - - // The key doesn't exist so just return group name... - $this->assertEquals('Awesome group', $this->group_helper->get_name('Awesome group')); - } - - protected function get_test_language_data_set() - { - return array( - 'G_BOTS' => 'Bots', - 'G_NEW_GROUP' => 'Some new group', - 'G_not_uppercase' => 'The key does not contain uppercase letters', - 'G_GROUP_WITH_ÜMLAUTS' => 'Should work', - ); - } -} diff --git a/tests/group/helper_test_case.php b/tests/group/helper_test_case.php new file mode 100644 index 00000000000..e23a1d8f467 --- /dev/null +++ b/tests/group/helper_test_case.php @@ -0,0 +1,130 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class phpbb_group_helper_test_case extends phpbb_test_case +{ + /** @var \phpbb\group\helper */ + protected $group_helper; + + protected function config_defaults() + { + $defaults = array( + 'ranks_path' => 'images/ranks' + ); + return $defaults; + } + + protected function get_test_language_data_set() + { + return array( + 'G_BOTS' => 'Bots', + 'G_NEW_GROUP' => 'Some new group', + 'G_not_uppercase' => 'The key does not contain uppercase letters', + 'G_GROUP_WITH_ÜMLAUTS' => 'Should work', + ); + } + + protected function get_test_rank_data_set() + { + return array( + 'special' => array( + 1 => array( + 'rank_id' => 1, + 'rank_title' => 'Site admin', + 'rank_special' => 1, + 'rank_image' => 'siteadmin.png', + ), + 2 => array( + 'rank_id' => 2, + 'rank_title' => 'Test member', + 'rank_special' => 1, + 'rank_image' => '', + ) + ) + ); + } + + protected function setup_engine(array $new_config = array()) + { + global $phpbb_dispatcher, $phpbb_root_path, $phpEx; + + // Set up authentication data for testing + $auth = $this->getMockBuilder('\phpbb\auth\auth')->disableOriginalConstructor()->getMock(); + $auth->expects($this->any()) + ->method('acl_get') + ->with($this->stringContains('_'), $this->anything()) + ->will($this->returnValueMap(array( + array('u_viewprofile', true), + ))); + + // Set up database connection for testing + $db = $this->getMockBuilder('\phpbb\db\driver\driver_interface')->getMock(); + + // Set up cache service + $cache_service = $this->getMockBuilder('\phpbb\cache\service')->disableOriginalConstructor()->getMock(); + $cache_service->expects($this->any()) + ->method('obtain_ranks') + ->will($this->returnValue($this->get_test_rank_data_set())); + + // Set up configuration + $defaults = $this->config_defaults(); + $config = new \phpbb\config\config(array_merge($defaults, $new_config)); + + // Set up language service + $lang = new \phpbb\language\language( + new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx) + ); + + // Set up language data for testing + $reflection_class = new ReflectionClass('\phpbb\language\language'); + + // Set default language files loaded flag to true + $loaded_flag = $reflection_class->getProperty('common_language_files_loaded'); + $loaded_flag->setValue($lang, true); + + // Set up test language data + $lang_array = $reflection_class->getProperty('lang'); + $lang_array->setValue($lang, $this->get_test_language_data_set()); + + // Set up event dispatcher + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + + // Set up path helper + $path_helper = $this->getMockBuilder('\phpbb\path_helper') + ->disableOriginalConstructor() + ->onlyMethods(['get_phpbb_root_path', 'get_php_ext', 'update_web_root_path']) + ->getMock(); + $path_helper->method('get_phpbb_root_path') + ->willReturn($phpbb_root_path); + $path_helper->method('get_php_ext') + ->willReturn($phpEx); + $path_helper->method('update_web_root_path') + ->will($this->returnArgument(0)); + + $template = $this->getMockBuilder('\phpbb\template\template')->disableOriginalConstructor()->getMock(); + + $user = new \phpbb\user($lang, '\phpbb\datetime'); + $user->data['user_id'] = ANONYMOUS; + + $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') + ->disableOriginalConstructor() + ->getMock(); + + $this->group_helper = new \phpbb\group\helper($auth, $avatar_helper, $db, $cache_service, $config, $lang, $phpbb_dispatcher, $path_helper, $template, $user); + } + + protected function setUp(): void + { + $this->setup_engine(); + } +} diff --git a/tests/groupposition/legend_test.php b/tests/groupposition/legend_test.php index 02ddb7cbceb..9381cd8b5fd 100644 --- a/tests/groupposition/legend_test.php +++ b/tests/groupposition/legend_test.php @@ -15,10 +15,10 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/legend.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/legend.xml'); } - public function get_group_value_data() + public static function get_group_value_data() { return array( array(1, 0, ''), @@ -32,40 +32,32 @@ public function get_group_value_data() */ public function test_get_group_value($group_id, $expected, $throws_exception) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); if ($throws_exception) { - $this->setExpectedException($throws_exception); + $this->expectException($throws_exception); } - $test_class = new \phpbb\groupposition\legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db); $this->assertEquals($expected, $test_class->get_group_value($group_id)); } public function test_get_group_count() { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db); $this->assertEquals(2, $test_class->get_group_count()); } - public function add_group_data() + public static function add_group_data() { return array( array( @@ -94,16 +86,12 @@ public function add_group_data() */ public function test_add_group($group_id, $expected_added, $expected) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db); $this->assertEquals($expected_added, $test_class->add_group($group_id)); $result = $db->sql_query('SELECT group_id, group_legend @@ -113,7 +101,7 @@ public function test_add_group($group_id, $expected_added, $expected) $this->assertEquals($expected, $db->sql_fetchrowset($result)); } - public function delete_group_data() + public static function delete_group_data() { return array( array( @@ -184,16 +172,12 @@ public function delete_group_data() */ public function test_delete_group($group_id, $skip_group, $expected_deleted, $expected) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db); $this->assertEquals($expected_deleted, $test_class->delete_group($group_id, $skip_group)); $result = $db->sql_query('SELECT group_id, group_legend @@ -203,7 +187,7 @@ public function test_delete_group($group_id, $skip_group, $expected_deleted, $ex $this->assertEquals($expected, $db->sql_fetchrowset($result)); } - public function move_up_data() + public static function move_up_data() { return array( array( @@ -241,16 +225,12 @@ public function move_up_data() */ public function test_move_up($group_id, $excepted_moved, $expected) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db); $this->assertEquals($excepted_moved, $test_class->move_up($group_id)); $result = $db->sql_query('SELECT group_id, group_legend @@ -260,7 +240,7 @@ public function test_move_up($group_id, $excepted_moved, $expected) $this->assertEquals($expected, $db->sql_fetchrowset($result)); } - public function move_down_data() + public static function move_down_data() { return array( array( @@ -298,16 +278,12 @@ public function move_down_data() */ public function test_move_down($group_id, $excepted_moved, $expected) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db); $this->assertEquals($excepted_moved, $test_class->move_down($group_id)); $result = $db->sql_query('SELECT group_id, group_legend @@ -317,7 +293,7 @@ public function test_move_down($group_id, $excepted_moved, $expected) $this->assertEquals($expected, $db->sql_fetchrowset($result)); } - public function move_data() + public static function move_data() { return array( array( @@ -398,16 +374,12 @@ public function move_data() */ public function test_move($group_id, $increment, $excepted_moved, $expected) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db); $this->assertEquals($excepted_moved, $test_class->move($group_id, $increment)); $result = $db->sql_query('SELECT group_id, group_legend @@ -417,4 +389,3 @@ public function test_move($group_id, $increment, $excepted_moved, $expected) $this->assertEquals($expected, $db->sql_fetchrowset($result)); } } - diff --git a/tests/groupposition/teampage_test.php b/tests/groupposition/teampage_test.php index 3b916670f7c..56200996989 100644 --- a/tests/groupposition/teampage_test.php +++ b/tests/groupposition/teampage_test.php @@ -15,10 +15,10 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/teampage.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/teampage.xml'); } - public function get_group_value_data() + public static function get_group_value_data() { return array( array(2, 3, ''), @@ -32,40 +32,32 @@ public function get_group_value_data() */ public function test_get_group_value($group_id, $expected, $throws_exception) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); if ($throws_exception) { - $this->setExpectedException($throws_exception); + $this->expectException($throws_exception); } - $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $cache); $this->assertEquals($expected, $test_class->get_group_value($group_id)); } public function test_get_group_count() { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $cache); $this->assertEquals(8, $test_class->get_group_count()); } - public function add_group_teampage_data() + public static function add_group_teampage_data() { return array( array( @@ -138,16 +130,12 @@ public function add_group_teampage_data() */ public function test_add_group_teampage($group_id, $parent_id, $expected_added, $expected) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $cache); $this->assertEquals($expected_added, $test_class->add_group_teampage($group_id, $parent_id)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name @@ -157,7 +145,7 @@ public function test_add_group_teampage($group_id, $parent_id, $expected_added, $this->assertEquals($expected, $db->sql_fetchrowset($result)); } - public function add_category_teampage_data() + public static function add_category_teampage_data() { return array( array( @@ -183,16 +171,12 @@ public function add_category_teampage_data() */ public function test_add_category_teampage($group_name, $expected_added, $expected) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $cache); $this->assertEquals($expected_added, $test_class->add_category_teampage($group_name)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name @@ -202,7 +186,7 @@ public function test_add_category_teampage($group_name, $expected_added, $expect $this->assertEquals($expected, $db->sql_fetchrowset($result)); } - public function delete_group_data() + public static function delete_group_data() { return array( array( @@ -252,16 +236,12 @@ public function delete_group_data() */ public function test_delete_group($group_id, $expected_deleted, $expected) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $cache); $this->assertEquals($expected_deleted, $test_class->delete_group($group_id, false)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name @@ -271,7 +251,7 @@ public function test_delete_group($group_id, $expected_deleted, $expected) $this->assertEquals($expected, $db->sql_fetchrowset($result)); } - public function delete_teampage_data() + public static function delete_teampage_data() { return array( array( @@ -306,16 +286,12 @@ public function delete_teampage_data() */ public function test_delete_teampage($teampage_id, $expected_deleted, $expected) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $cache); $this->assertEquals($expected_deleted, $test_class->delete_teampage($teampage_id, false)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name @@ -325,7 +301,7 @@ public function test_delete_teampage($teampage_id, $expected_deleted, $expected) $this->assertEquals($expected, $db->sql_fetchrowset($result)); } - public function move_data() + public static function move_data() { return array( array( @@ -471,16 +447,12 @@ public function move_data() */ public function test_move($group_id, $move_delta, $excepted_moved, $expected) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $cache); $this->assertEquals($excepted_moved, $test_class->move($group_id, $move_delta)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name @@ -490,7 +462,7 @@ public function test_move($group_id, $move_delta, $excepted_moved, $expected) $this->assertEquals($expected, $db->sql_fetchrowset($result)); } - public function move_teampage_data() + public static function move_teampage_data() { return array( array( @@ -636,16 +608,12 @@ public function move_teampage_data() */ public function test_move_teampage($teampage_id, $move_delta, $excepted_moved, $expected) { - global $cache, $phpbb_root_path, $phpEx; + global $cache; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = array(); - $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $cache); $this->assertEquals($excepted_moved, $test_class->move_teampage($teampage_id, $move_delta)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name @@ -655,4 +623,3 @@ public function test_move_teampage($teampage_id, $move_delta, $excepted_moved, $ $this->assertEquals($expected, $db->sql_fetchrowset($result)); } } - diff --git a/tests/help/manager_test.php b/tests/help/manager_test.php index 68534d9a32f..428e0e5201b 100644 --- a/tests/help/manager_test.php +++ b/tests/help/manager_test.php @@ -20,7 +20,7 @@ class phpbb_help_manager_test extends phpbb_test_case /** @var \phpbb\language\language */ protected $language; - public function setUp() + protected function setUp(): void { $this->template = $this->getMockBuilder('\phpbb\template\template') ->disableOriginalConstructor() @@ -36,7 +36,7 @@ public function setUp() ); } - public function add_block_data() + public static function add_block_data() { return array( array('abc', false, array(), false), @@ -64,54 +64,49 @@ public function add_block_data() */ public function test_add_block($block_name, $switch, $questions, $switch_expected) { - $this->language->expects($this->at(0)) - ->method('lang') - ->with($block_name) - ->willReturn(strtoupper($block_name)); - $lang_call_count = 1; + $question_ary = $question_ary_upper = $template_call_args = []; foreach ($questions as $question => $answer) { - $this->language->expects($this->at($lang_call_count)) - ->method('lang') - ->with($question) - ->willReturn(strtoupper($question)); - $lang_call_count++; - - $this->language->expects($this->at($lang_call_count)) - ->method('lang') - ->with($answer) - ->willReturn(strtoupper($answer)); - $lang_call_count++; + $question_ary = array_merge($question_ary, [[$question], [$answer]]); + $question_ary_upper = array_merge($question_ary_upper, [strtoupper($question), strtoupper($answer)]); + $template_call_args = array_merge($template_call_args, [['faq_block.faq_row', [ + 'FAQ_QUESTION' => strtoupper($question), + 'FAQ_ANSWER' => strtoupper($answer), + ] + ]]); } - $this->template->expects($this->at(0)) - ->method('assign_block_vars') - ->with('faq_block', array( + $this->language->expects($this->exactly(count($questions)*2 + 1)) + ->method('lang') + ->willReturnCallback(fn(string $arg) => strtoupper($arg)); + + $expected_calls = [ + ['faq_block', [ 'BLOCK_TITLE' => strtoupper($block_name), 'SWITCH_COLUMN' => $switch_expected, - )); - $template_call_count = 1; - foreach ($questions as $question => $answer) - { - $this->template->expects($this->at($template_call_count)) - ->method('assign_block_vars') - ->with('faq_block.faq_row', array( - 'FAQ_QUESTION' => strtoupper($question), - 'FAQ_ANSWER' => strtoupper($answer), - )); - $template_call_count++; - } + ]], + ...$template_call_args + ]; + + $this->template->expects($this->exactly(count($questions) + 1)) + ->method('assign_block_vars') + ->willReturnCallback(function($blockName, $blockVars) use (&$expected_calls) { + static $call = 0; + $this->assertEquals($expected_calls[$call][0], $blockName); + $this->assertEquals($expected_calls[$call][1], $blockVars); + $call++; + }); $this->manager->add_block($block_name, $switch, $questions); $this->assertEquals($switch_expected, $this->manager->switched_column()); } - public function add_question_data() + public static function add_question_data() { return array( - array('abc', false, false), - array('def', true, true), + array('question1', 'answer1'), + array('question2', 'answer2'), ); } @@ -123,14 +118,9 @@ public function add_question_data() */ public function test_add_question($question, $answer) { - $this->language->expects($this->at(0)) + $this->language->expects($this->exactly(2)) ->method('lang') - ->with($question) - ->willReturn(strtoupper($question)); - $this->language->expects($this->at(1)) - ->method('lang') - ->with($answer) - ->willReturn(strtoupper($answer)); + ->willReturnCallback(fn(string $arg) => strtoupper($arg)); $this->template->expects($this->once()) ->method('assign_block_vars') @@ -144,41 +134,38 @@ public function test_add_question($question, $answer) public function test_add_block_double_switch() { - $block_name = 'abc'; - $switch_expected = true; + $block_name = ['abc', 'def']; + $switch_expected = [true, false]; - $this->language->expects($this->at(0)) + $this->language->expects($this->exactly(2)) ->method('lang') - ->with($block_name) - ->willReturn(strtoupper($block_name)); - - $this->template->expects($this->at(0)) + ->willReturnCallback(fn(string $arg) => strtoupper($arg)); + + $expected_calls = [ + ['faq_block', [ + 'BLOCK_TITLE' => strtoupper($block_name[0]), + 'SWITCH_COLUMN' => $switch_expected[0], + ]], + ['faq_block', [ + 'BLOCK_TITLE' => strtoupper($block_name[1]), + 'SWITCH_COLUMN' => $switch_expected[1], + ]] + ]; + + $this->template->expects($this->exactly(count($expected_calls))) ->method('assign_block_vars') - ->with('faq_block', array( - 'BLOCK_TITLE' => strtoupper($block_name), - 'SWITCH_COLUMN' => $switch_expected, - )); - - $this->manager->add_block($block_name, true); + ->willReturnCallback(function($blockName, $blockVars) use (&$expected_calls) { + static $call = 0; + $this->assertEquals($expected_calls[$call][0], $blockName); + $this->assertEquals($expected_calls[$call][1], $blockVars); + $call++; + }); + + $this->manager->add_block($block_name[0], true); $this->assertTrue($this->manager->switched_column()); // Add a second block with switch - $block_name = 'def'; - $switch_expected = false; - - $this->language->expects($this->at(0)) - ->method('lang') - ->with($block_name) - ->willReturn(strtoupper($block_name)); - - $this->template->expects($this->at(0)) - ->method('assign_block_vars') - ->with('faq_block', array( - 'BLOCK_TITLE' => strtoupper($block_name), - 'SWITCH_COLUMN' => $switch_expected, - )); - - $this->manager->add_block($block_name, true); + $this->manager->add_block($block_name[1], true); $this->assertTrue($this->manager->switched_column()); } } diff --git a/tests/installer/database_helper_test.php b/tests/installer/database_helper_test.php index ed355884f61..306a8c1926a 100644 --- a/tests/installer/database_helper_test.php +++ b/tests/installer/database_helper_test.php @@ -18,7 +18,7 @@ class phpbb_installer_database_helper_test extends phpbb_test_case */ private $database_helper; - public function setUp() + protected function setUp(): void { $filesystem = new \phpbb\filesystem\filesystem(); $phpbb_root_path = ''; @@ -57,7 +57,7 @@ public function test_split_sql($expected, $sql, $delimiter) public function test_validate_table_prefix($expected, $test_string) { $db_helper_mock = $this->getMockBuilder('\phpbb\install\helper\database') - ->setMethods(array('get_available_dbms')) + ->onlyMethods(array('get_available_dbms')) ->disableOriginalConstructor() ->getMock(); @@ -76,7 +76,7 @@ public function test_validate_table_prefix($expected, $test_string) } // Data provider for the remove comments function - public function comment_string_provider() + public static function comment_string_provider() { return array( array( @@ -99,7 +99,7 @@ public function comment_string_provider() } // Data provider for the sql file splitter function - public function sql_file_string_provider() + public static function sql_file_string_provider() { return array( array( @@ -116,7 +116,7 @@ public function sql_file_string_provider() } // Test data for prefix test - public function prefix_test_case_provider() + public static function prefix_test_case_provider() { return array( array( diff --git a/tests/installer/installer_config_test.php b/tests/installer/installer_config_test.php index 1193d7aee45..5e19a9d640b 100644 --- a/tests/installer/installer_config_test.php +++ b/tests/installer/installer_config_test.php @@ -20,14 +20,14 @@ class phpbb_installer_config_test extends phpbb_test_case */ private $config; - public function setUp() + protected function setUp(): void { $phpbb_root_path = __DIR__ . './../../phpBB/'; $filesystem = $this->createMock('\phpbb\filesystem\filesystem'); $php_ini = $this->getMockBuilder('\bantu\IniGetWrapper\IniGetWrapper') - ->setMethods(array('getInt', 'getBytes')) + ->onlyMethods(array('getNumeric', 'getBytes')) ->getMock(); - $php_ini->method('getInt') + $php_ini->method('getNumeric') ->willReturn(-1); $php_ini->method('getBytes') ->willReturn(-1); diff --git a/tests/installer/module_base_test.php b/tests/installer/module_base_test.php index 71ec2b8db24..d28ce276297 100644 --- a/tests/installer/module_base_test.php +++ b/tests/installer/module_base_test.php @@ -26,7 +26,7 @@ class module_base_test extends phpbb_test_case */ protected $container; - public function setUp() + protected function setUp(): void { // DI container mock $this->container = new phpbb_mock_container_builder(); @@ -43,7 +43,7 @@ public function setUp() $this->module = new test_installer_module($module_collection, true, false); $iohandler = $this->createMock('\phpbb\install\helper\iohandler\iohandler_interface'); - $config = new \phpbb\install\helper\config(new \phpbb\filesystem\filesystem(), new \bantu\IniGetWrapper\IniGetWrapper(), '', 'php'); + $config = new \phpbb\install\helper\config(new \phpbb\filesystem\filesystem(), new \bantu\IniGetWrapper\IniGetWrapper(), ''); $this->module->setup($config, $iohandler); } diff --git a/tests/json/sanitizer_test.php b/tests/json/sanitizer_test.php new file mode 100644 index 00000000000..286d02d6f11 --- /dev/null +++ b/tests/json/sanitizer_test.php @@ -0,0 +1,35 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\json\sanitizer as json_sanitizer; + +class phpbb_json_sanitizer_test extends phpbb_test_case +{ + public static function data_decode() + { + return [ + [false, []], + ['', []], + ['{ "name": "phpbb/phpbb-style-prosilver"}', ['name' => 'phpbb/phpbb-style-prosilver']], + ['{ "name":[[ "phpbb/phpbb-style-prosilver"}', []], + ]; + } + + /** + * @dataProvider data_decode + */ + public function test_decode_data($input, $output) + { + $this->assertEquals($output, json_sanitizer::decode($input)); + } +} diff --git a/tests/language/language_test.php b/tests/language/language_test.php index 29b4873dcbc..eaf2d5c800c 100644 --- a/tests/language/language_test.php +++ b/tests/language/language_test.php @@ -16,7 +16,7 @@ class phpbb_language_test extends phpbb_test_case /** @var \phpbb\language\language */ protected $lang; - public function setUp() + protected function setUp(): void { global $phpbb_root_path, $phpEx; @@ -30,12 +30,10 @@ public function setUp() // Set default language files loaded flag to true $loaded_flag = $reflection_class->getProperty('common_language_files_loaded'); - $loaded_flag->setAccessible(true); $loaded_flag->setValue($this->lang, true); // Set up test language data $lang_array = $reflection_class->getProperty('lang'); - $lang_array->setAccessible(true); $lang_array->setValue($this->lang, $this->get_test_data_set()); } diff --git a/tests/lint_test.php b/tests/lint_test.php index 70046bdfd26..e7904f9c837 100644 --- a/tests/lint_test.php +++ b/tests/lint_test.php @@ -11,12 +11,11 @@ * */ -class phpbb_lint_test extends phpbb_test_case +class lint_test extends phpbb_test_case { - static protected $php_binary; - static protected $exclude; + protected static $php_binary; - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { // Try to use PHP_BINARY constant if available so lint tests are run // using the same php binary as phpunit. If not available (pre PHP @@ -45,11 +44,6 @@ static public function setUpBeforeClass() */ public function test_lint($path) { - if (version_compare(PHP_VERSION, '5.3.0', '<')) - { - $this->markTestSkipped('phpBB uses PHP 5.3 syntax in some files, linting on PHP < 5.3 will fail'); - } - $cmd = sprintf('(%s -l %s) 2>&1', self::$php_binary, escapeshellarg($path)); $output = array(); $status = 1; @@ -58,15 +52,21 @@ public function test_lint($path) $this->assertEquals(0, $status, "PHP lint failed for $path:\n$output"); } - public function lint_data() + public static function lint_data(): array { - return $this->check(dirname(__FILE__) . '/..'); + return self::check(__DIR__ . '/..'); } - protected function check($root) + protected static function check($root): array { $files = array(); $dh = opendir($root); + + if ($dh === false) + { + return $files; + } + while (($filename = readdir($dh)) !== false) { if ($filename == '.' || $filename == '..') @@ -80,18 +80,19 @@ protected function check($root) continue; } if (is_dir($path) && !in_array($path, array( - dirname(__FILE__) . '/../.git', - dirname(__FILE__) . '/../build/new_version', - dirname(__FILE__) . '/../build/old_versions', - dirname(__FILE__) . '/../phpBB/cache', - dirname(__FILE__) . '/../phpBB/ext', - dirname(__FILE__) . '/../phpBB/store', + __DIR__ . '/../.git', + __DIR__ . '/../build/new_version', + __DIR__ . '/../build/old_versions', + __DIR__ . '/../phpBB/cache', + __DIR__ . '/../phpBB/ext', + __DIR__ . '/../phpBB/store', // PHP Fatal error: Cannot declare class Container because the name is already in use in /var/www/projects/phpbb3/tests/../phpBB/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php on line 20 // https://gist.github.com/e003913ffd493da63cbc - dirname(__FILE__) . '/../phpBB/vendor', + __DIR__ . '/../phpBB/vendor', + __DIR__ . '/../node_modules', ))) { - $files = array_merge($files, $this->check($path)); + $files = array_merge($files, self::check($path)); } else if (substr($filename, strlen($filename)-4) == '.php') { diff --git a/tests/lock/db_test.php b/tests/lock/db_test.php index 5fbfa265548..81b3984959b 100644 --- a/tests/lock/db_test.php +++ b/tests/lock/db_test.php @@ -19,10 +19,10 @@ class phpbb_lock_db_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml'); } - public function setUp() + protected function setUp(): void { global $db, $config; diff --git a/tests/lock/posting_test.php b/tests/lock/posting_test.php new file mode 100644 index 00000000000..75716dd2bac --- /dev/null +++ b/tests/lock/posting_test.php @@ -0,0 +1,56 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\cache\driver\file as file_cache; +use phpbb\config\config; +use phpbb\lock\posting; + +class phpbb_lock_posting_test extends phpbb_test_case +{ + /** @var \phpbb\cache\driver\file */ + protected $cache; + + /** @var config */ + protected $config; + + /** @var posting */ + protected $lock; + + public function setUp(): void + { + $this->cache = new file_cache(__DIR__ . '/../tmp/'); + $this->cache->purge(); // ensure cache is clean + $this->config = new config([ + 'flood_interval' => 15, + ]); + $this->lock = new posting($this->cache, $this->config); + } + + public function test_lock_acquire() + { + $this->assertTrue($this->lock->acquire(100, 'foo')); + $this->assertFalse($this->lock->acquire(100, 'foo')); + + $this->assertTrue($this->cache->_exists(sha1('100foo') . '_posting_lock')); + $this->assertFalse($this->lock->acquire(100, 'foo')); + $this->cache->put(sha1('100foo') . '_posting_lock', 'foo', -30); + + $this->assertTrue($this->lock->acquire(100, 'foo')); + $this->assertTrue($this->cache->_exists(sha1('100foo') . '_posting_lock')); + $this->config->offsetSet('ci_tests_no_lock_posting', true); + $this->assertTrue($this->lock->acquire(100, 'foo')); + $this->assertTrue($this->cache->_exists(sha1('100foo') . '_posting_lock')); + // Multiple acquires possible due to special ci test flag + $this->assertTrue($this->lock->acquire(100, 'foo')); + } +} diff --git a/tests/log/add_test.php b/tests/log/add_test.php index 469d4ebd691..d986cafcae6 100644 --- a/tests/log/add_test.php +++ b/tests/log/add_test.php @@ -15,7 +15,7 @@ class phpbb_log_add_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/empty_log.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/empty_log.xml'); } public function test_log_enabled() @@ -23,7 +23,6 @@ public function test_log_enabled() global $phpbb_root_path, $phpEx, $db, $phpbb_dispatcher; $db = $this->new_dbal(); - $cache = new phpbb_mock_cache; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); @@ -54,7 +53,6 @@ public function test_log_add() global $phpbb_root_path, $phpEx, $db, $phpbb_dispatcher; $db = $this->new_dbal(); - $cache = new phpbb_mock_cache; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); @@ -68,7 +66,6 @@ public function test_log_add() $log_ip = 'user_ip'; $log_time = time(); $log_operation = 'LOG_OPERATION'; - $additional_data = array(); // Add an entry successful $this->assertEquals(1, $log->add($mode, $user_id, $log_ip, $log_operation, $log_time)); diff --git a/tests/log/delete_test.php b/tests/log/delete_test.php index 04aa20d9ce5..5383d3d04af 100644 --- a/tests/log/delete_test.php +++ b/tests/log/delete_test.php @@ -17,12 +17,12 @@ class phpbb_log_delete_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/delete_log.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/delete_log.xml'); } - protected function setUp() + protected function setUp(): void { - global $phpbb_root_path, $phpEx, $db, $phpbb_dispatcher, $auth; + global $phpbb_root_path, $phpEx, $db, $phpbb_dispatcher, $auth, $user; $db = $this->new_dbal(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); @@ -37,7 +37,7 @@ protected function setUp() parent::setUp(); } - public function log_delete_data() + public static function log_delete_data() { return array( array( diff --git a/tests/log/function_add_log_test.php b/tests/log/function_add_log_test.php index c3f1a0bebad..8d89c15ab89 100644 --- a/tests/log/function_add_log_test.php +++ b/tests/log/function_add_log_test.php @@ -15,7 +15,7 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/empty_log.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/empty_log.xml'); } public static function add_log_function_data() @@ -159,10 +159,7 @@ public function test_add_log_function($expected, $user_id, $mode, $required1, $a $db = $this->new_dbal(); $cache = new phpbb_mock_cache; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + $user = $this->createMock('\phpbb\user'); $auth = $this->createMock('\phpbb\auth\auth'); $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); @@ -175,19 +172,63 @@ public function test_add_log_function($expected, $user_id, $mode, $required1, $a if ($additional3 != null) { - add_log($mode, $required1, $additional1, $additional2, $additional3); + $additional_data = [ + 'forum_id' => $required1, + 'topic_id' => $additional1, + $additional3, + ]; + $phpbb_log->add($mode, $user_id, '', $additional2, false, $additional_data); } else if ($additional2 != null) { - add_log($mode, $required1, $additional1, $additional2); + if ($mode == 'user') + { + $additional_data = [ + 'reportee_id' => $required1, + $additional2, + ]; + $log_operation = $additional1; + } + else if ($mode == 'mod') + { + $additional_data = [ + 'forum_id' => $required1, + 'topic_id' => $additional1, + ]; + $log_operation = $additional2; + } + else + { + $log_operation = $required1; + $additional_data = [ + $additional1, + $additional2, + ]; + } + $phpbb_log->add($mode, $user_id, '', $log_operation, false, $additional_data); } else if ($additional1 != null) { - add_log($mode, $required1, $additional1); + if ($mode == 'user') + { + $additional_data = [ + 'reportee_id' => $required1, + ]; + $log_operation = $additional1; + } + else + { + $log_operation = $required1; + $additional_data = [ + $additional1, + ]; + } + + $phpbb_log->add($mode, $user_id, '', $log_operation, false, $additional_data); } else { - add_log($mode, $required1); + $phpbb_log->add($mode, $user_id, '', $required1); } $result = $db->sql_query('SELECT user_id, log_type, log_operation, log_data, reportee_id, forum_id, topic_id diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php index c26644088e3..56326157a9c 100644 --- a/tests/log/function_view_log_test.php +++ b/tests/log/function_view_log_test.php @@ -11,15 +11,15 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php'; -require_once dirname(__FILE__) . '/../mock/user.php'; -require_once dirname(__FILE__) . '/../mock/cache.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_admin.php'; +require_once __DIR__ . '/../mock/user.php'; +require_once __DIR__ . '/../mock/cache.php'; class phpbb_log_function_view_log_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/full_log.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/full_log.xml'); } public static function view_log_function_data() @@ -153,7 +153,7 @@ public static function view_log_function_data() 'viewforum' => append_sid("phpBB/viewforum.$phpEx", 'f=23'), 'action' => '{LOG MOD}', - 'viewtopic' => append_sid("phpBB/viewtopic.$phpEx", 'f=23&t=56'), + 'viewtopic' => append_sid("phpBB/viewtopic.$phpEx", 't=56'), 'viewpost' => '', 'viewlogs' => append_sid("phpBB/mcp.$phpEx", 'i=logs&mode=topic_logs&t=56'), ), @@ -411,6 +411,8 @@ public function test_view_log_function($expected, $expected_returned, $mode, $lo 2 => 'plural (%d)', ), ); + $user->session_id = false; + $user->data['user_id'] = 10; $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); diff --git a/tests/manifest/controller_test.php b/tests/manifest/controller_test.php new file mode 100644 index 00000000000..6b98002a1e2 --- /dev/null +++ b/tests/manifest/controller_test.php @@ -0,0 +1,138 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use Symfony\Component\HttpFoundation\JsonResponse; + +class phpbb_manifest_controller_test extends phpbb_test_case +{ + protected $config; + protected $user; + protected $manifest; + + protected function setUp(): void + { + global $config, $user, $phpbb_root_path, $phpEx; + + parent::setUp(); + + $config = $this->config = new phpbb\config\config([ + 'sitename' => 'phpBB Testing Framework', + 'sitename_short' => '', + 'force_server_vars' => false, + 'script_path' => '', + ]); + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $lang_loader = new phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $language = new phpbb\language\language($lang_loader); + $user = $this->user = new phpbb\user($language, '\phpbb\datetime'); + + $this->manifest = new phpbb\manifest($this->config, $phpbb_dispatcher, $this->user); + } + + public static function manifest_data() + { + return [ + 'using board url root path' => [ + [ + 'force_server_vars' => false, + ], + [ + 'name' => 'phpBB Testing Framework', + 'short_name' => 'phpBB Testin', + 'display' => 'standalone', + 'orientation' => 'portrait', + 'start_url' => '/', + 'scope' => '/', + ], + ], + 'using script path' => [ + [ + 'force_server_vars' => true, + 'script_path' => '/foo/', + ], + [ + 'name' => 'phpBB Testing Framework', + 'short_name' => 'phpBB Testin', + 'display' => 'standalone', + 'orientation' => 'portrait', + 'start_url' => '/foo/', + 'scope' => '/foo/', + ], + ], + 'with shortname' => [ + [ + 'sitename_short' => 'phpBB Test', + ], + [ + 'name' => 'phpBB Testing Framework', + 'short_name' => 'phpBB Test', + 'display' => 'standalone', + 'orientation' => 'portrait', + 'start_url' => '/', + 'scope' => '/', + ], + ], + 'without shortname or script path' => [ + [], + [ + 'name' => 'phpBB Testing Framework', + 'short_name' => 'phpBB Testin', + 'display' => 'standalone', + 'orientation' => 'portrait', + 'start_url' => '/', + 'scope' => '/', + ], + ], + ]; + } + + /** + * @dataProvider manifest_data + */ + public function test_manifest($configs, $expected) + { + foreach ($configs as $key => $value) + { + $this->config->set($key, $value); + } + + $response = $this->manifest->handle(); + + $this->assertInstanceOf(JsonResponse::class, $response); + + $this->assertEquals($expected, json_decode($response->getContent(), true)); + } + + public static function manifest_with_bot_data() + { + return [ + 'is a bot' => [true, 'yes'], + 'not a bot' => [false, null], + ]; + } + + /** + * @dataProvider manifest_with_bot_data + */ + public function test_manifest_with_bot($is_bot, $expected) + { + $this->user->data['is_bot'] = $is_bot; + + $response = $this->manifest->handle(); + + $this->assertInstanceOf(JsonResponse::class, $response); + + $this->assertEquals($expected, $response->headers->get('X-PHPBB-IS-BOT')); + } +} diff --git a/tests/mcp/post_ip_test.php b/tests/mcp/post_ip_test.php index 72a9f627743..1a8e9624b35 100644 --- a/tests/mcp/post_ip_test.php +++ b/tests/mcp/post_ip_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/mcp/mcp_post.php'; +require_once __DIR__ . '/../../phpBB/includes/mcp/mcp_post.php'; class phpbb_mcp_post_ip_test extends phpbb_database_test_case { @@ -20,17 +20,17 @@ class phpbb_mcp_post_ip_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/post_ip.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/post_ip.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->db = $this->new_dbal(); } - public function data_get_num_ips() + public static function data_get_num_ips() { return array( array(2, 1), @@ -47,7 +47,7 @@ public function test_get_num_ips($expected, $poster_id) $this->assertSame($expected, phpbb_get_num_ips_for_poster($this->db, $poster_id)); } - public function data_get_num_posters() + public static function data_get_num_posters() { return array( array(2, '127.0.0.1'), diff --git a/tests/mention/controller_test.php b/tests/mention/controller_test.php new file mode 100644 index 00000000000..468a81bcf69 --- /dev/null +++ b/tests/mention/controller_test.php @@ -0,0 +1,562 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use Symfony\Component\Config\FileLocator; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; + +class phpbb_mention_controller_test extends phpbb_database_test_case +{ + protected $db, $container, $user, $config, $auth, $cache; + + /** + * @var \phpbb\mention\controller\mention + */ + protected $controller; + + /** + * @var PHPUnit_Framework_MockObject_MockObject + */ + protected $request; + + public function getDataSet() + { + return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/mention.xml'); + } + + public function setUp(): void + { + parent::setUp(); + + global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader; + + // Database + $this->db = $this->new_dbal(); + $db = $this->db; + + // Auth + $auth = $this->createMock('\phpbb\auth\auth'); + $auth->expects($this->any()) + ->method('acl_gets') + ->with('a_group', 'a_groupadd', 'a_groupdel') + ->willReturn(false) + ; + + // Config + $config = new \phpbb\config\config(array( + 'allow_mentions' => true, + 'mention_batch_size' => 8, + 'mention_names_limit' => 3, + )); + + // Event dispatcher + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + + $cache_driver = new \phpbb\cache\driver\dummy(); + $cache = new \phpbb\cache\service( + $cache_driver, + $config, + $db, + $phpbb_dispatcher, + $phpbb_root_path, + $phpEx + ); + + // Language + $lang = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + + // User + $user = $this->createMock('\phpbb\user'); + $user->ip = ''; + $user->data = array( + 'user_id' => 2, + 'username' => 'myself', + 'is_registered' => true, + 'user_colour' => '', + ); + + // Request + $this->request = $request = $this->createMock('\phpbb\request\request'); + + $request->expects($this->any()) + ->method('is_ajax') + ->willReturn(true); + $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') + ->disableOriginalConstructor() + ->getMock(); + + $user_loader = new \phpbb\user_loader($avatar_helper, $db, $phpbb_root_path, $phpEx, USERS_TABLE); + + // Controller helper + $controller_helper = $this->createMock('\phpbb\controller\helper'); + + // Container + $phpbb_container = new ContainerBuilder(); + + $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); + $loader->load('services_mention.yml'); + $phpbb_container->set('user_loader', $user_loader); + $phpbb_container->set('user', $user); + $phpbb_container->set('language', $lang); + $phpbb_container->set('config', $config); + $phpbb_container->set('dbal.conn', $db); + $phpbb_container->set('auth', $auth); + $phpbb_container->set('cache.driver', $cache_driver); + $phpbb_container->set('cache', $cache); + $phpbb_container->set('request', $request); + $phpbb_container->set('controller.helper', $controller_helper); + $phpbb_container->set('group_helper', new \phpbb\group\helper( + $this->getMockBuilder('\phpbb\auth\auth')->disableOriginalConstructor()->getMock(), + $avatar_helper, + $db, + $cache, + $config, + new \phpbb\language\language( + new phpbb\language\language_file_loader($phpbb_root_path, $phpEx) + ), + new phpbb_mock_event_dispatcher(), + new \phpbb\path_helper( + new \phpbb\symfony_request( + new phpbb_mock_request() + ), + $this->getMockBuilder('\phpbb\request\request')->disableOriginalConstructor()->getMock(), + $phpbb_root_path, + $phpEx + ), + $this->getMockBuilder('\phpbb\template\template')->disableOriginalConstructor()->getMock(), + $user + )); + $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); + $phpbb_container->set( + 'text_formatter.s9e.mention_helper', + new \phpbb\textformatter\s9e\mention_helper( + $this->db, + $auth, + $user, + $phpbb_root_path, + $phpEx + ) + ); + $phpbb_container->setParameter('core.root_path', $phpbb_root_path); + $phpbb_container->setParameter('core.php_ext', $phpEx); + $phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass()); + $phpbb_container->compile(); + + // Mention Sources + $mention_sources = array('friend', 'group', 'team', 'topic', 'user', 'usergroup'); + $mention_sources_array = array(); + foreach ($mention_sources as $source) + { + $class = $phpbb_container->get('mention.source.' . $source); + $mention_sources_array['mention.source.' . $source] = $class; + } + + $this->controller = new \phpbb\mention\controller\mention($mention_sources_array, $request, $controller_helper, $phpbb_root_path, $phpEx); + } + + public static function handle_data() + { + /** + * NOTE: + * 1) in production comparison with 'myself' is being done in JS + * 2) team members of hidden groups can also be mentioned (because they are shown on teampage) + */ + return [ + ['', 0, [ + 'names' => [ + [ + 'name' => 'friend', + 'type' => 'u', + 'id' => 7, + 'avatar' => [], + 'rank' => '', + 'priority' => 1, + ], + [ + 'name' => 'Group we are a member of', + 'type' => 'g', + 'id' => 3, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'Normal group', + 'type' => 'g', + 'id' => 1, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'team_member_hidden', + 'type' => 'u', + 'id' => 6, + 'avatar' => [], + 'rank' => '', + 'priority' => 1, + ], + [ + 'name' => 'team_member_normal', + 'type' => 'u', + 'id' => 5, + 'avatar' => [], + 'rank' => '', + 'priority' => 1, + ], + [ + 'name' => 'myself', + 'type' => 'u', + 'id' => 2, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'poster', + 'type' => 'u', + 'id' => 3, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'replier', + 'type' => 'u', + 'id' => 4, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'team_member_normal', + 'type' => 'u', + 'id' => 5, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'team_member_hidden', + 'type' => 'u', + 'id' => 6, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'friend', + 'type' => 'u', + 'id' => 7, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'test', + 'type' => 'u', + 'id' => 8, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'test1', + 'type' => 'u', + 'id' => 9, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'Group we are a member of', + 'type' => 'g', + 'id' => 3, + 'avatar' => [], + 'rank' => '', + 'priority' => 1, + ], + ], + 'all' => false, + ]], + ['', 1, [ + 'names' => [ + [ + 'name' => 'friend', + 'type' => 'u', + 'id' => 7, + 'avatar' => [], + 'rank' => '', + 'priority' => 1, + ], + [ + 'name' => 'Group we are a member of', + 'type' => 'g', + 'id' => 3, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'Normal group', + 'type' => 'g', + 'id' => 1, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'team_member_hidden', + 'type' => 'u', + 'id' => 6, + 'avatar' => [], + 'rank' => '', + 'priority' => 1, + ], + [ + 'name' => 'team_member_normal', + 'type' => 'u', + 'id' => 5, + 'avatar' => [], + 'rank' => '', + 'priority' => 1, + ], + [ + 'name' => 'replier', + 'type' => 'u', + 'id' => 4, + 'avatar' => [], + 'rank' => '', + 'priority' => 1, + ], + [ + 'name' => 'poster', + 'type' => 'u', + 'id' => 3, + 'avatar' => [], + 'rank' => '', + 'priority' => 5, + ], + [ + 'name' => 'myself', + 'type' => 'u', + 'id' => 2, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'poster', + 'type' => 'u', + 'id' => 3, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'replier', + 'type' => 'u', + 'id' => 4, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'team_member_normal', + 'type' => 'u', + 'id' => 5, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'team_member_hidden', + 'type' => 'u', + 'id' => 6, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'friend', + 'type' => 'u', + 'id' => 7, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'test', + 'type' => 'u', + 'id' => 8, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'test1', + 'type' => 'u', + 'id' => 9, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'Group we are a member of', + 'type' => 'g', + 'id' => 3, + 'avatar' => [], + 'rank' => '', + 'priority' => 1, + ], + ], + 'all' => false, + ]], + ['t', 1, [ + 'names' => [ + [ + 'name' => 'team_member_hidden', + 'type' => 'u', + 'id' => 6, + 'avatar' => [], + 'rank' => '', + 'priority' => 1, + ], + [ + 'name' => 'team_member_normal', + 'type' => 'u', + 'id' => 5, + 'avatar' => [], + 'rank' => '', + 'priority' => 1, + ], + [ + 'name' => 'team_member_normal', + 'type' => 'u', + 'id' => 5, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'team_member_hidden', + 'type' => 'u', + 'id' => 6, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'test', + 'type' => 'u', + 'id' => 8, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'test1', + 'type' => 'u', + 'id' => 9, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'test2', + 'type' => 'u', + 'id' => 10, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'test3', + 'type' => 'u', + 'id' => 11, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + ], + 'all' => true, + ]], + ['test', 1, [ + 'names' => [ + [ + 'name' => 'test', + 'type' => 'u', + 'id' => 8, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'test1', + 'type' => 'u', + 'id' => 9, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'test2', + 'type' => 'u', + 'id' => 10, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + [ + 'name' => 'test3', + 'type' => 'u', + 'id' => 11, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ], + ], + 'all' => true, + ]], + ['test1', 1, [ + 'names' => [[ + 'name' => 'test1', + 'type' => 'u', + 'id' => 9, + 'avatar' => [], + 'rank' => '', + 'priority' => 0, + ]], + 'all' => true, + ]], + ]; + } + + /** + * @dataProvider handle_data + */ + public function test_handle($keyword, $topic_id, $expected_result) + { + $this->request->expects($this->atLeast(2)) + ->method('variable') + ->willReturnCallback(function() use ($keyword, $topic_id) { + $args = func_get_args(); + return match($args) { + ['keyword', '', true, \phpbb\request\request_interface::REQUEST] => $keyword, + ['topic_id', 0, false, \phpbb\request\request_interface::REQUEST] => $topic_id, + };}); + + $data = json_decode($this->controller->handle()->getContent(), true); + $this->assertEquals($expected_result, $data); + } +} diff --git a/tests/mention/fixtures/mention.xml b/tests/mention/fixtures/mention.xml new file mode 100644 index 00000000000..36d6bfab040 --- /dev/null +++ b/tests/mention/fixtures/mention.xml @@ -0,0 +1,204 @@ + + +
      + group_id + group_name + group_type + group_desc + + 1 + Normal group + 0 + + + + 2 + Hidden group + 2 + + + + 3 + Group we are a member of + 0 + + +
      + + post_id + topic_id + forum_id + poster_id + post_time + post_text + + 1 + 1 + 1 + 3 + 1 + Topic's initial post. + + + 2 + 1 + 1 + 4 + 2 + A reply. + +
      + + teampage_id + group_id + + 1 + 1 + + + 2 + 2 + +
      + + topic_id + forum_id + topic_poster + + 1 + 1 + 3 + +
      + + user_id + username + username_clean + user_type + user_lastvisit + user_permissions + user_sig + + 2 + myself + myself + 0 + 19 + + + + + 3 + poster + poster + 0 + 18 + + + + + 4 + replier + replier + 0 + 17 + + + + + 5 + team_member_normal + team_member_normal + 0 + 16 + + + + + 6 + team_member_hidden + team_member_hidden + 0 + 15 + + + + + 7 + friend + friend + 0 + 14 + + + + + 8 + test + test + 0 + 13 + + + + + 9 + test1 + test1 + 0 + 12 + + + + + 10 + test2 + test2 + 0 + 11 + + + + + 11 + test3 + test3 + 0 + 10 + + + +
      + + user_id + group_id + user_pending + + 2 + 3 + 0 + + + 5 + 1 + 0 + + + 6 + 2 + 0 + +
      + + user_id + zebra_id + friend + foe + + 2 + 7 + 1 + 0 + +
      + diff --git a/tests/mention/fixtures/services_mention.yml b/tests/mention/fixtures/services_mention.yml new file mode 100644 index 00000000000..3cf14918a3b --- /dev/null +++ b/tests/mention/fixtures/services_mention.yml @@ -0,0 +1,2 @@ +imports: + - { resource: ../../../phpBB/config/default/container/services_mention.yml } diff --git a/tests/messenger/method_base_test.php b/tests/messenger/method_base_test.php new file mode 100644 index 00000000000..4c6e90e84c7 --- /dev/null +++ b/tests/messenger/method_base_test.php @@ -0,0 +1,276 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\config\config; +use phpbb\language\language; +use phpbb\language\language_file_loader; +use phpbb\messenger\method\email; +use phpbb\messenger\queue; +use phpbb\path_helper; +use phpbb\symfony_request; +use phpbb\template\assets_bag; + +class phpbb_messenger_method_base_test extends \phpbb_test_case +{ + protected $assets_bag; + protected $cache_path; + protected config $config; + protected $dispatcher; + protected $extension_manager; + protected email $method_email; + protected $method_base; + protected $language; + protected $log; + protected $path_helper; + protected queue $queue; + protected $request; + protected $twig_extensions_collection; + protected $twig_lexer; + protected $user; + protected $filesystem; + protected $symfony_request; + + public function setUp(): void + { + global $config, $request, $symfony_request, $user, $phpbb_root_path, $phpEx; + + $this->assets_bag = new assets_bag(); + $this->cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; + $this->config = new config([ + 'force_server_vars' => false, + ]); + $config = $this->config; + $this->dispatcher = $this->getMockBuilder('\phpbb\event\dispatcher') + ->disableOriginalConstructor() + ->getMock(); + $this->filesystem = new \phpbb\filesystem\filesystem(); + $this->language = new language(new language_file_loader($phpbb_root_path, $phpEx)); + $this->queue = $this->createMock(queue::class); + $this->request = new phpbb_mock_request(); + $request = $this->request; + $this->symfony_request = new symfony_request(new phpbb_mock_request()); + $symfony_request = $this->symfony_request; + $this->user = $this->getMockBuilder('\phpbb\user') + ->setConstructorArgs([$this->language, '\phpbb\datetime']) + ->getMock(); + $user = $this->user; + $user->page['root_script_path'] = 'phpbb/'; + $this->user->host = 'yourdomain.com'; + $this->path_helper = new path_helper( + $this->symfony_request, + $this->request, + $phpbb_root_path, + $phpEx + ); + $phpbb_container = new phpbb_mock_container_builder; + $this->twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); + $twig = new \phpbb\template\twig\environment( + $this->assets_bag, + $this->config, + $this->filesystem, + $this->path_helper, + $this->cache_path, + null, + new \phpbb\template\twig\loader(''), + $this->dispatcher, + array( + 'cache' => false, + 'debug' => false, + 'auto_reload' => true, + 'autoescape' => false, + ) + ); + $this->twig_lexer = new \phpbb\template\twig\lexer($twig); + $this->extension_manager = new phpbb_mock_extension_manager( + __DIR__ . '/', + array( + 'vendor2/foo' => array( + 'ext_name' => 'vendor2/foo', + 'ext_active' => '1', + 'ext_path' => 'ext/vendor2/foo/', + ), + ) + ); + $this->log = $this->createMock(\phpbb\log\log_interface::class); + + $this->method_email = new email( + $this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ); + + $this->method_base = $this->getMockBuilder(\phpbb\messenger\method\base::class) + ->setConstructorArgs([ + $this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ]) + ->getMockForAbstractClass(); + } + + public function test_header() + { + $this->method_base->header('X-AntiAbuse', 'Board servername - ' . $this->user->host); + $this->assertTrue(true); // No exception should be thrown + } + + public function test_set_use_queue() + { + $use_queue_property = new \ReflectionProperty($this->method_base, 'use_queue'); + $this->method_base->set_use_queue(); + $this->assertTrue($use_queue_property->getValue($this->method_base)); + $this->method_base->set_use_queue(false); + $this->assertFalse($use_queue_property->getValue($this->method_base)); + } + + public function test_error_wout_session() + { + $errors = []; + $this->log->method('add') + ->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) { + $errors[] = $additional_data[0]; + }); + + $this->user->data['user_id'] = 2; + $this->user->session_id = ''; + $this->user + ->expects($this->once()) + ->method('session_begin') + ->willReturnCallback(function() { + $this->assertTrue(true); + }); + + $this->method_base->error('Test error message'); + + $this->assertCount(1, $errors); + $this->assertEquals('


      Test error message
      ', $errors[0]); + } + + public function test_save_queue() + { + $this->queue->expects($this->once()) + ->method('save'); + $this->method_base->set_use_queue(false); + $this->method_base->save_queue(); + $this->method_base->set_use_queue(true); + $this->method_base->save_queue(); + } + + public function test_template_no_lang() + { + $template_mock = $this->getMockBuilder(\phpbb\template\template::class) + ->disableOriginalConstructor() + ->getMock(); + $filenames = []; + $template_mock->method('set_filenames') + ->willReturnCallback(function($filename_array) use (&$filenames, $template_mock) { + $filenames = array_merge($filenames, $filename_array); + + return $template_mock; + }); + + $base_reflection = new \ReflectionClass($this->method_base); + $template_reflection = $base_reflection->getProperty('template'); + $template_reflection->setValue($this->method_base, $template_mock); + + $this->config->set('default_lang', 'en'); + $this->method_base->template('test'); + $this->assertEquals(['body' => 'test.txt'], $filenames); + } + + public function test_template_template_path() + { + global $phpbb_root_path; + + $template_mock = $this->getMockBuilder(\phpbb\template\template::class) + ->disableOriginalConstructor() + ->getMock(); + $filenames = []; + $template_mock->method('set_filenames') + ->willReturnCallback(function($filename_array) use (&$filenames, $template_mock) { + $filenames = array_merge($filenames, $filename_array); + + return $template_mock; + }); + $template_mock->method('set_custom_style') + ->willReturnCallback(function($path_name, $paths) use($phpbb_root_path) { + $this->assertEquals([['name' => 'en_email', 'ext_path' => 'language/en/email']], $path_name); + $this->assertEquals([$phpbb_root_path . 'language/en/email'], $paths); + }); + + $base_reflection = new \ReflectionClass($this->method_base); + $template_reflection = $base_reflection->getProperty('template'); + $template_reflection->setValue($this->method_base, $template_mock); + + $this->config->set('default_lang', 'en'); + $this->method_base->template('test', '', $phpbb_root_path . 'language/en/email'); + $this->assertEquals(['body' => 'test.txt'], $filenames); + } + + public function test_template_path_fallback() + { + global $phpbb_root_path; + + $template_mock = $this->getMockBuilder(\phpbb\template\template::class) + ->disableOriginalConstructor() + ->getMock(); + $filenames = []; + $template_mock->method('set_filenames') + ->willReturnCallback(function($filename_array) use (&$filenames, $template_mock) { + $filenames = array_merge($filenames, $filename_array); + + return $template_mock; + }); + $template_mock->method('set_custom_style') + ->willReturnCallback(function($path_name, $paths) use($phpbb_root_path) { + $this->assertEquals([ + ['name' => 'de_email', 'ext_path' => 'language/de/email'], + ['name' => 'en_email', 'ext_path' => 'language/en/email'], + ], $path_name); + $this->assertEquals([ + $phpbb_root_path . 'language/de/email', + $phpbb_root_path . 'language/en/email' + ], $paths); + }); + + $base_reflection = new \ReflectionClass($this->method_base); + $template_reflection = $base_reflection->getProperty('template'); + $template_reflection->setValue($this->method_base, $template_mock); + + $this->config->set('default_lang', 'de'); + $this->method_base->template('test', 'de'); + $this->assertEquals(['body' => 'test.txt'], $filenames); + } +} diff --git a/tests/messenger/method_email_test.php b/tests/messenger/method_email_test.php new file mode 100644 index 00000000000..84346c52984 --- /dev/null +++ b/tests/messenger/method_email_test.php @@ -0,0 +1,797 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\config\config; +use phpbb\language\language; +use phpbb\language\language_file_loader; +use phpbb\messenger\method\email; +use phpbb\messenger\queue; +use phpbb\path_helper; +use phpbb\symfony_request; +use phpbb\template\assets_bag; +use Symfony\Component\Mime\RawMessage; + +class phpbb_messenger_method_email_test extends \phpbb_test_case +{ + protected $assets_bag; + protected $cache_path; + protected config $config; + protected $dispatcher; + protected $extension_manager; + protected email $method_email; + protected $language; + protected $log; + protected $path_helper; + protected queue $queue; + protected $request; + protected $twig_extensions_collection; + protected $twig_lexer; + protected $user; + protected $filesystem; + protected $symfony_request; + + public function setUp(): void + { + global $config, $request, $symfony_request, $user, $phpbb_root_path, $phpEx; + + $this->assets_bag = new assets_bag(); + $this->cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; + $this->config = new config([ + 'force_server_vars' => false, + ]); + $config = $this->config; + $this->dispatcher = $this->getMockBuilder('\phpbb\event\dispatcher') + ->disableOriginalConstructor() + ->getMock(); + $this->filesystem = new \phpbb\filesystem\filesystem(); + $this->language = new language(new language_file_loader($phpbb_root_path, $phpEx)); + $this->queue = $this->createMock(queue::class); + $this->request = new phpbb_mock_request(); + $request = $this->request; + $this->symfony_request = new symfony_request(new phpbb_mock_request()); + $symfony_request = $this->symfony_request; + $this->user = new \phpbb\user($this->language, '\phpbb\datetime'); + $user = $this->user; + $user->page['root_script_path'] = 'phpbb/'; + $this->user->host = 'yourdomain.com'; + $this->path_helper = new path_helper( + $this->symfony_request, + $this->request, + $phpbb_root_path, + $phpEx + ); + $phpbb_container = new phpbb_mock_container_builder; + $this->twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); + $twig = new \phpbb\template\twig\environment( + $this->assets_bag, + $this->config, + $this->filesystem, + $this->path_helper, + $this->cache_path, + null, + new \phpbb\template\twig\loader(''), + $this->dispatcher, + array( + 'cache' => false, + 'debug' => false, + 'auto_reload' => true, + 'autoescape' => false, + ) + ); + $this->twig_lexer = new \phpbb\template\twig\lexer($twig); + $this->extension_manager = new phpbb_mock_extension_manager( + __DIR__ . '/', + array( + 'vendor2/foo' => array( + 'ext_name' => 'vendor2/foo', + 'ext_active' => '1', + 'ext_path' => 'ext/vendor2/foo/', + ), + ) + ); + $this->log = $this->createMock(\phpbb\log\log_interface::class); + + $this->method_email = new email( + $this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ); + } + + public function test_miscellaneous(): void + { + $this->assertEquals('email', $this->method_email->get_queue_object_name()); + $this->assertFalse($this->method_email->is_enabled()); + $this->config->offsetSet('email_enable', true); + $this->assertTrue($this->method_email->is_enabled()); + } + + public function test_set_dsn_from_config() + { + $config_values = [ + 'smtp_delivery' => true, + 'smtp_host' => 'smtp.example.com', + 'smtp_username' => 'user', + 'smtp_password' => 'pass', + 'smtp_port' => 587, + ]; + foreach ($config_values as $key => $value) + { + $this->config->set($key, $value); + } + + $this->method_email->set_dsn(); + $this->assertEquals('smtp://user:pass@smtp.example.com:587', $this->method_email->get_dsn()); + + $this->config->set('smtp_host', ''); + $this->method_email->set_dsn(); + $this->assertEquals('null://null', $this->method_email->get_dsn()); + } + + public function test_set_dns() + { + $this->assertEquals('', $this->method_email->get_dsn()); + $this->method_email->set_dsn(''); + $this->assertEquals('sendmail://default', $this->method_email->get_dsn()); + + $this->method_email->set_dsn('smtp://user:pass1@smtp.example.com:587'); + $this->assertEquals('smtp://user:pass1@smtp.example.com:587', $this->method_email->get_dsn()); + } + + public function test_set_transport() + { + $this->assertEmpty($this->method_email->get_dsn()); + + $config_values = [ + 'smtp_delivery' => true, + 'smtp_host' => 'smtp.example.com', + 'smtp_username' => 'user', + 'smtp_password' => 'pass', + 'smtp_port' => 587, + 'smtp_verify_peer' => true, + 'smtp_verify_peer_name' => true, + 'smtp_allow_self_signed' => false, + ]; + foreach ($config_values as $key => $value) + { + $this->config->set($key, $value); + } + + $this->method_email->set_transport(); + + // set_dsn() should have been called in set_transport() + $this->assertEquals('smtp://user:pass@smtp.example.com:587', $this->method_email->get_dsn()); + + $transport = $this->method_email->get_transport(); + $this->assertInstanceOf('\Symfony\Component\Mailer\Transport\Smtp\SmtpTransport', $transport); + if (method_exists($transport->getStream(), 'getStreamOptions')) + { + $this->assertEquals([ + 'verify_peer' => true, + 'verify_peer_name' => true, + 'allow_self_signed' => false, + ], $transport->getStream()->getStreamOptions()['ssl'] ?? null); + } + } + + public function test_init() + { + $this->config->set('email_package_size', 100); + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + + $use_queue_property = $email_reflection->getProperty('use_queue'); + $this->assertFalse($use_queue_property->getValue($this->method_email)); + + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + $this->assertTrue($use_queue_property->getValue($this->method_email)); + $this->assertEmpty($email->getTo()); + + $this->method_email->to('foo@bar.com'); + $this->assertNotEmpty($email->getTo()); + + $this->method_email->init(); + + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + $this->assertEmpty($email->getTo()); + } + + public function test_get_mailer() + { + $email_reflection = new \ReflectionClass($this->method_email); + $this->method_email->init(); + $this->method_email->set_transport(); + $mailer_method = $email_reflection->getMethod('get_mailer'); + + $mailer = $mailer_method->invoke($this->method_email); + $this->assertInstanceOf(\Symfony\Component\Mailer\Mailer::class, $mailer); + } + + public function test_set_addresses() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + $this->method_email->set_addresses([]); + $this->assertEmpty($email->getTo()); + + $this->method_email->set_addresses(['user_email' => 'foo@bar.com']); + $this->assertNotEmpty($email->getTo()); + $this->assertEquals('foo@bar.com', $email->getTo()[0]->getAddress()); + $this->assertEmpty($email->getTo()[0]->getName()); + + $this->method_email->set_addresses(['user_email' => 'bar@foo.com', 'username' => 'Bar Foo']); + + $this->assertEquals('bar@foo.com', $email->getTo()[1]->getAddress()); + $this->assertEquals('Bar Foo', $email->getTo()[1]->getName()); + } + + public function test_to() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty address + $this->assertEmpty($email->getTo()); + $this->method_email->to(''); + $this->assertEmpty($email->getTo()); + + // Valid address + $this->method_email->to('foo@bar.com'); + $this->assertNotEmpty($email->getTo()); + $this->assertEquals('foo@bar.com', $email->getTo()[0]->getAddress()); + $this->assertEmpty($email->getTo()[0]->getName()); + + // Valid address with name + $this->method_email->to('bar@foo.com', 'Bar Foo'); + $this->assertEquals('bar@foo.com', $email->getTo()[1]->getAddress()); + $this->assertEquals('Bar Foo', $email->getTo()[1]->getName()); + } + + public function test_cc() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty address + $this->assertEmpty($email->getCc()); + $this->method_email->cc(''); + $this->assertEmpty($email->getCc()); + + // Valid address + $this->method_email->cc('foo@bar.com'); + $this->assertNotEmpty($email->getCc()); + $this->assertEquals('foo@bar.com', $email->getCc()[0]->getAddress()); + $this->assertEmpty($email->getCc()[0]->getName()); + + // Valid address with name + $this->method_email->cc('bar@foo.com', 'Bar Foo'); + $this->assertEquals('bar@foo.com', $email->getCc()[1]->getAddress()); + $this->assertEquals('Bar Foo', $email->getCc()[1]->getName()); + } + + public function test_bcc() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty address + $this->assertEmpty($email->getBcc()); + $this->method_email->bcc(''); + $this->assertEmpty($email->getBcc()); + + // Valid address + $this->method_email->bcc('foo@bar.com'); + $this->assertNotEmpty($email->getBcc()); + $this->assertEquals('foo@bar.com', $email->getBcc()[0]->getAddress()); + $this->assertEmpty($email->getBcc()[0]->getName()); + + // Valid address with name + $this->method_email->bcc('bar@foo.com', 'Bar Foo'); + $this->assertEquals('bar@foo.com', $email->getBcc()[1]->getAddress()); + $this->assertEquals('Bar Foo', $email->getBcc()[1]->getName()); + } + + public function test_reply_to() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty address + $this->assertEmpty($email->getReplyTo()); + $this->method_email->reply_to(''); + $this->assertEmpty($email->getReplyTo()); + + // Valid address + $this->method_email->reply_to('foo@bar.com'); + $this->assertNotEmpty($email->getReplyTo()); + $this->assertEquals('foo@bar.com', $email->getReplyTo()[0]->getAddress()); + $this->assertEmpty($email->getReplyTo()[0]->getName()); + + // Valid address with name + $this->method_email->reply_to('bar@foo.com', 'Bar Foo'); + $this->assertEquals('bar@foo.com', $email->getReplyTo()[1]->getAddress()); + $this->assertEquals('Bar Foo', $email->getReplyTo()[1]->getName()); + } + + public function test_from() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty address + $this->assertEmpty($email->getFrom()); + $this->method_email->from(''); + $this->assertEmpty($email->getFrom()); + + // Valid address + $this->method_email->from('foo@bar.com'); + $this->assertNotEmpty($email->getFrom()); + $this->assertEquals('foo@bar.com', $email->getFrom()[0]->getAddress()); + $this->assertEmpty($email->getFrom()[0]->getName()); + + // Valid address with name + $this->method_email->from('bar@foo.com', 'Bar Foo'); + $this->assertEquals('bar@foo.com', $email->getFrom()[1]->getAddress()); + $this->assertEquals('Bar Foo', $email->getFrom()[1]->getName()); + } + + public function test_subject() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty subject + $this->assertEmpty($email->getSubject()); + $this->method_email->subject(''); + $this->assertEmpty($email->getSubject()); + + // Test subject + $this->method_email->subject('Test email'); + $this->assertNotEmpty($email->getSubject()); + $this->assertEquals('Test email', $email->getSubject()); + + // Overwrite subject + $this->method_email->subject('Reply to test email'); + $this->assertNotEmpty($email->getSubject()); + $this->assertEquals('Reply to test email', $email->getSubject()); + } + + public function test_anti_abuse_headers() + { + $email_reflection = new \ReflectionClass($this->method_email); + $headers_property = $email_reflection->getProperty('headers'); + $this->method_email->init(); + + /** @var \Symfony\Component\Mime\Header\Headers $headers */ + $headers = $headers_property->getValue($this->method_email); + + $this->config->set('server_name', 'yourdomain.com'); + $this->user->data['user_id'] = 2; + $this->user->data['username'] = 'admin'; + $this->user->ip = '127.0.0.1'; + + $this->assertEmpty($headers->toArray()); + $this->method_email->anti_abuse_headers($this->config, $this->user); + + $this->assertEquals( + [ + 'X-AntiAbuse: Board servername - yourdomain.com', + 'X-AntiAbuse: User_id - 2', + 'X-AntiAbuse: Username - admin', + 'X-AntiAbuse: User IP - 127.0.0.1', + ], + $headers->toArray() + ); + } + + public function test_set_mail_priority() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Default priority + $this->assertEquals(\Symfony\Component\Mime\Email::PRIORITY_NORMAL, $email->getPriority()); + + // Highest priority + $this->method_email->set_mail_priority(\Symfony\Component\Mime\Email::PRIORITY_HIGHEST); + $this->assertEquals(\Symfony\Component\Mime\Email::PRIORITY_HIGHEST, $email->getPriority()); + } + + public function test_process_queue_not_enabled() + { + $this->method_email->init(); + + $queue_data = [ + 'email' => [ + 'data' => [ + 'message_one', + 'message_two', + ] + ] + ]; + + // Process queue will remove emails if email method is not enabled + $this->method_email->process_queue($queue_data); + $this->assertEmpty($queue_data); + } + + public function test_process_queue() + { + global $phpbb_root_path; + + $this->config->set('email_enable', true); + $this->user->data['user_id'] = 2; + $this->user->session_id = 'abcdef'; + + $this->method_email = $this->getMockBuilder($this->method_email::class) + ->setConstructorArgs([$this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ]) + ->onlyMethods(['get_mailer']) + ->getMock(); + + $mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class) + ->disableOriginalConstructor() + ->onlyMethods(['send']) + ->getMock(); + $sent_emails = 0; + $mailer_mock->method('send') + ->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) { + if ($mail->toString() === 'throw_exception') + { + throw new \Symfony\Component\Mailer\Exception\TransportException('exception'); + } + + $sent_emails++; + }); + $this->method_email->method('get_mailer')->willReturn($mailer_mock); + + $this->method_email->init(); + $errors = []; + $this->log->method('add') + ->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) { + $errors[] = $additional_data[0]; + }); + + $this->dispatcher + ->expects($this->atLeastOnce()) + ->method('trigger_event') + ->willReturnCallback(function($event_name, $value_array) { + if ($event_name === 'core.notification_message_process' && $value_array['email']->toString() == 'message_three') + { + $value_array['break'] = true; + } + + return $value_array; + }); + + $queue_data = [ + 'email' => [ + 'data' => [ + ['email' => new RawMessage('message_one')], + ['email' => new RawMessage('message_two')], + ['email' => new RawMessage('message_three')], + ['email' => new RawMessage('throw_exception')], + ['email' => new RawMessage('message_four')], + ] + ] + ]; + + $this->assertEmpty($errors); + $this->method_email->process_queue($queue_data); + $this->assertEmpty($queue_data); + $this->assertEquals(3, $sent_emails); + + $this->assertEquals(['EMAIL



      '], $errors); + } + + public function test_send_break() + { + $this->dispatcher + ->expects($this->atLeastOnce()) + ->method('trigger_event') + ->willReturnCallback(function($event_name, $value_array) { + if ($event_name !== 'core.notification_message_email') + { + return $value_array; + } + + $value_array['break'] = true; + return $value_array; + }); + + $this->config->set('board_email', 'admin@yourdomain.com'); + + $this->method_email->init(); + $this->method_email->to('foo@bar.com'); + $this->method_email->subject('Test email'); + $this->method_email->template('test', 'en'); + $this->method_email->assign_block_vars('foo', ['bar' => 'baz']); + + $this->method_email->send(); + } + + public static function email_template_data(): array + { + return [ + ['test'], + ['admin_send_email'], + ['topic_notify'], + ]; + } + + /** + * @dataProvider email_template_data + */ + public function test_send_no_queue($email_template) + { + global $phpbb_root_path; + + $this->config->set('email_enable', true); + $this->user->data['user_id'] = 2; + $this->user->session_id = 'abcdef'; + + $this->method_email = $this->getMockBuilder($this->method_email::class) + ->setConstructorArgs([$this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ]) + ->onlyMethods(['get_mailer']) + ->getMock(); + + $mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class) + ->disableOriginalConstructor() + ->onlyMethods(['send']) + ->getMock(); + $sent_emails = 0; + $mailer_mock->method('send') + ->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) { + $sent_emails++; + }); + $this->method_email->method('get_mailer')->willReturn($mailer_mock); + + $this->config->set('board_email', 'admin@yourdomain.com'); + + $this->method_email->init(); + $errors = []; + $this->log->method('add') + ->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) { + $errors[] = $additional_data[0]; + }); + + $this->dispatcher + ->expects($this->atLeastOnce()) + ->method('trigger_event') + ->willReturnCallback(function($event_name, $value_array) { + return $value_array; + }); + + $this->method_email->to('foo@bar.com'); + $this->method_email->subject('Test email'); + $this->method_email->template($email_template, 'en'); + + $this->assertTrue($this->method_email->send()); + $this->assertEquals(1, $sent_emails); + + $this->assertEmpty($errors); + } + + public function test_send_exception() + { + global $phpbb_root_path; + + $this->config->set('email_enable', true); + $this->user->data['user_id'] = 2; + $this->user->session_id = 'abcdef'; + + $this->method_email = $this->getMockBuilder($this->method_email::class) + ->setConstructorArgs([$this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ]) + ->onlyMethods(['get_mailer']) + ->getMock(); + + $mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class) + ->disableOriginalConstructor() + ->onlyMethods(['send']) + ->getMock(); + $mailer_mock->method('send') + ->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) { + throw new \Symfony\Component\Mailer\Exception\TransportException('exception'); + }); + $this->method_email->method('get_mailer')->willReturn($mailer_mock); + + $this->config->set('board_email', 'admin@yourdomain.com'); + + $this->method_email->init(); + $errors = []; + $this->log->method('add') + ->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) { + $errors[] = $additional_data[0]; + }); + + $this->dispatcher + ->expects($this->atLeastOnce()) + ->method('trigger_event') + ->willReturnCallback(function($event_name, $value_array) { + return $value_array; + }); + + $this->method_email->to('foo@bar.com'); + $this->method_email->subject('Test email'); + $this->method_email->template('test', 'en'); + + $this->assertFalse($this->method_email->send()); + + $this->assertEquals(['EMAIL



      '], $errors); + } + + public function test_send_queue() + { + global $phpbb_root_path; + + $this->config->set('email_enable', true); + $this->config->set('email_package_size', 100); + $this->user->data['user_id'] = 2; + $this->user->session_id = 'abcdef'; + + $this->method_email = $this->getMockBuilder($this->method_email::class) + ->setConstructorArgs([$this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ]) + ->onlyMethods(['get_mailer']) + ->getMock(); + + $mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class) + ->disableOriginalConstructor() + ->onlyMethods(['send']) + ->getMock(); + $mailer_mock->method('send') + ->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) { + throw new \Symfony\Component\Mailer\Exception\TransportException('exception'); + }); + $this->method_email->method('get_mailer')->willReturn($mailer_mock); + + $this->config->set('board_email', 'admin@yourdomain.com'); + + $this->method_email->init(); + $errors = []; + $this->log->method('add') + ->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) { + $errors[] = $additional_data[0]; + }); + + $this->dispatcher + ->expects($this->atLeastOnce()) + ->method('trigger_event') + ->willReturnCallback(function($event_name, $value_array) { + return $value_array; + }); + + // Mock queue methods + $this->queue->method('init') + ->willReturnCallback(function(string $object, int $package_size) { + $this->assertEquals('email', $object); + $this->assertEquals($this->config['email_package_size'], $package_size); + }); + $this->queue->method('put') + ->willReturnCallback(function(string $object, array $message_data) { + $this->assertEquals('email', $object); + $this->assertStringContainsString('phpBB is correctly configured to send emails', $message_data['email']->getSubject()); + }); + + $this->method_email->to('foo@bar.com'); + $this->method_email->subject('Test email'); + $this->method_email->template('test', 'en'); + + $this->assertTrue($this->method_email->send()); + + $this->assertEmpty($errors); + } +} diff --git a/tests/messenger/queue_test.php b/tests/messenger/queue_test.php new file mode 100644 index 00000000000..457604fb251 --- /dev/null +++ b/tests/messenger/queue_test.php @@ -0,0 +1,320 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\config\config; +use phpbb\filesystem\exception\filesystem_exception; +use phpbb\messenger\queue; + +class phpbb_messenger_queue_test extends phpbb_test_case +{ + protected $config; + protected $cache_file; + protected $dispatcher; + protected $service_collection; + + /** @var queue */ + protected $messenger_queue; + + /** + * Set up the test case + */ + protected function setUp(): void + { + $this->config = new config([ + 'last_queue_run' => time() - 30, + 'queue_interval' => 600, + ]); + $this->dispatcher = $this->getMockBuilder('phpbb\event\dispatcher') + ->disableOriginalConstructor() + ->getMock(); + $this->service_collection = $this->getMockBuilder('phpbb\di\service_collection') + ->disableOriginalConstructor() + ->onlyMethods(['getIterator', 'add_service_class']) + ->getMock(); + + $this->cache_file = __DIR__ . '/../tmp/queue_test'; + + if (file_exists($this->cache_file)) + { + @unlink($this->cache_file); + } + + $this->messenger_queue = $this->getMockBuilder('phpbb\messenger\queue') + ->setConstructorArgs([ + $this->config, + $this->dispatcher, + $this->service_collection, + $this->cache_file + ]) + ->addMethods(['get_data']) + ->getMock(); + + $this->messenger_queue->method('get_data') + ->willReturnCallback(function(){ + $data_reflection = new \ReflectionProperty(queue::class, 'data'); + return $data_reflection->getValue($this->messenger_queue); + }); + } + + public function test_init() + { + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->init('jabber', 9); + + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ], + 'jabber' => [ + 'package_size' => 9, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + } + + public function test_put() + { + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [ + ['data1'], + ], + ], + ], $this->messenger_queue->get_data()); + } + + public function test_process_no_cache_file() + { + $this->assertFileDoesNotExist($this->cache_file); + $this->assertGreaterThan(5, time() - $this->config['last_queue_run']); + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->process(); + $this->assertFileDoesNotExist($this->cache_file); + $this->assertLessThan(5, time() - $this->config['last_queue_run']); + } + + public function test_process_no_queue_handling() + { + // First save queue data + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->messenger_queue->init('jabber', 10); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ], + 'jabber' => [ + 'package_size' => 10, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + $this->messenger_queue->put('jabber', ['data2']); + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + + $this->config['last_queue_run'] = time() - 1000; + + // Process the queue + $this->messenger_queue->process(); + } + + public function test_process_no_queue_handling_chmod_exception() + { + // First save queue data + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->messenger_queue->init('jabber', 10); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ], + 'jabber' => [ + 'package_size' => 10, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + $this->messenger_queue->put('jabber', ['data2']); + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + + $this->config['last_queue_run'] = time() - 1000; + + // Override the filesystem to simulate a chmod failure + $filesystem = $this->getMockBuilder('phpbb\filesystem\filesystem') + ->disableOriginalConstructor() + ->onlyMethods(['phpbb_chmod']) + ->getMock(); + $filesystem->method('phpbb_chmod') + ->will($this->throwException(new filesystem_exception('Chmod failed'))); + $filesystem_reflection = new \ReflectionProperty(queue::class, 'filesystem'); + $filesystem_reflection->setValue($this->messenger_queue, $filesystem); + + // Process the queue + $this->messenger_queue->process(); + } + + public function test_process_complete() + { + // First save queue data + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ], + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + + $this->config['last_queue_run'] = time() - 1000; + + // Prepare service iterator and messenger methods + $email_method = $this->getMockBuilder('phpbb\messenger\method\email') + ->disableOriginalConstructor() + ->onlyMethods(['get_queue_object_name', 'process_queue']) + ->getMock(); + $email_method->method('get_queue_object_name') + ->willReturn('email'); + $email_method->method('process_queue') + ->willReturnCallback(function(array &$queue_data) { + $this->assertEquals([ + 'package_size' => 5, + 'data' => [ + ['data1'], + ], + ], $queue_data['email']); + unset($queue_data['email']); + }); + + $this->service_collection->method('getIterator') + ->willReturn(new \ArrayIterator([ + 'email' => $email_method, + ])); + + // Process the queue + $this->messenger_queue->process(); + $this->assertFileDoesNotExist($this->cache_file); + } + + public function test_save_no_data() + { + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->save(); + $this->assertFileDoesNotExist($this->cache_file); + } + + public function test_save() + { + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + } + + public function test_save_twice() + { + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + $this->messenger_queue->put('jabber', ['data2']); + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data3']); + $this->messenger_queue->save(); + $this->assertEquals([], $this->messenger_queue->get_data()); + } + + public function test_save_chmod_fail() + { + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + + // Override the filesystem to simulate a chmod failure + $filesystem = $this->getMockBuilder('phpbb\filesystem\filesystem') + ->disableOriginalConstructor() + ->onlyMethods(['phpbb_chmod']) + ->getMock(); + $filesystem->method('phpbb_chmod') + ->will($this->throwException(new filesystem_exception('Chmod failed'))); + $filesystem_reflection = new \ReflectionProperty(queue::class, 'filesystem'); + $filesystem_reflection->setValue($this->messenger_queue, $filesystem); + + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + } +} diff --git a/tests/migrations/fixtures/migration_remove_jabber.xml b/tests/migrations/fixtures/migration_remove_jabber.xml new file mode 100644 index 00000000000..e263cdafcf7 --- /dev/null +++ b/tests/migrations/fixtures/migration_remove_jabber.xml @@ -0,0 +1,284 @@ + + + + migration_name + migration_depends_on + migration_schema_done + migration_data_done + migration_data_state + migration_start_time + migration_end_time +
      + + config_name + config_value + + jab_enable + 1 + + + jab_host + + + + jab_package_size + 0 + + + jab_password + + + + jab_port + + + + jab_use_ssl + + + + jab_username + user + + + jab_verify_peer + 0 + + + jab_verify_peer_name + 0 + + + jab_allow_self_signed + 0 + +
      + + module_id + module_enabled + module_display + module_basename + module_class + parent_id + left_id + right_id + module_langname + module_mode + module_auth + + 1 + 1 + 1 + + acp + 0 + 1 + 76 + ACP_CAT_GENERAL + + + + + 4 + 1 + 1 + + acp + 1 + 48 + 59 + ACP_CLIENT_COMMUNICATION + + + + + 75 + 1 + 1 + acp_jabber + acp + 4 + 53 + 54 + ACP_JABBER_SETTINGS + settings + acl_a_jabber + +
      + + auth_option_id + auth_option + is_global + is_local + founder_only + + 70 + a_jabber + 1 + 0 + 0 + + + 121 + u_sendim + 1 + 0 + 0 + +
      + + group_id + forum_id + auth_option_id + auth_role_id + auth_setting +
      + + role_id + auth_option_id + auth_setting + + 4 + 70 + 1 + + + 5 + 121 + 1 + + + 6 + 121 + 1 + +
      + + user_id + forum_id + auth_option_id + auth_role_id + auth_setting +
      + + id + item_type + item_id + user_id + method + notify + + 1 + notification.type.post + 0 + 2 + notification.method.jabber + 1 + + + 2 + notification.type.post + 0 + 3 + notification.method.jabber + 1 + + + 3 + notification.type.post + 0 + 4 + notification.method.jabber + 1 + + + 4 + notification.type.post + 0 + 5 + notification.method.jabber + 1 + + + 5 + notification.type.post + 0 + 6 + notification.method.jabber + 1 + + + 6 + notification.type.post + 0 + 7 + notification.method.jabber + 1 + + + 7 + notification.type.post + 0 + 8 + notification.method.jabber + 1 + + + 8 + notification.type.forum + 0 + 2 + notification.method.jabber + 1 + + + 9 + notification.type.forum + 0 + 3 + notification.method.jabber + 1 + + + 10 + notification.type.forum + 0 + 4 + notification.method.jabber + 1 + + + 11 + notification.type.forum + 0 + 5 + notification.method.jabber + 1 + + + 12 + notification.type.forum + 0 + 6 + notification.method.jabber + 1 + + + 13 + notification.type.forum + 0 + 7 + notification.method.jabber + 1 + + + 14 + notification.type.forum + 0 + 8 + notification.method.jabber + 1 + +
      + +       diff --git a/tests/migrations/migration_test_base.php b/tests/migrations/migration_test_base.php new file mode 100644 index 00000000000..44d0e258745 --- /dev/null +++ b/tests/migrations/migration_test_base.php @@ -0,0 +1,166 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +abstract class phpbb_migration_test_base extends phpbb_database_test_case +{ + /** @var \phpbb\auth\auth */ + protected $auth; + + /** @var \phpbb\cache\driver\driver_interface */ + protected $cache; + + /** @var \phpbb\cache\service */ + protected $cache_service; + + /** @var \phpbb\config\config */ + protected $config; + + /** @var \phpbb\db\driver\driver_interface */ + protected $db; + + /** @var \phpbb\db\tools\tools_interface */ + protected $db_tools; + + /** @var \Doctrine\DBAL\Connection */ + protected $doctrine_db; + + /** @var \phpbb\extension\manager */ + protected $extension_manager; + + /** @var \phpbb\db\migrator */ + protected $migrator; + + /** @var \phpbb\db\migration\tool\tool_interface */ + protected $tools; + + /** @var \phpbb\user */ + protected $user; + + /** @var string */ + protected $fixture; + + /** @var string */ + protected $migration_class; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . $this->fixture); + } + + protected function setUp(): void + { + global $cache, $db, $phpbb_log, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $skip_add_log, $table_prefix, $user; + + parent::setUp(); + + // Disable the logs + $skip_add_log = true; + + $db = $this->db = $this->new_dbal(); + $this->doctrine_db = $this->new_doctrine_dbal(); + $factory = new \phpbb\db\tools\factory(); + $this->db_tools = $factory->get($this->doctrine_db); + $this->db_tools->set_table_prefix($table_prefix); + $this->cache = new phpbb_mock_cache(); + $this->auth = new \phpbb\auth\auth(); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $this->config = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config'); + $this->config->initialise($this->cache); + $cache = $this->cache_service = new \phpbb\cache\service($this->cache, $this->config, $this->db, $phpbb_dispatcher, $phpbb_root_path, $phpEx); + + + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $lang = new \phpbb\language\language($lang_loader); + $user = $this->user = new \phpbb\user($lang, '\phpbb\datetime'); + + $phpbb_log = new \phpbb\log\log($this->db, $this->user, $this->auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + + $container = new phpbb_mock_container_builder(); + $container->set('event_dispatcher', $phpbb_dispatcher); + + $finder_factory = $this->createMock('\phpbb\finder\factory'); + $this->extension_manager = new \phpbb\extension\manager( + $container, + $this->db, + $this->config, + $finder_factory, + 'phpbb_ext', + __DIR__ . '/../../phpBB/', + null + ); + + $module_manager = new \phpbb\module\module_manager($this->cache, $this->db, $this->extension_manager, 'phpbb_modules', $phpbb_root_path, $phpEx); + + $this->tools = array( + 'config' => new \phpbb\db\migration\tool\config($this->config), + 'config_text' => new \phpbb\db\migration\tool\config_text(new \phpbb\config\db_text($this->db, 'phpbb_config_text')), + 'module' => new \phpbb\db\migration\tool\module($this->db, $this->user, $module_manager, 'phpbb_modules'), + 'permission' => new \phpbb\db\migration\tool\permission($this->db, $this->cache_service, $this->auth, $phpbb_root_path, $phpEx), + ); + + $this->migrator = new \phpbb\db\migrator( + $container, + $this->config, + $this->db, + $this->db_tools, + 'phpbb_migrations', + __DIR__ . '/../../phpBB/', + 'php', + 'phpbb_', + self::get_core_tables(), + $this->tools, + new \phpbb\db\migration\helper() + ); + $container->set('migrator', $this->migrator); + + $migration = $this->migrator->get_migration($this->migration_class); + $depends = $migration->depends_on(); + $this->migrator->populate_migrations($depends); + + $this->migrator->set_migrations([$this->migration_class]); + } + + protected function apply_migration() + { + while (!$this->migrator->finished()) + { + try + { + $this->migrator->update(); + } + catch (\phpbb\db\migration\exception $e) + { + $this->fail('Applying migration error: ' . $e->__toString()); + } + } + + return $this->migrator->finished(); + } + + protected function revert_migration() + { + while ($this->migrator->migration_state($this->migration_class) !== false) + { + try + { + $this->migrator->revert($this->migration_class); + } + catch (\phpbb\db\migration\exception $e) + { + $this->fail('Reverting migration error: ' . $e->__toString()); + } + } + + return !$this->migrator->migration_state($this->migration_class); + } +} diff --git a/tests/migrations/migrations_check_config_added_test.php b/tests/migrations/migrations_check_config_added_test.php new file mode 100644 index 00000000000..71c5ee7f077 --- /dev/null +++ b/tests/migrations/migrations_check_config_added_test.php @@ -0,0 +1,174 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +class migrations_check_config_added_test extends phpbb_test_case +{ + /** @var \phpbb\config\config */ + protected $config; + + /** @var \Symfony\Component\DependencyInjection\ContainerInterface */ + protected $container; + + /** @var \phpbb\db\driver\driver_interface */ + protected $db; + + /** @var \Doctrine\DBAL\Connection */ + protected $db_doctrine; + + /** @var \phpbb\db\tools\tools_interface */ + protected $db_tools; + + /** @var \phpbb\extension\manager */ + protected $extension_manager; + + /** @var \phpbb\db\migrator */ + protected $migrator; + + /** @var string */ + protected $table_prefix; + + /** @var string */ + protected $phpbb_root_path; + + /** @var string */ + protected $php_ext; + + /** @var string */ + protected $schema_data; + + protected function setUp(): void + { + global $phpbb_root_path; + + // Get schema data from file + $this->schema_data = file_get_contents($phpbb_root_path . 'install/schemas/schema_data.sql'); + } + + protected function get_config_names() + { + global $phpbb_root_path, $phpEx; + + $this->table_prefix = 'phpbb_'; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $phpEx; + + $this->config = new \phpbb\config\config([ + 'search_type' => '\phpbb\search\fulltext_mysql', + ]); + + $this->db = $this->createMock('\phpbb\db\driver\driver_interface'); + $this->db_doctrine = $this->createMock(\Doctrine\DBAL\Connection::class); + $factory = new \phpbb\db\tools\factory(); + $this->db_tools = $factory->get($this->db_doctrine); + $this->db_tools->set_table_prefix($this->table_prefix); + + $tools = [ + new \phpbb\db\migration\tool\config($this->config), + ]; + + $this->container = new phpbb_mock_container_builder(); + + $this->migrator = new \phpbb\db\migrator( + $this->container, + $this->config, + $this->db, + $this->db_tools, + 'phpbb_migrations', + $this->phpbb_root_path, + $this->php_ext, + $this->table_prefix, + [], + $tools, + new \phpbb\db\migration\helper() + ); + $this->container->set('migrator', $this->migrator); + + $this->extension_manager = new phpbb_mock_extension_manager( + $this->phpbb_root_path, + [], + $this->container + ); + + // Get all migrations + $migrations = $this->extension_manager + ->get_finder() + ->core_path('phpbb/db/migration/data/') + ->extension_directory('/migrations') + ->get_classes(); + + $config_names = $config_removed = []; + foreach ($migrations as $key => $class) + { + // Filter non-migration files + if (!$this->migrator::is_migration($class)) + { + unset($migrations[$key]); + continue; + } + + // Create migration object instance + $migration = $this->migrator->get_migration($class); + + // $step[0] - action (config.*|if|custom|etc), $step[1][1] - action when wrapped with 'if' action + // $step[1] - action parameters for non-'if'-wrapped actions (0 => config_name and 1 => config_value) + // $step[1][0] - configuration option to add/update/remove (config_name) + foreach ($migration->update_data() as $migration_name => $step) + { + if ($step[0] == 'if') + { + $step = $step[1][1]; + } + + // Filter out actions different from config.* + if ($step[0] == 'custom' || strpos($step[0], 'config') === false) + { + continue; + } + + $config_name = $step[1][0]; + // Exclude removed configuration options and filter them out + if ($step[0] == 'config.remove') + { + if (!isset($config_removed[$config_name])) + { + $config_removed[$config_name] = true; + } + + continue; + } + + // Fill error entries for configuration options which were not added to schema_data.sql + if (!isset($config_names[$config_name])) + { + $config_names[$config_name] = [$config_name, $class]; + } + } + } + + // Drop configuration options which were removed by config.remove + $config_names = array_diff_key($config_names, $config_removed); + + return array_combine(array_column($config_names, 0), array_column($config_names, 1)); + } + + public function test_config_option_exists_in_schema_data() + { + $message = 'Migration: %1$s, config_name: %2$s; not added to schema_data.sql'; + foreach ($this->get_config_names() as $config_name => $class) + { + $this->assertNotFalse(strpos($this->schema_data, $config_name), + sprintf($message, $class, $config_name) + ); + } + } +} diff --git a/tests/migrations/remove_jabber_migration_test.php b/tests/migrations/remove_jabber_migration_test.php new file mode 100644 index 00000000000..bf1962b6675 --- /dev/null +++ b/tests/migrations/remove_jabber_migration_test.php @@ -0,0 +1,76 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +require_once __DIR__ . '/migration_test_base.php'; + +class phpbb_migrations_remove_jabber_migration_test extends phpbb_migration_test_base +{ + + protected $migration_class = '\phpbb\db\migration\data\v400\remove_jabber'; + protected $fixture = '/fixtures/migration_remove_jabber.xml'; + + public function test_remove_jabber_migration() + { + $sql = "SELECT id FROM phpbb_user_notifications + WHERE method = 'notification.method.jabber'"; + $result = $this->db->sql_query($sql); + $rowset = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + $this->assertEquals(14, count($rowset)); + + $sql = "SELECT config_name FROM phpbb_config + WHERE config_name = 'jab_enable'"; + $this->assertNotFalse($this->db->sql_query($sql)); + + $this->assertTrue($this->tools['permission']->exists('a_jabber')); + $this->assertTrue($this->tools['permission']->exists('u_sendim')); + $this->assertTrue($this->tools['module']->exists('acp', 'ACP_CLIENT_COMMUNICATION', 'ACP_JABBER_SETTINGS')); + + $this->apply_migration(); + + $sql = "SELECT id FROM phpbb_user_notifications + WHERE method = 'notification.method.jabber'"; + $this->db->sql_query($sql); + $this->assertFalse($this->db->sql_fetchfield('id')); + + $sql = "SELECT id FROM phpbb_user_notifications + WHERE method = 'notification.method.jabber'"; + $result = $this->db->sql_query($sql); + $rowset = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + $this->assertEquals(0, count($rowset)); + + $sql = "SELECT config_name FROM phpbb_config + WHERE config_name = 'jab_enable'"; + $this->db->sql_query($sql); + $this->assertFalse($this->db->sql_fetchfield('config_name')); + + $this->assertFalse($this->tools['permission']->exists('a_jabber')); + $this->assertFalse($this->tools['permission']->exists('u_sendim')); + $this->assertFalse($this->tools['module']->exists('acp', 'ACP_CLIENT_COMMUNICATION', 'ACP_JABBER_SETTINGS')); + + $this->revert_migration(); + + $sql = "SELECT config_name FROM phpbb_config + WHERE config_name = 'jab_enable'"; + $this->db->sql_query($sql); + $this->assertEquals('jab_enable', $this->db->sql_fetchfield('config_name')); + + $this->assertTrue($this->tools['permission']->exists('a_jabber')); + $this->assertTrue($this->tools['permission']->exists('u_sendim')); + $this->assertTrue($this->tools['module']->exists('acp', 'ACP_CLIENT_COMMUNICATION', 'ACP_JABBER_SETTINGS')); + + // Apply migration back + $this->apply_migration(); + } +} diff --git a/tests/migrator/convert_timezones_test.php b/tests/migrator/convert_timezones_test.php index f8d780da0cf..59869454bce 100644 --- a/tests/migrator/convert_timezones_test.php +++ b/tests/migrator/convert_timezones_test.php @@ -13,18 +13,21 @@ class phpbb_migrator_convert_timezones_test extends phpbb_database_test_case { - protected $notifications, $db, $container, $user, $config, $auth, $cache; + protected $db; + protected $db_doctrine; + protected $migration; public function getDataSet() { $this->db = $this->new_dbal(); + $this->db_doctrine = $this->new_doctrine_dbal(); $factory = new \phpbb\db\tools\factory(); - $db_tools = $factory->get($this->db); + $db_tools = $factory->get($this->db_doctrine); // user_dst doesn't exist anymore, must re-add it to test this $db_tools->sql_column_add('phpbb_users', 'user_dst', array('BOOL', 1)); - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/convert_timezones.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/convert_timezones.xml'); } public function revert_schema() @@ -49,22 +52,24 @@ public function update_schema() ); } - protected function setUp() + protected function setUp(): void { parent::setUp(); global $phpbb_root_path, $phpEx; $this->db = $this->new_dbal(); + $this->db_doctrine = $this->new_doctrine_dbal(); $factory = new \phpbb\db\tools\factory(); $this->migration = new \phpbb\db\migration\data\v310\timezone( new \phpbb\config\config(array()), $this->db, - $factory->get($this->db), + $factory->get($this->db_doctrine), $phpbb_root_path, $phpEx, - 'phpbb_' + 'phpbb_', + self::get_core_tables() ); } @@ -93,7 +98,7 @@ public function test_convert() $this->db->sql_freeresult($result); $factory = new \phpbb\db\tools\factory(); - $db_tools = $factory->get($this->db); + $db_tools = $factory->get($this->db_doctrine); // Remove the user_dst field again $db_tools->sql_column_remove('phpbb_users', 'user_dst'); diff --git a/tests/migrator/get_callable_from_step_test.php b/tests/migrator/get_callable_from_step_test.php new file mode 100644 index 00000000000..467ec99aa89 --- /dev/null +++ b/tests/migrator/get_callable_from_step_test.php @@ -0,0 +1,142 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class get_callable_from_step_test extends phpbb_database_test_case +{ + protected $migrator; + protected $module_added; + + protected function setUp(): void + { + global $phpbb_root_path, $php_ext, $table_prefix, $phpbb_log, $user; + + parent::setUp(); + + $phpbb_log = $this->getMockBuilder('\phpbb\log\log')->disableOriginalConstructor()->getMock(); + $db = $this->new_dbal(); + $db_doctrine = $this->new_doctrine_dbal(); + $factory = new \phpbb\db\tools\factory(); + $db_tools = $factory->get($db_doctrine); + $db_tools->set_table_prefix($table_prefix); + $user = $this->getMockBuilder('\phpbb\user')->disableOriginalConstructor()->getMock(); + $user->ip = '127.0.0.1'; + $module_manager = new \phpbb\module\module_manager( + $this->getMockBuilder('\phpbb\cache\driver\dummy')->disableOriginalConstructor()->getMock(), + $db, + new phpbb_mock_extension_manager($phpbb_root_path), + 'phpbb_modules', + $phpbb_root_path, + $php_ext + ); + $module_tools = new \phpbb\db\migration\tool\module($db, $user, $module_manager, 'phpbb_modules'); + $this->migrator = new \phpbb\db\migrator( + new phpbb_mock_container_builder(), + new \phpbb\config\config(array()), + $db, + $db_tools, + 'phpbb_migrations', + $phpbb_root_path, + $php_ext, + $table_prefix, + self::get_core_tables(), + array($module_tools), + new \phpbb\db\migration\helper() + ); + + if (!$module_tools->exists('acp', 0, 'new_module_langname')) + { + $module_tools->add('acp', 0, array( + 'module_basename' => 'new_module_basename', + 'module_langname' => 'new_module_langname', + 'module_mode' => 'settings', + 'module_auth' => '', + 'module_display' => true, + 'before' => false, + 'after' => false, + )); + $this->module_added = true; + } + } + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/../dbal/fixtures/migrator.xml'); + } + + public static function get_callable_from_step_provider() + { + return array( + array( + array('if', array( + false, + array('permission.add', array('some_data')), + )), + true, // expects false + ), + array( + array('if', array( + array('module.exists', array( + 'mcp', + 'RANDOM_PARENT', + 'RANDOM_MODULE' + )), + array('permission.add', array('some_data')), + )), + true, // expects false + ), + array( + array('if', array( + array('module.exists', array( + 'acp', + 0, + 'new_module_langname' + )), + array('module.add', array( + 'acp', + 0, + 'module_basename' => 'new_module_basename2', + 'module_langname' => 'new_module_langname2', + 'module_mode' => 'settings', + 'module_auth' => '', + 'module_display' => true, + 'before' => false, + 'after' => false, + )), + )), + false, // expects false + ), + ); + } + + /** + * @dataProvider get_callable_from_step_provider + */ + public function test_get_callable_from_step($step, $expects_false) + { + if ($expects_false) + { + $this->assertFalse($this->call_get_callable_from_step($step)); + } + else + { + $this->assertNotFalse($this->call_get_callable_from_step($step)); + } + } + + protected function call_get_callable_from_step($step) + { + $class = new ReflectionClass($this->migrator); + $method = $class->getMethod('get_callable_from_step'); + return $method->invokeArgs($this->migrator, array($step)); + } +} diff --git a/tests/migrator/get_schema_steps_test.php b/tests/migrator/get_schema_steps_test.php index 3d15d2b2002..71f9baaef29 100644 --- a/tests/migrator/get_schema_steps_test.php +++ b/tests/migrator/get_schema_steps_test.php @@ -13,14 +13,16 @@ class get_schema_steps_test extends phpbb_test_case { - public function setUp() + protected $helper; + + protected function setUp(): void { parent::setUp(); $this->helper = new \phpbb\db\migration\helper(); } - public function schema_provider() + public static function schema_provider() { return array( array( diff --git a/tests/migrator/reverse_update_data_test.php b/tests/migrator/reverse_update_data_test.php index b85e48c64c9..856cf121496 100644 --- a/tests/migrator/reverse_update_data_test.php +++ b/tests/migrator/reverse_update_data_test.php @@ -16,14 +16,14 @@ class reverse_update_data_test extends phpbb_test_case /** @var \phpbb\db\migration\helper */ protected $helper; - public function setUp() + protected function setUp(): void { parent::setUp(); $this->helper = new \phpbb\db\migration\helper(); } - public function update_data_provider() + public static function update_data_provider() { return array( array( @@ -34,7 +34,7 @@ public function update_data_provider() array('permission.add', array('some_data')), )), array('config.remove', array('foobar')), - array('custom', array(array($this, 'foo_bar'))), + array('custom', array(array(self::class, 'foo_bar'))), array('tool.method', array('test_data')), ), array( diff --git a/tests/migrator/schema_generator_test.php b/tests/migrator/schema_generator_test.php index 1996d207ea6..2df7bf05d36 100644 --- a/tests/migrator/schema_generator_test.php +++ b/tests/migrator/schema_generator_test.php @@ -21,32 +21,66 @@ class schema_generator_test extends phpbb_test_case { + /** @var \phpbb\config\config */ + protected $config; + + /** @var \phpbb\db\driver\driver_interface */ + protected $db; + + /** @var \phpbb\db\tools\doctrine */ + protected $db_tools; + + /** @var \Doctrine\DBAL\Connection */ + protected $doctrine_db; + /** @var \phpbb\db\migration\schema_generator */ protected $generator; - public function setUp() + /** @var string */ + protected $table_prefix; + + /** @var string */ + protected $phpbb_root_path; + + /** @var string */ + protected $php_ext; + + protected function setUp(): void { + global $phpbb_root_path, $phpEx; + parent::setUp(); + $this->table_prefix = 'phpbb_'; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $phpEx; + $this->config = new \phpbb\config\config(array()); $this->db = new \phpbb\db\driver\sqlite3(); + // Some local setups may not configure a DB driver. If the configured + // 'dbms' is null, skip this test instead of failing with a TypeError in + // the connection factory which expects a non-null driver name. + $mock_config = new phpbb_mock_config_php_file(); + if ($mock_config->get('dbms') === null) + { + self::markTestSkipped('Skipping schema generator tests: dbms is not configured (null) in local environment.'); + } + $this->doctrine_db = \phpbb\db\doctrine\connection_factory::get_connection($mock_config); $factory = new \phpbb\db\tools\factory(); - $this->db_tools = $factory->get($this->db); - $this->table_prefix = 'phpbb_'; + $this->db_tools = $factory->get($this->doctrine_db); + $this->db_tools->set_table_prefix($this->table_prefix); } protected function get_schema_generator(array $class_names) { - $this->generator = new \phpbb\db\migration\schema_generator($class_names, $this->config, $this->db, $this->db_tools, $this->phpbb_root_path, $this->php_ext, $this->table_prefix); + $this->generator = new \phpbb\db\migration\schema_generator($class_names, $this->config, $this->db, $this->db_tools, $this->phpbb_root_path, $this->php_ext, $this->table_prefix, phpbb_database_test_case::get_core_tables()); return $this->generator; } - /** - * @expectedException \UnexpectedValueException - */ public function test_check_dependencies_fail() { + $this->expectException(\UnexpectedValueException::class); $this->get_schema_generator(array('\phpbb\db\migration\data\v310\forgot_password')); $this->generator->get_schema(); @@ -63,7 +97,7 @@ public function test_get_schema_success() $this->assertArrayHasKey('phpbb_users', $this->generator->get_schema()); } - public function column_add_after_data() + public static function column_add_after_data() { return array( array( diff --git a/tests/mimetype/guesser_test.php b/tests/mimetype/guesser_test.php index fa53e6c8c47..8333f9542c9 100644 --- a/tests/mimetype/guesser_test.php +++ b/tests/mimetype/guesser_test.php @@ -13,8 +13,8 @@ namespace phpbb\mimetype; -require_once dirname(__FILE__) . '/null_guesser.php'; -require_once dirname(__FILE__) . '/incorrect_guesser.php'; +require_once __DIR__ . '/null_guesser.php'; +require_once __DIR__ . '/incorrect_guesser.php'; function function_exists($name) { @@ -27,30 +27,36 @@ class guesser_test extends \phpbb_test_case protected $fileinfo_supported = false; - public function setUp() + protected $guesser; + protected $guesser_no_fileinfo; + protected $path; + protected $jpg_file; + protected $phpbb_root_path; + + protected function setUp(): void { global $phpbb_root_path; $guessers = array( - new \Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser(), - new \Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser(), + new \Symfony\Component\Mime\FileinfoMimeTypeGuesser(), + new \Symfony\Component\Mime\FileBinaryMimeTypeGuesser(), new \phpbb\mimetype\extension_guesser, new \phpbb\mimetype\content_guesser, ); // Check if any guesser except the extension_guesser is available - $this->fileinfo_supported = $guessers[0]->isSupported() | $guessers[1]->isSupported() | $guessers[3]->is_supported(); + $this->fileinfo_supported = $guessers[0]->isGuesserSupported() | $guessers[1]->isGuesserSupported() | $guessers[3]->is_supported(); // Also create a guesser that emulates not having fileinfo available $this->guesser_no_fileinfo = new \phpbb\mimetype\guesser(array($guessers[2])); $this->guesser = new \phpbb\mimetype\guesser($guessers); - $this->path = dirname(__FILE__); + $this->path = __DIR__; $this->jpg_file = $this->path . '/fixtures/jpg'; $this->phpbb_root_path = $phpbb_root_path; } - public function data_guess_files() + public static function data_guess_files() { return array( array('image/gif', 'gif'), @@ -76,7 +82,7 @@ public function test_guess_files($expected, $file) $this->assertEquals($expected, $this->guesser->guess($this->path . '/../upload/fixture/' . $file)); } - public function data_guess_files_no_fileinfo() + public static function data_guess_files_no_fileinfo() { return array( array('application/octet-stream', 'gif'), @@ -112,7 +118,7 @@ public function test_null_guess() $this->assertEquals('application/octet-stream', $guesser->guess($this->jpg_file)); } - public function data_incorrect_guessers() + public static function data_incorrect_guessers() { return array( array(array(new \phpbb\mimetype\incorrect_guesser)), @@ -123,15 +129,14 @@ public function data_incorrect_guessers() /** * @dataProvider data_incorrect_guessers - * - * @expectedException \LogicException */ public function test_incorrect_guesser($guessers) { + $this->expectException(\LogicException::class); $guesser = new \phpbb\mimetype\guesser($guessers); } - public function data_content_guesser() + public static function data_content_guesser() { return array( array( @@ -176,12 +181,16 @@ public function test_content_guesser($expected, $guessers, $overload = false) // Cover possible LogicExceptions foreach ($guessers as $cur_guesser) { - $supported += $cur_guesser->is_supported(); + $is_supported = (method_exists($cur_guesser, 'is_supported')) ? 'is_supported' : ''; + $is_supported = (method_exists($cur_guesser, 'isSupported')) ? 'isSupported' : $is_supported; + $is_supported = (method_exists($cur_guesser, 'isGuesserSupported')) ? 'isGuesserSupported' : $is_supported; + + $supported += $cur_guesser->$is_supported(); } if (!$supported) { - $this->setExpectedException('\LogicException'); + $this->expectException('\LogicException'); } $guesser = new \phpbb\mimetype\guesser($guessers); @@ -195,9 +204,9 @@ public function test_content_guesser($expected, $guessers, $overload = false) public function test_sort_priority() { $guessers = array( - 'FileinfoMimeTypeGuesser' => new \Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser, + 'FileinfoMimeTypeGuesser' => new \Symfony\Component\Mime\FileinfoMimeTypeGuesser, 'extension_guesser' => new \phpbb\mimetype\extension_guesser, - 'FileBinaryMimeTypeGuesser' => new \Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser, + 'FileBinaryMimeTypeGuesser' => new \Symfony\Component\Mime\FileBinaryMimeTypeGuesser, 'content_guesser' => new \phpbb\mimetype\content_guesser, ); $guessers['content_guesser']->set_priority(5); @@ -207,7 +216,7 @@ public function test_sort_priority() $this->assertInstanceOf('\phpbb\mimetype\extension_guesser', $guessers[3]); } - public function data_choose_mime_type() + public static function data_choose_mime_type() { return array( array('application/octet-stream', 'application/octet-stream', null), diff --git a/tests/mock/cache.php b/tests/mock/cache.php index 5fa3d281478..cc50d0b81b7 100644 --- a/tests/mock/cache.php +++ b/tests/mock/cache.php @@ -72,13 +72,13 @@ public function obtain_disallowed_usernames() } } - public function checkVar(PHPUnit_Framework_Assert $test, $var_name, $data) + public function checkVar(PHPUnit\Framework\Assert $test, $var_name, $data) { $test->assertTrue(isset($this->data[$var_name])); $test->assertEquals($data, $this->data[$var_name]); } - public function checkAssociativeVar(PHPUnit_Framework_Assert $test, $var_name, $data, $sort = true) + public function checkAssociativeVar(PHPUnit\Framework\Assert $test, $var_name, $data, $sort = true) { $test->assertTrue(isset($this->data[$var_name])); @@ -93,12 +93,12 @@ public function checkAssociativeVar(PHPUnit_Framework_Assert $test, $var_name, $ $test->assertEquals($data, $this->data[$var_name]); } - public function checkVarUnset(PHPUnit_Framework_Assert $test, $var_name) + public function checkVarUnset(PHPUnit\Framework\Assert $test, $var_name) { $test->assertFalse(isset($this->data[$var_name])); } - public function check(PHPUnit_Framework_Assert $test, $data, $ignore_db_info = true) + public function check(PHPUnit\Framework\Assert $test, $data, $ignore_db_info = true) { $cache_data = $this->data; @@ -168,4 +168,8 @@ public function obtain_bots() { return isset($this->data['_bots']) ? $this->data['_bots'] : array(); } + + public function clean_query_id($query_id) + { + } } diff --git a/tests/mock/config_php_file.php b/tests/mock/config_php_file.php new file mode 100644 index 00000000000..9c5abfba37a --- /dev/null +++ b/tests/mock/config_php_file.php @@ -0,0 +1,27 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class phpbb_mock_config_php_file extends \phpbb\config_php_file { + public function __construct() + { + } + + protected function load_config_file() + { + if (!$this->config_loaded) + { + $this->config_data = phpbb_test_case_helpers::get_test_config(); + $this->config_loaded = true; + } + } +} diff --git a/tests/mock/container_builder.php b/tests/mock/container_builder.php index edf0d58a281..f67d3d35d44 100644 --- a/tests/mock/container_builder.php +++ b/tests/mock/container_builder.php @@ -18,6 +18,14 @@ class phpbb_mock_container_builder implements ContainerInterface protected $services = array(); protected $parameters = array(); + public function __construct() + { + $this->setParameter('debug.load_time', false); + $this->setParameter('session.log_errors', false); + $this->setParameter('session.force_sid', true); + $this->setParameter('finder.cache', false); + } + /** * Sets a service. * @@ -27,7 +35,7 @@ class phpbb_mock_container_builder implements ContainerInterface * * @api */ - public function set($id, $service, $shared = false) + public function set(string $id, mixed $service): void { $this->services[$id] = $service; } @@ -48,12 +56,12 @@ public function set($id, $service, $shared = false) * * @api */ - public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE) + public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE): object|null { if ($this->has($id)) { $service = $this->services[$id]; - if (is_array($service) && is_callable($service[0])) + if (is_array($service) && isset($service[0]) && is_callable($service[0])) { return call_user_func_array($service[0], $service[1]); } @@ -71,11 +79,11 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE * * @param string $id The service identifier * - * @return Boolean true if the service is defined, false otherwise + * @return bool true if the service is defined, false otherwise * * @api */ - public function has($id) + public function has(string $id): bool { return isset($this->services[$id]); } @@ -91,7 +99,7 @@ public function has($id) * * @api */ - public function getParameter($name) + public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null { if ($this->hasParameter($name)) { @@ -106,11 +114,11 @@ public function getParameter($name) * * @param string $name The parameter name * - * @return Boolean The presence of parameter in container + * @return bool The presence of parameter in container * * @api */ - public function hasParameter($name) + public function hasParameter(string $name): bool { return isset($this->parameters[$name]); } @@ -123,7 +131,7 @@ public function hasParameter($name) * * @api */ - public function setParameter($name, $value) + public function setParameter($name, array|bool|string|int|float|\UnitEnum|null $value): void { $this->parameters[$name] = $value; } @@ -189,12 +197,12 @@ public function isScopeActive($name) { } - public function isFrozen() + public function isCompiled() { return false; } - public function initialized($id) + public function initialized($id): bool { return true; } diff --git a/tests/mock/dummy_router.php b/tests/mock/dummy_router.php new file mode 100644 index 00000000000..5da71abc9f5 --- /dev/null +++ b/tests/mock/dummy_router.php @@ -0,0 +1,31 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +class phpbb_mock_dummy_router extends phpbb_mock_router +{ + public function __construct() + { + } + + public function get_matcher() + { + $this->create_new_url_matcher(); + return parent::get_matcher(); + } + + public function get_generator() + { + $this->create_new_url_generator(); + return parent::get_generator(); + } +} diff --git a/tests/mock/event_dispatcher.php b/tests/mock/event_dispatcher.php index fa8b4a10363..53a1e2d87b0 100644 --- a/tests/mock/event_dispatcher.php +++ b/tests/mock/event_dispatcher.php @@ -22,8 +22,16 @@ public function __construct() { } - public function trigger_event($eventName, $data = array()) + public function trigger_event($eventName, $data = array()): array { - return array(); + $data = (array) $data; + + // Throw an exception if we reach the core's exit_handler() + if ($eventName === 'core.exit_handler') + { + throw new \RuntimeException('Exit handler called'); + } + + return $data; } } diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php index 0d6d1106470..e07c856a18c 100644 --- a/tests/mock/extension_manager.php +++ b/tests/mock/extension_manager.php @@ -11,6 +11,7 @@ * */ + class phpbb_mock_extension_manager extends \phpbb\extension\manager { public function __construct($phpbb_root_path, $extensions = array(), $container = null) @@ -19,11 +20,9 @@ public function __construct($phpbb_root_path, $extensions = array(), $container $lang = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); $this->phpbb_root_path = $phpbb_root_path; - $this->php_ext = 'php'; $this->extensions = $extensions; - $this->filesystem = new \phpbb\filesystem\filesystem(); $this->container = $container; $this->config = new \phpbb\config\config(array()); - $this->user = new \phpbb\user($lang,'\phpbb\datetime'); + $this->finder_factory = new \phpbb\finder\factory(null, false, $this->phpbb_root_path, $phpEx); } } diff --git a/tests/mock/fileupload.php b/tests/mock/fileupload.php index 5a0afc6cd3e..83c43d8af08 100644 --- a/tests/mock/fileupload.php +++ b/tests/mock/fileupload.php @@ -21,6 +21,11 @@ class phpbb_mock_fileupload public $error_prefix = ''; public $valid_dimensions = true; + public $min_width = 0; + public $min_height = 0; + public $max_width = 0; + public $max_height = 0; + public function valid_dimensions($filespec) { return $this->valid_dimensions; diff --git a/tests/mock/lang.php b/tests/mock/lang.php index bebbe5a29b1..5de41f57756 100644 --- a/tests/mock/lang.php +++ b/tests/mock/lang.php @@ -17,25 +17,25 @@ */ class phpbb_mock_lang implements ArrayAccess { - public function offsetExists($offset) + public function offsetExists($offset): bool { return true; } - public function offsetGet($offset) + public function offsetGet($offset): mixed { return $offset; } - public function offsetSet($offset, $value) + public function offsetSet($offset, $value): void { } - public function offsetUnset($offset) + public function offsetUnset($offset): void { } - public function lang() + public function lang(): string { return implode(' ', func_get_args()); } diff --git a/tests/mock/notification_manager.php b/tests/mock/notification_manager.php index 952c0db4894..0b70d264eb0 100644 --- a/tests/mock/notification_manager.php +++ b/tests/mock/notification_manager.php @@ -61,6 +61,10 @@ public function delete_notifications() { } + public function delete_notifications_by_types() + { + } + public function get_subscription_types() { return array(); diff --git a/tests/mock/notification_type_post.php b/tests/mock/notification_type_post.php index 4116fecf5e8..fbc82c9845f 100644 --- a/tests/mock/notification_type_post.php +++ b/tests/mock/notification_type_post.php @@ -21,9 +21,10 @@ class phpbb_mock_notification_type_post extends \phpbb\notification\type\post { - public function __construct($user_loader, $db, $cache, $language, $user, $auth, $config, $phpbb_root_path, $php_ext, $notification_types_table, $user_notifications_table) + public function __construct($user_loader, $controller_helper, $db, $cache, $language, $user, $auth, $config, $phpbb_root_path, $php_ext, $notification_types_table, $user_notifications_table) { $this->user_loader = $user_loader; + $this->controller_helper = $controller_helper; $this->db = $db; $this->cache = $cache; $this->language = $language; diff --git a/tests/mock/request.php b/tests/mock/request.php index 6a32ba0cf1c..4985d6db2c6 100644 --- a/tests/mock/request.php +++ b/tests/mock/request.php @@ -11,7 +11,7 @@ * */ -class phpbb_mock_request implements \phpbb\request\request_interface +class phpbb_mock_request extends \phpbb\request\request { protected $data; @@ -41,13 +41,13 @@ public function raw_variable($var_name, $default, $super_global = \phpbb\request public function variable($var_name, $default, $multibyte = false, $super_global = \phpbb\request\request_interface::REQUEST) { - return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default; + return $this->data[$super_global][$var_name] ?? $default; } public function server($var_name, $default = '') { $super_global = \phpbb\request\request_interface::SERVER; - return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default; + return $this->data[$super_global][$var_name] ?? $default; } public function header($header_name, $default = '') @@ -115,7 +115,7 @@ public function set_header($header_name, $value) $this->data[\phpbb\request\request_interface::SERVER][$var_name] = $value; } - public function merge($super_global = \phpbb\request\request_interface::REQUEST, $values) + public function merge($values, $super_global = \phpbb\request\request_interface::REQUEST): void { $this->data[$super_global] = array_merge($this->data[$super_global], $values); } diff --git a/tests/mock/search_backend_mock.php b/tests/mock/search_backend_mock.php new file mode 100644 index 00000000000..33579ee5570 --- /dev/null +++ b/tests/mock/search_backend_mock.php @@ -0,0 +1,117 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\search\backend\search_backend_interface; + +class search_backend_mock implements search_backend_interface +{ + public $index_created = false; + + public function get_name(): string + { + return 'Mock search backend'; + } + + public function is_available(): bool + { + return true; + } + + public function init() + { + return false; + } + + public function get_search_query(): string + { + return ''; + } + + public function get_common_words(): array + { + return []; + } + + public function get_word_length() + { + return false; + } + + public function split_keywords(string &$keywords, string $terms): bool + { + return false; + } + + public function keyword_search(string $type, string $fields, string $terms, array $sort_by_sql, string $sort_key, string $sort_dir, string $sort_days, array $ex_fid_ary, string $post_visibility, int $topic_id, array $author_ary, string $author_name, array &$id_ary, int &$start, int $per_page) + { + return 0; + } + + public function author_search(string $type, bool $firstpost_only, array $sort_by_sql, string $sort_key, string $sort_dir, string $sort_days, array $ex_fid_ary, string $post_visibility, int $topic_id, array $author_ary, string $author_name, array &$id_ary, int &$start, int $per_page) + { + return 0; + } + + public function supports_phrase_search(): bool + { + return false; + } + + public function index(string $mode, int $post_id, string &$message, string &$subject, int $poster_id, int $forum_id) + { + // Nothing + } + + public function index_remove(array $post_ids, array $author_ids, array $forum_ids): void + { + // Nothing + } + + public function tidy(): void + { + // Nothing + } + + public function create_index(int &$post_counter = 0): array|null + { + $this->index_created = true; + return null; + } + + public function delete_index(int &$post_counter = 0): array|null + { + $this->index_created = true; + return null; + } + + public function index_created(): bool + { + return $this->index_created; + } + + public function index_stats() + { + return []; + } + + public function get_acp_options(): array + { + return []; + } + + public function get_type(): string + { + return static::class; + } +} + diff --git a/tests/mock/search_backend_mock_not_available.php b/tests/mock/search_backend_mock_not_available.php new file mode 100644 index 00000000000..5b299d334fe --- /dev/null +++ b/tests/mock/search_backend_mock_not_available.php @@ -0,0 +1,25 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class search_backend_mock_not_available extends search_backend_mock +{ + public function get_name(): string + { + return 'Mock unavailable search backend'; + } + + public function is_available(): bool + { + return false; + } +} diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php index 5a57eecf61b..84de6a5c6f8 100644 --- a/tests/mock/session_testable.php +++ b/tests/mock/session_testable.php @@ -21,6 +21,7 @@ class phpbb_mock_session_testable extends \phpbb\session { private $_cookies = array(); + public $lang = []; public function set_cookie($name, $data, $time, $httponly = true) { @@ -30,14 +31,14 @@ public function set_cookie($name, $data, $time, $httponly = true) /** * Checks if the cookies were set correctly. * - * @param PHPUnit_Framework_Assert test The test from which this is called - * @param array(string => mixed) cookies The cookie data to check against. + * @param PHPUnit\Framework\Assert $test The test from which this is called + * @param array $cookies The cookie data to check against. * The keys are cookie names, the values can either be null to * check only the existence of the cookie, or an array(d, t), * where d is the cookie data to check, or null to skip the * check and t is the cookie time to check, or null to skip. */ - public function check_cookies(PHPUnit_Framework_Assert $test, $cookies) + public function check_cookies(PHPUnit\Framework\Assert $test, $cookies) { $test->assertEquals(array_keys($cookies), array_keys($this->_cookies), 'Incorrect cookies were set'); @@ -61,7 +62,7 @@ public function check_cookies(PHPUnit_Framework_Assert $test, $cookies) } } - public function setup() + public function setup($lang_set = false, $style_id = false) { } } diff --git a/tests/mock/user.php b/tests/mock/user.php index 9888337a9ed..f6bf0166e19 100644 --- a/tests/mock/user.php +++ b/tests/mock/user.php @@ -21,19 +21,25 @@ class phpbb_mock_user { public $host = "testhost"; public $page = array('root_script_path' => '/'); - + public $style = []; + public $data = []; + public $lang = []; + public $ip = ''; + public $module; + public $session_id; + private $options = array(); - public function optionget($item) + public function optionget($item, $data = false) { if (!isset($this->options[$item])) { throw new Exception(sprintf("You didn't set the option '%s' on the mock user using optionset.", $item)); } - + return $this->options[$item]; } - - public function optionset($item, $value) + + public function optionset($item, $value, $data = false) { $this->options[$item] = $value; } diff --git a/tests/network/checkdnsrr_test.php b/tests/network/checkdnsrr_test.php deleted file mode 100644 index 6503a4c40b3..00000000000 --- a/tests/network/checkdnsrr_test.php +++ /dev/null @@ -1,67 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -/** -* @group slow -*/ -class phpbb_network_checkdnsrr_test extends phpbb_test_case -{ - public function data_provider() - { - return array( - // Existing MX record - array('phpbb.com', 'MX', true), - - // Non-existing MX record - array('does-not-exist.phpbb.com', 'MX', false), - - // Existing A record - array('www.phpbb.com', 'A', true), - - // Non-existing A record - array('does-not-exist.phpbb.com', 'A', false), - - // Existing AAAA record - array('www.six.heise.de', 'AAAA', true), - - // Non-existing AAAA record - array('does-not-exist.phpbb.com', 'AAAA', false), - - // Existing CNAME record - array('news.cnet.com', 'CNAME', true), - - // Non-existing CNAME record - array('does-not-exist.phpbb.com', 'CNAME', false), - - // Existing NS record - array('phpbb.com', 'NS', true), - - // Non-existing NS record - array('does-not-exist', 'NS', false), - - // Existing TXT record - array('phpbb.com', 'TXT', true), - - // Non-existing TXT record - array('does-not-exist', 'TXT', false), - ); - } - - /** - * @dataProvider data_provider - */ - public function test_checkdnsrr($host, $type, $expected) - { - $this->assertEquals($expected, phpbb_checkdnsrr($host, $type)); - } -} diff --git a/tests/network/ftp_fsock_pasv_epsv_test.php b/tests/network/ftp_fsock_pasv_epsv_test.php index 4ec21b6f759..23c3e159e12 100644 --- a/tests/network/ftp_fsock_pasv_epsv_test.php +++ b/tests/network/ftp_fsock_pasv_epsv_test.php @@ -11,16 +11,16 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_transfer.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_transfer.php'; /** * @group slow */ class phpbb_network_ftp_fsock_pasv_epsv_test extends phpbb_test_case { - static protected $ipv4; + protected static $ipv4; - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { $hostname = 'ftp.debian.org.'; self::$ipv4 = gethostbyname($hostname); @@ -55,7 +55,7 @@ protected function assert_ls_contains_debian($hostname) { $this->markTestSkipped("Failed to connect to $hostname: $result"); } - $this->assertContains('debian', $o->_ls()); + $this->assertStringContainsString('debian', $o->_ls()); $o->_close(); } diff --git a/tests/network/inet_ntop_pton_test.php b/tests/network/inet_ntop_pton_test.php deleted file mode 100644 index dbd58ce783e..00000000000 --- a/tests/network/inet_ntop_pton_test.php +++ /dev/null @@ -1,56 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -class phpbb_network_inet_ntop_pton_test extends phpbb_test_case -{ - public function data_provider() - { - return array( - array('127.0.0.1', '7f000001'), - array('192.232.131.223', 'c0e883df'), - array('13.1.68.3', '0d014403'), - array('129.144.52.38', '81903426'), - - array('2001:280:0:10::5', '20010280000000100000000000000005'), - array('fe80::200:4cff:fefe:172f', 'fe8000000000000002004cfffefe172f'), - - array('::', '00000000000000000000000000000000'), - array('::1', '00000000000000000000000000000001'), - array('1::', '00010000000000000000000000000000'), - - array('1:1:0:0:1::', '00010001000000000001000000000000'), - - array('0:2:3:4:5:6:7:8', '00000002000300040005000600070008'), - array('1:2:0:4:5:6:7:8', '00010002000000040005000600070008'), - array('1:2:3:4:5:6:7:0', '00010002000300040005000600070000'), - - array('2001:0:0:1::1', '20010000000000010000000000000001'), - ); - } - - /** - * @dataProvider data_provider - */ - public function test_inet_ntop($address, $hex) - { - $this->assertEquals($address, phpbb_inet_ntop(pack('H*', $hex))); - } - - /** - * @dataProvider data_provider - */ - public function test_inet_pton($address, $hex) - { - $this->assertEquals($hex, bin2hex(phpbb_inet_pton($address))); - } -} diff --git a/tests/network/ip_normalise_test.php b/tests/network/ip_normalise_test.php index 52e594e1152..e15c76af1d8 100644 --- a/tests/network/ip_normalise_test.php +++ b/tests/network/ip_normalise_test.php @@ -13,7 +13,7 @@ class phpbb_network_ip_normalise_test extends phpbb_test_case { - public function data_provider() + public static function data_provider() { return array( // From: A Recommendation for IPv6 Address Text Representation diff --git a/tests/notification/base.php b/tests/notification/base.php index 80b9a0d7778..d3d07c46c06 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -15,11 +15,13 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; -require_once dirname(__FILE__) . '/manager_helper.php'; +require_once __DIR__ . '/manager_helper.php'; abstract class phpbb_tests_notification_base extends phpbb_database_test_case { - protected $notifications, $db, $container, $user, $config, $auth, $cache; + /** @var phpbb_notification_manager_helper */ + protected $notifications; + protected $db, $container, $user, $config, $auth, $cache, $user_loader, $phpbb_dispatcher; protected function get_notification_types() { @@ -30,6 +32,8 @@ protected function get_notification_types() 'notification.type.bookmark', 'notification.type.disapprove_post', 'notification.type.disapprove_topic', + 'notification.type.forum', + 'notification.type.mention', 'notification.type.pm', 'notification.type.post', 'notification.type.post_in_queue', @@ -50,7 +54,7 @@ protected function get_notification_methods() ); } - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -60,6 +64,9 @@ protected function setUp() global $db, $config, $user, $auth, $cache, $phpbb_container; + $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') + ->disableOriginalConstructor() + ->getMock(); $db = $this->db = $this->new_dbal(); $config = $this->config = new \phpbb\config\config(array( 'allow_privmsg' => true, @@ -67,42 +74,61 @@ protected function setUp() 'allow_topic_notify' => true, 'allow_forum_notify' => true, 'allow_board_notifications' => true, + 'allow_mentions' => true, )); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); + $user->data['user_id'] = 0; + $user->data['user_type'] = USER_NORMAL; $this->user = $user; - $this->user_loader = new \phpbb\user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); + $this->user_loader = new \phpbb\user_loader($avatar_helper, $this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); $auth = $this->auth = new phpbb_mock_notifications_auth(); + $this->phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $cache_driver = new \phpbb\cache\driver\dummy(); $cache = $this->cache = new \phpbb\cache\service( $cache_driver, $this->config, $this->db, + $this->phpbb_dispatcher, $phpbb_root_path, $phpEx ); - $this->phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $phpbb_container = $this->container = new ContainerBuilder(); $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); $loader->load('services_notification.yml'); + $phpbb_container->set('avatar.helper', $avatar_helper); $phpbb_container->set('user_loader', $this->user_loader); $phpbb_container->set('user', $user); $phpbb_container->set('language', $lang); $phpbb_container->set('config', $this->config); + $phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper')); $phpbb_container->set('dbal.conn', $this->db); $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('cache', $cache); + $phpbb_container->set('log', new \phpbb\log\dummy()); $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); - $phpbb_container->set('dispatcher', $this->phpbb_dispatcher); + $phpbb_container->set( + 'text_formatter.s9e.mention_helper', + new \phpbb\textformatter\s9e\mention_helper( + $this->db, + $auth, + $this->user, + $phpbb_root_path, + $phpEx + ) + ); + $phpbb_container->set('event_dispatcher', $this->phpbb_dispatcher); $phpbb_container->setParameter('core.root_path', $phpbb_root_path); $phpbb_container->setParameter('core.php_ext', $phpEx); $phpbb_container->setParameter('tables.notifications', 'phpbb_notifications'); $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); $phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types'); + $phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails'); + $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); + $phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions'); $this->notifications = new phpbb_notification_manager_helper( array(), @@ -119,6 +145,13 @@ protected function setUp() ); $phpbb_container->set('notification_manager', $this->notifications); + + $phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass()); + + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $messenger_method_collection->add('messenger.method.email'); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + $phpbb_container->compile(); $this->notifications->setDependencies($this->auth, $this->config); diff --git a/tests/notification/convert_test.php b/tests/notification/convert_test.php index 4a7fd894091..b890b475999 100644 --- a/tests/notification/convert_test.php +++ b/tests/notification/convert_test.php @@ -10,33 +10,55 @@ * the docs/CREDITS.txt file. * */ -require_once dirname(__FILE__) . '/../mock/sql_insert_buffer.php'; +require_once __DIR__ . '/../mock/sql_insert_buffer.php'; class phpbb_notification_convert_test extends phpbb_database_test_case { - protected $notifications, $db, $container, $user, $config, $auth, $cache; + protected $db; + protected $doctrine_db; + protected $migration; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/convert.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/convert.xml'); } - protected function setUp() + protected function setUp(): void { parent::setUp(); global $phpbb_root_path, $phpEx; $this->db = $this->new_dbal(); + $this->doctrine_db = $this->new_doctrine_dbal(); $factory = new \phpbb\db\tools\factory(); + $db_tools = $factory->get($this->doctrine_db); + $core_tables = self::get_core_tables(); + + // Add user_notify_type column for testing this migration and set type + $db_tools->sql_column_add($core_tables['users'], 'user_notify_type', ['TINT:4', 0]); + $user_notify_type_map = [ + 1 => 0, + 2 => 0, + 3 => 1, + 4 => 1, + 5 => 2, + 6 => 2, + ]; + + foreach ($user_notify_type_map as $user_id => $notify_type) + { + $this->db->sql_query('UPDATE ' . $core_tables['users'] . ' SET user_notify_type = ' . (int) $notify_type . ' WHERE user_id = ' . (int) $user_id); + } $this->migration = new \phpbb\db\migration\data\v310\notification_options_reconvert( new \phpbb\config\config(array()), $this->db, - $factory->get($this->db), + $db_tools, $phpbb_root_path, $phpEx, - 'phpbb_' + 'phpbb_', + $core_tables ); } diff --git a/tests/notification/ext/test/notification/type/test.php b/tests/notification/ext/test/notification/type/test.php index 7f3b4a4ef17..f325efba6ec 100644 --- a/tests/notification/ext/test/notification/type/test.php +++ b/tests/notification/ext/test/notification/type/test.php @@ -28,26 +28,26 @@ public function get_type() return 'test'; } - public static function get_item_id($post) + public static function get_item_id($type_data) { - return (int) $post['post_id']; + return (int) $type_data['post_id']; } - public static function get_item_parent_id($post) + public static function get_item_parent_id($type_data) { - return (int) $post['topic_id']; + return (int) $type_data['topic_id']; } - public function find_users_for_notification($post, $options = array()) + public function find_users_for_notification($type_data, $options = array()) { return $this->check_user_notification_options(array(0), $options); } - public function create_insert_array($post, $pre_create_data = array()) + public function create_insert_array($type_data, $pre_create_data = array()) { - $this->notification_time = $post['post_time']; + $this->notification_time = $type_data['post_time']; - parent::create_insert_array($post, $pre_create_data); + parent::create_insert_array($type_data, $pre_create_data); } public function create_update_array($type_data) diff --git a/tests/notification/fixtures/convert.xml b/tests/notification/fixtures/convert.xml index c9d8fafa973..9b357504d16 100644 --- a/tests/notification/fixtures/convert.xml +++ b/tests/notification/fixtures/convert.xml @@ -4,7 +4,6 @@ user_id username username_clean - user_notify_type user_notify_pm user_permissions user_sig @@ -13,7 +12,6 @@ 1 1 0 - 0 @@ -21,7 +19,6 @@ 2 2 2 - 0 1 @@ -30,7 +27,6 @@ 3 3 3 - 1 0 @@ -40,7 +36,6 @@ 4 4 1 - 1 @@ -48,7 +43,6 @@ 5 5 5 - 2 0 @@ -57,7 +51,6 @@ 6 6 6 - 2 1 diff --git a/tests/notification/fixtures/email_notification.type.post.xml b/tests/notification/fixtures/email_notification.type.post.xml new file mode 100644 index 00000000000..7a4a7191eb3 --- /dev/null +++ b/tests/notification/fixtures/email_notification.type.post.xml @@ -0,0 +1,286 @@ + + + + forum_id + user_id + notify_status + + 1 + 6 + 0 + + + 1 + 7 + 0 + + + 1 + 8 + 0 + +
      + + notification_id + notification_type_id + user_id + item_id + item_parent_id + notification_read + notification_data + + 1 + 1 + 5 + 1 + 1 + 0 + + + + 2 + 1 + 8 + 1 + 1 + 0 + + +
      + + notification_type_id + notification_type_name + notification_type_enabled + + 1 + notification.type.post + 1 + + + 2 + notification.type.forum + 1 + +
      + + post_id + topic_id + forum_id + post_text + + 1 + 1 + 1 + + +
      + + topic_id + forum_id + + 1 + 1 + + + 2 + 1 + +
      + + topic_id + user_id + notify_status + + 1 + 2 + 0 + + + 2 + 2 + 0 + + + 1 + 3 + 0 + + + 1 + 4 + 0 + + + 1 + 5 + 0 + + + 1 + 6 + 0 + +
      + + user_id + username_clean + user_permissions + user_sig + + 2 + poster + + + + + 3 + test + + + + + 4 + unauthorized + + + + + 5 + notified + + + + + 6 + disabled + + + + + 7 + default + + + +
      + + id + item_type + item_id + user_id + method + notify + + 1 + notification.type.post + 0 + 2 + notification.method.email + 1 + + + 2 + notification.type.post + 0 + 3 + notification.method.email + 1 + + + 3 + notification.type.post + 0 + 4 + notification.method.email + 1 + + + 4 + notification.type.post + 0 + 5 + notification.method.email + 1 + + + 5 + notification.type.post + 0 + 6 + notification.method.email + 1 + + + 6 + notification.type.post + 0 + 7 + notification.method.email + 1 + + + 7 + notification.type.post + 0 + 8 + notification.method.email + 1 + + + 8 + notification.type.forum + 0 + 2 + notification.method.email + 1 + + + 9 + notification.type.forum + 0 + 3 + notification.method.email + 1 + + + 10 + notification.type.forum + 0 + 4 + notification.method.email + 1 + + + 11 + notification.type.forum + 0 + 5 + notification.method.email + 1 + + + 12 + notification.type.forum + 0 + 6 + notification.method.email + 1 + + + 13 + notification.type.forum + 0 + 7 + notification.method.email + 1 + + + 14 + notification.type.forum + 0 + 8 + notification.method.email + 1 + +
      +       diff --git a/tests/notification/fixtures/services_notification.yml b/tests/notification/fixtures/services_notification.yml index c83d8bd3235..fd256f3016e 100644 --- a/tests/notification/fixtures/services_notification.yml +++ b/tests/notification/fixtures/services_notification.yml @@ -14,6 +14,9 @@ services: config: synthetic: true + controller.helper: + synthetic: true + dbal.conn: synthetic: true @@ -38,7 +41,7 @@ services: groupposition.teampage: synthetic: true - groupposition.teampage: + request: synthetic: true text_formatter.s9e.factory: @@ -47,6 +50,9 @@ services: text_formatter.s9e.quote_helper: synthetic: true + text_formatter.s9e.mention_helper: + synthetic: true + text_formatter.parser: synthetic: true diff --git a/tests/notification/fixtures/submit_post_notification.type.bookmark.xml b/tests/notification/fixtures/submit_post_notification.type.bookmark.xml index db1cef2ef6b..1e6b6a19ca8 100644 --- a/tests/notification/fixtures/submit_post_notification.type.bookmark.xml +++ b/tests/notification/fixtures/submit_post_notification.type.bookmark.xml @@ -119,12 +119,14 @@ + iditem_typeitem_iduser_idmethodnotify + 1 notification.type.bookmark 0 2 @@ -132,6 +134,7 @@ 1 + 2 notification.type.bookmark 0 3 @@ -139,6 +142,7 @@ 1 + 3 notification.type.bookmark 0 4 @@ -146,6 +150,7 @@ 1 + 4 notification.type.bookmark 0 5 @@ -153,11 +158,20 @@ 1 + 5 notification.type.bookmark 0 6 notification.method.board 0 + + 6 + notification.type.bookmark + 0 + 3 + notification.method.nonexistent + 1 +
      diff --git a/tests/notification/fixtures/submit_post_notification.type.forum.xml b/tests/notification/fixtures/submit_post_notification.type.forum.xml new file mode 100644 index 00000000000..c12c8786043 --- /dev/null +++ b/tests/notification/fixtures/submit_post_notification.type.forum.xml @@ -0,0 +1,277 @@ + + + + forum_id + user_id + notify_status + + 1 + 2 + 0 + + + 1 + 3 + 0 + + + 1 + 4 + 0 + + + 1 + 5 + 0 + + + 1 + 6 + 0 + +
      + + notification_id + notification_type_id + user_id + item_id + item_parent_id + notification_read + notification_data + + 1 + 1 + 5 + 1 + 1 + 0 + + + + 2 + 1 + 8 + 1 + 1 + 0 + + +
      + + notification_type_id + notification_type_name + notification_type_enabled + + 1 + notification.type.forum + 1 + + + 2 + notification.type.post + 1 + +
      + + post_id + topic_id + forum_id + post_text + + 1 + 1 + 1 + + +
      + + topic_id + forum_id + + 1 + 1 + +
      + + topic_id + user_id + notify_status + + 1 + 6 + 0 + + + 1 + 7 + 0 + + + 1 + 8 + 0 + +
      + + user_id + username_clean + user_permissions + user_sig + + 2 + poster + + + + + 3 + test + + + + + 4 + unauthorized + + + + + 5 + notified + + + + + 6 + disabled + + + + + 7 + default + + + +
      + + id + item_type + item_id + user_id + method + notify + + 1 + notification.type.post + 0 + 2 + notification.method.board + 1 + + + 2 + notification.type.post + 0 + 3 + notification.method.board + 1 + + + 3 + notification.type.post + 0 + 4 + notification.method.board + 1 + + + 4 + notification.type.post + 0 + 5 + notification.method.board + 1 + + + 5 + notification.type.post + 0 + 6 + notification.method.board + 1 + + + 6 + notification.type.post + 0 + 7 + notification.method.board + 1 + + + 7 + notification.type.post + 0 + 8 + notification.method.board + 1 + + + 8 + notification.type.forum + 0 + 2 + notification.method.board + 1 + + + 9 + notification.type.forum + 0 + 3 + notification.method.board + 1 + + + 10 + notification.type.forum + 0 + 4 + notification.method.board + 1 + + + 11 + notification.type.forum + 0 + 5 + notification.method.board + 1 + + + 12 + notification.type.forum + 0 + 6 + notification.method.board + 1 + + + 13 + notification.type.forum + 0 + 7 + notification.method.board + 1 + + + 14 + notification.type.forum + 0 + 8 + notification.method.board + 1 + +
      +       diff --git a/tests/notification/fixtures/submit_post_notification.type.mention.xml b/tests/notification/fixtures/submit_post_notification.type.mention.xml new file mode 100644 index 00000000000..7faf22c4011 --- /dev/null +++ b/tests/notification/fixtures/submit_post_notification.type.mention.xml @@ -0,0 +1,194 @@ + + + + group_id + group_name + group_type + group_desc + + 1 + Normal group + 0 + + + + 2 + Hidden group + 2 + + +
      + + notification_id + notification_type_id + user_id + item_id + item_parent_id + notification_read + notification_data + + 1 + 1 + 5 + 1 + 1 + 0 + + +
      + + notification_type_id + notification_type_name + notification_type_enabled + + 1 + notification.type.mention + 1 + +
      + + post_id + topic_id + forum_id + post_text + + 1 + 1 + 1 + + +
      + + topic_id + forum_id + + 1 + 1 + +
      + + user_id + username_clean + user_permissions + user_sig + + 2 + poster + + + + + 3 + test + + + + + 4 + unauthorized + + + + + 5 + notified + + + + + 6 + disabled + + + + + 7 + default + + + + + 8 + member of normal group + + + + + 9 + member of hidden group + + + +
      + + user_id + group_id + user_pending + + 8 + 1 + 0 + + + 9 + 2 + 0 + +
      + + id + item_type + item_id + user_id + method + notify + + 1 + notification.type.mention + 0 + 2 + notification.method.board + 1 + + + 2 + notification.type.mention + 0 + 3 + notification.method.board + 1 + + + 3 + notification.type.mention + 0 + 4 + notification.method.board + 1 + + + 4 + notification.type.mention + 0 + 5 + notification.method.board + 1 + + + 5 + notification.type.mention + 0 + 6 + notification.method.board + 0 + + + 6 + notification.type.mention + 0 + 8 + notification.method.board + 1 + +
      +       diff --git a/tests/notification/fixtures/submit_post_notification.type.post.xml b/tests/notification/fixtures/submit_post_notification.type.post.xml index 920b2715259..7d760cd1ebf 100644 --- a/tests/notification/fixtures/submit_post_notification.type.post.xml +++ b/tests/notification/fixtures/submit_post_notification.type.post.xml @@ -56,6 +56,11 @@ notification.type.post 1 + + 2 + notification.type.forum + 1 + post_id @@ -150,12 +155,14 @@
      + iditem_typeitem_iduser_idmethodnotify + 1 notification.type.post 0 2 @@ -163,6 +170,7 @@ 1 + 2 notification.type.post 0 3 @@ -170,6 +178,7 @@ 1 + 3 notification.type.post 0 4 @@ -177,6 +186,7 @@ 1 + 4 notification.type.post 0 5 @@ -184,6 +194,7 @@ 1 + 5 notification.type.post 0 6 @@ -191,6 +202,7 @@ 1 + 6 notification.type.post 0 7 @@ -198,11 +210,68 @@ 1 + 7 notification.type.post 0 8 notification.method.board 1 + + 8 + notification.type.forum + 0 + 2 + notification.method.board + 1 + + + 9 + notification.type.forum + 0 + 3 + notification.method.board + 1 + + + 10 + notification.type.forum + 0 + 4 + notification.method.board + 1 + + + 11 + notification.type.forum + 0 + 5 + notification.method.board + 1 + + + 12 + notification.type.forum + 0 + 6 + notification.method.board + 1 + + + 13 + notification.type.forum + 0 + 7 + notification.method.board + 1 + + + 14 + notification.type.forum + 0 + 8 + notification.method.board + 1 +
      diff --git a/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml b/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml index 12e73b0ff22..fe0a99bdc51 100644 --- a/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml +++ b/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml @@ -103,12 +103,14 @@ + iditem_typeitem_iduser_idmethodnotify + 1 notification.type.needs_approval 0 2 @@ -116,6 +118,7 @@ 1 + 2 notification.type.needs_approval 0 3 @@ -123,6 +126,7 @@ 1 + 3 notification.type.needs_approval 0 4 @@ -130,6 +134,7 @@ 1 + 4 notification.type.needs_approval 0 5 @@ -137,6 +142,7 @@ 1 + 5 notification.type.needs_approval 0 6 @@ -144,6 +150,7 @@ 1 + 6 notification.type.needs_approval 0 7 @@ -151,6 +158,7 @@ 0 + 7 notification.type.needs_approval 0 9 diff --git a/tests/notification/fixtures/submit_post_notification.type.quote.xml b/tests/notification/fixtures/submit_post_notification.type.quote.xml index 9f4ba914754..8fe85d0db39 100644 --- a/tests/notification/fixtures/submit_post_notification.type.quote.xml +++ b/tests/notification/fixtures/submit_post_notification.type.quote.xml @@ -91,12 +91,14 @@
      + iditem_typeitem_iduser_idmethodnotify + 1 notification.type.quote 0 2 @@ -104,6 +106,7 @@ 1 + 2 notification.type.quote 0 3 @@ -111,6 +114,7 @@ 1 + 3 notification.type.quote 0 4 @@ -118,6 +122,7 @@ 1 + 4 notification.type.quote 0 5 @@ -125,6 +130,7 @@ 1 + 5 notification.type.quote 0 6 diff --git a/tests/notification/fixtures/submit_post_notification.type.topic.xml b/tests/notification/fixtures/submit_post_notification.type.topic.xml index 1f96ed2ee78..eebab64e6b4 100644 --- a/tests/notification/fixtures/submit_post_notification.type.topic.xml +++ b/tests/notification/fixtures/submit_post_notification.type.topic.xml @@ -99,12 +99,14 @@
      + iditem_typeitem_iduser_idmethodnotify + 1 notification.type.topic 0 2 @@ -112,6 +114,7 @@ 1 + 2 notification.type.topic 0 6 @@ -119,6 +122,7 @@ 1 + 3 notification.type.topic 0 7 @@ -126,6 +130,7 @@ 1 + 4 notification.type.topic 0 8 diff --git a/tests/notification/fixtures/webpush_notification.type.post.xml b/tests/notification/fixtures/webpush_notification.type.post.xml new file mode 100644 index 00000000000..89c5354030a --- /dev/null +++ b/tests/notification/fixtures/webpush_notification.type.post.xml @@ -0,0 +1,307 @@ + + +
      +
      + + forum_id + user_id + notify_status + + 1 + 6 + 0 + + + 1 + 7 + 0 + + + 1 + 8 + 0 + +
      + + notification_id + notification_type_id + user_id + item_id + item_parent_id + notification_read + notification_data + + 1 + 1 + 5 + 1 + 1 + 0 + + + + 2 + 1 + 8 + 1 + 1 + 0 + + +
      + +
      + + notification_type_id + notification_type_name + notification_type_enabled + + 1 + notification.type.post + 1 + + + 2 + notification.type.forum + 1 + +
      + + post_id + topic_id + forum_id + post_text + + 1 + 1 + 1 + + +
      + + subscription_id + user_id + endpoint +
      + + topic_id + forum_id + + 1 + 1 + + + 2 + 1 + +
      + + topic_id + user_id + notify_status + + 1 + 2 + 0 + + + 2 + 2 + 0 + + + 1 + 3 + 0 + + + 1 + 4 + 0 + + + 1 + 5 + 0 + + + 1 + 6 + 0 + +
      + + user_id + username_clean + user_permissions + user_sig + + 1 + Anonymous + + + + + 2 + poster + + + + + 3 + test + + + + + 4 + unauthorized + + + + + 5 + notified + + + + + 6 + disabled + + + + + 7 + default + + + + + 8 + latest + + + +
      + + id + item_type + item_id + user_id + method + notify + + 1 + notification.type.post + 0 + 2 + notification.method.webpush + 1 + + + 2 + notification.type.post + 0 + 3 + notification.method.webpush + 1 + + + 3 + notification.type.post + 0 + 4 + notification.method.webpush + 1 + + + 4 + notification.type.post + 0 + 5 + notification.method.webpush + 1 + + + 5 + notification.type.post + 0 + 6 + notification.method.webpush + 1 + + + 6 + notification.type.post + 0 + 7 + notification.method.webpush + 1 + + + 7 + notification.type.post + 0 + 8 + notification.method.webpush + 1 + + + 8 + notification.type.forum + 0 + 2 + notification.method.webpush + 1 + + + 9 + notification.type.forum + 0 + 3 + notification.method.webpush + 1 + + + 10 + notification.type.forum + 0 + 4 + notification.method.webpush + 1 + + + 11 + notification.type.forum + 0 + 5 + notification.method.webpush + 1 + + + 12 + notification.type.forum + 0 + 6 + notification.method.webpush + 1 + + + 13 + notification.type.forum + 0 + 7 + notification.method.webpush + 1 + + + 14 + notification.type.forum + 0 + 8 + notification.method.webpush + 1 + +
      + diff --git a/tests/notification/group_request_test.php b/tests/notification/group_request_test.php index 92e758a336c..b593957bbcb 100644 --- a/tests/notification/group_request_test.php +++ b/tests/notification/group_request_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_notification_group_request_test extends phpbb_tests_notification_base { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/group_request.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/group_request.xml'); } protected function get_notification_types() @@ -40,18 +40,32 @@ public function test_notifications() include_once($phpbb_root_path . 'includes/functions_content.' . $phpEx); $this->container->set('groupposition.legend', new \phpbb\groupposition\legend( - $this->db, - $this->user + $this->db )); $this->container->set('groupposition.teampage', new \phpbb\groupposition\teampage( $this->db, - $this->user, $this->cache->get_driver() )); $this->container->set('group_helper', new \phpbb\group\helper( + $this->getMockBuilder('\phpbb\auth\auth')->disableOriginalConstructor()->getMock(), + $this->getMockBuilder('\phpbb\avatar\helper')->disableOriginalConstructor()->getMock(), + $this->db, + $this->cache, + $this->config, new \phpbb\language\language( new phpbb\language\language_file_loader($phpbb_root_path, $phpEx) - ) + ), + new phpbb_mock_event_dispatcher(), + new \phpbb\path_helper( + new \phpbb\symfony_request( + new phpbb_mock_request() + ), + $this->getMockBuilder('\phpbb\request\request')->disableOriginalConstructor()->getMock(), + $phpbb_root_path, + $phpEx + ), + $this->getMockBuilder('\phpbb\template\template')->disableOriginalConstructor()->getMock(), + $this->user )); $phpbb_dispatcher = new phpbb_mock_event_dispatcher; $phpbb_log = new \phpbb\log\dummy(); diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php new file mode 100644 index 00000000000..05586e5cc8a --- /dev/null +++ b/tests/notification/notification_method_email_test.php @@ -0,0 +1,309 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use Symfony\Component\Config\FileLocator; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; + +require_once __DIR__ . '/base.php'; + +class notification_method_email_test extends phpbb_tests_notification_base +{ + /** @var \phpbb\notification\method\email */ + protected $notification_method_email; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/email_notification.type.post.xml'); + } + + protected function get_notification_methods() + { + return [ + 'notification.method.email', + ]; + } + + protected function setUp(): void + { + phpbb_database_test_case::setUp(); + + global $phpbb_root_path, $phpEx; + + include_once(__DIR__ . '/ext/test/notification/type/test.' . $phpEx); + + global $db, $config, $user, $auth, $cache, $phpbb_container; + + $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') + ->disableOriginalConstructor() + ->getMock(); + $db = $this->db = $this->new_dbal(); + $config = $this->config = new \phpbb\config\config([ + 'allow_privmsg' => true, + 'allow_bookmarks' => true, + 'allow_topic_notify' => true, + 'allow_forum_notify' => true, + 'allow_board_notifications' => true, + ]); + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $lang = new \phpbb\language\language($lang_loader); + $user = new \phpbb\user($lang, '\phpbb\datetime'); + $this->user = $user; + $this->user_loader = new \phpbb\user_loader($avatar_helper, $this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); + $auth = $this->auth = new phpbb_mock_notifications_auth(); + $this->phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $cache_driver = new \phpbb\cache\driver\dummy(); + $cache = $this->cache = new \phpbb\cache\service( + $cache_driver, + $this->config, + $this->db, + $this->phpbb_dispatcher, + $phpbb_root_path, + $phpEx + ); + + $phpbb_container = $this->container = new ContainerBuilder(); + $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); + $loader->load('services_notification.yml'); + $phpbb_container->set('avatar.helper', $avatar_helper); + $phpbb_container->set('user_loader', $this->user_loader); + $phpbb_container->set('user', $user); + $phpbb_container->set('language', $lang); + $phpbb_container->set('config', $this->config); + $phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper')); + $phpbb_container->set('dbal.conn', $this->db); + $phpbb_container->set('auth', $auth); + $phpbb_container->set('cache.driver', $cache_driver); + $phpbb_container->set('cache', $cache); + $phpbb_container->set('log', new \phpbb\log\dummy()); + $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); + $phpbb_container->set('event_dispatcher', $this->phpbb_dispatcher); + $phpbb_container->setParameter('core.root_path', $phpbb_root_path); + $phpbb_container->setParameter('core.php_ext', $phpEx); + $phpbb_container->setParameter('tables.notifications', 'phpbb_notifications'); + $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); + $phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types'); + $phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails'); + $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); + $phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions'); + $phpbb_container->set( + 'text_formatter.s9e.mention_helper', + new \phpbb\textformatter\s9e\mention_helper( + $this->db, + $auth, + $this->user, + $phpbb_root_path, + $phpEx + ) + ); + + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $messenger_method_collection->add('messenger.method.email'); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + + $this->notification_method_email = $this->getMockBuilder('\phpbb\notification\method\email') + ->setConstructorArgs([ + $phpbb_container->get('user_loader'), + $phpbb_container->get('user'), + $phpbb_container->get('config'), + $phpbb_container->get('dbal.conn'), + $phpbb_root_path, + $phpEx, + $phpbb_container->getParameter('tables.notification_emails'), + $phpbb_container->get('messenger.method_collection') + ]) + ->onlyMethods(['notify_using_messenger']) + ->getMock(); + $notification_method_email = $this->notification_method_email; + + $class = new ReflectionClass($notification_method_email); + $empty_queue_method = $class->getMethod('empty_queue'); + + $this->notification_method_email->method('notify_using_messenger') + ->will($this->returnCallback(function () use ($notification_method_email, $empty_queue_method) { + $empty_queue_method->invoke($notification_method_email); + })); + + $phpbb_container->set('notification.method.email', $this->notification_method_email); + + $this->notifications = new phpbb_notification_manager_helper( + array(), + array(), + $this->container, + $this->user_loader, + $this->phpbb_dispatcher, + $this->db, + $this->cache, + $lang, + $this->user, + 'phpbb_notification_types', + 'phpbb_user_notifications' + ); + + $phpbb_container->set('notification_manager', $this->notifications); + + $phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass()); + + $phpbb_container->compile(); + + $this->notifications->setDependencies($this->auth, $this->config); + + $types = array(); + foreach ($this->get_notification_types() as $type) + { + $class = $this->build_type($type); + + $types[$type] = $class; + } + + $this->notifications->set_var('notification_types', $types); + + $methods = array(); + foreach ($this->get_notification_methods() as $method) + { + $class = $this->container->get($method); + + $methods[$method] = $class; + } + + $this->notifications->set_var('notification_methods', $methods); + } + + public static function data_notification_email() + { + return [ + /** + * Normal post + * + * User => State description + * 2 => Topic id=1 and id=2 subscribed, should receive a new topics post notification + * 3 => Topic id=1 subscribed, should receive a new topic post notification + * 4 => Topic id=1 subscribed, should receive a new topic post notification + * 5 => Topic id=1 subscribed, post id=1 already notified, should receive a new topic post notification + * 6 => Topic id=1 and forum id=1 subscribed, should receive a new topic/forum post notification + * 7 => Forum id=1 subscribed, should NOT receive a new topic post but a forum post notification + * 8 => Forum id=1 subscribed, post id=1 already notified, should NOT receive a new topic post but a forum post notification + */ + [ + 'notification.type.post', + [ + 'forum_id' => '1', + 'post_id' => '2', + 'topic_id' => '1', + ], + [ + 2 => ['user_id' => '2'], + 3 => ['user_id' => '3'], + 4 => ['user_id' => '4'], + 5 => ['user_id' => '5'], + 6 => ['user_id' => '6'], + ], + ], + [ + 'notification.type.forum', + [ + 'forum_id' => '1', + 'post_id' => '3', + 'topic_id' => '1', + ], + [ + 6 => ['user_id' => '6'], + 7 => ['user_id' => '7'], + 8 => ['user_id' => '8'] + ], + ], + [ + 'notification.type.post', + [ + 'forum_id' => '1', + 'post_id' => '4', + 'topic_id' => '2', + ], + [ + 2 => ['user_id' => '2'], + ], + ], + [ + 'notification.type.forum', + [ + 'forum_id' => '1', + 'post_id' => '5', + 'topic_id' => '2', + ], + [ + 6 => ['user_id' => '6'], + 7 => ['user_id' => '7'], + 8 => ['user_id' => '8'], + ], + ], + [ + 'notification.type.post', + [ + 'forum_id' => '2', + 'post_id' => '6', + 'topic_id' => '3', + ], + [ + ], + ], + [ + 'notification.type.forum', + [ + 'forum_id' => '2', + 'post_id' => '6', + 'topic_id' => '3', + ], + [ + ], + ], + ]; + } + + /** + * @dataProvider data_notification_email + */ + public function test_notification_email($notification_type, $post_data, $expected_users) + { + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_email->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_email->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + $post_data['post_id']++; + $notification_options['item_id'] = $post_data['post_id']; + $post_data['post_time'] = 1349413323; + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users2 = $this->notification_method_email->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users2, 'Assert that expected users stay the same after replying to same topic'); + } +} diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php new file mode 100644 index 00000000000..2e8c7910aa3 --- /dev/null +++ b/tests/notification/notification_method_webpush_test.php @@ -0,0 +1,791 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\notification\method\webpush; +use Symfony\Component\Config\FileLocator; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; + +require_once __DIR__ . '/base.php'; + +/** + * @group slow + */ +class notification_method_webpush_test extends phpbb_tests_notification_base +{ + /** @var string[] VAPID keys for testing purposes */ + public const VAPID_KEYS = [ + 'publicKey' => 'BIcGkq1Ncj3a2-J0UW-1A0NETLjvxZzNLiYBiPVMKNjgwmwPi5jyK87VfS4FZn9n7S9pLMQzjV3LmFuOnRSOvmI', + 'privateKey' => 'SrlbBEVgibWmKHYbDPu4Y2XvDWPjeGcc9fC16jq01xU', + ]; + + /** @var webpush */ + protected $notification_method_webpush; + + /** @var \phpbb\language\language */ + protected $language; + + /** @var \phpbb\log\log_interface */ + protected $log; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/webpush_notification.type.post.xml'); + } + + protected function get_notification_methods() + { + return [ + 'notification.method.webpush', + ]; + } + + public static function setUpBeforeClass(): void + { + self::start_webpush_testing(); + } + + public static function tearDownAfterClass(): void + { + self::stop_webpush_testing(); + } + + protected static function start_webpush_testing(): void + { + // Stop first to ensure port is available + self::stop_webpush_testing(); + + $process = new \Symfony\Component\Process\Process(['node_modules/.bin/web-push-testing', '--port', '9012', 'start']); + $process->run(); + if (!$process->isSuccessful()) + { + self::fail('Starting web push testing service failed: ' . $process->getErrorOutput()); + } + } + + protected static function stop_webpush_testing(): void + { + $process = new \Symfony\Component\Process\Process(['node_modules/.bin/web-push-testing', '--port', '9012', 'stop']); + $process->run(); + } + + protected function setUp(): void + { + phpbb_database_test_case::setUp(); + + global $phpbb_root_path, $phpEx; + + include_once(__DIR__ . '/ext/test/notification/type/test.' . $phpEx); + + global $db, $config, $user, $auth, $cache, $phpbb_container, $phpbb_dispatcher; + + $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') + ->disableOriginalConstructor() + ->getMock(); + $controller_helper = $this->getMockBuilder('\phpbb\controller\helper') + ->disableOriginalConstructor() + ->getMock(); + $db = $this->db = $this->new_dbal(); + $config = $this->config = new \phpbb\config\config([ + 'allow_privmsg' => true, + 'allow_bookmarks' => true, + 'allow_topic_notify' => true, + 'allow_forum_notify' => true, + 'allow_board_notifications' => true, + 'webpush_vapid_public' => self::VAPID_KEYS['publicKey'], + 'webpush_vapid_private' => self::VAPID_KEYS['privateKey'], + ]); + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $this->language = new \phpbb\language\language($lang_loader); + $this->language->add_lang('acp/common'); + $user = new \phpbb\user($this->language, '\phpbb\datetime'); + $this->user = $user; + $this->user->data['user_options'] = 230271; + $this->user_loader = new \phpbb\user_loader($avatar_helper, $this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); + $auth = $this->auth = new phpbb_mock_notifications_auth(); + $this->phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $phpbb_dispatcher = $this->phpbb_dispatcher; + $cache_driver = new \phpbb\cache\driver\dummy(); + $cache = $this->cache = new \phpbb\cache\service( + $cache_driver, + $this->config, + $this->db, + $this->phpbb_dispatcher, + $phpbb_root_path, + $phpEx + ); + + $log_table = 'phpbb_log'; + $this->log = new \phpbb\log\log($this->db, $user, $auth, $this->phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, $log_table); + + $phpbb_container = $this->container = new ContainerBuilder(); + $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); + $loader->load('services_notification.yml'); + $phpbb_container->set('avatar.helper', $avatar_helper); + $phpbb_container->set('user_loader', $this->user_loader); + $phpbb_container->set('user', $user); + $phpbb_container->set('language', $this->language); + $phpbb_container->set('config', $this->config); + $phpbb_container->set('dbal.conn', $this->db); + $phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper')); + $phpbb_container->set('auth', $auth); + $phpbb_container->set('cache.driver', $cache_driver); + $phpbb_container->set('cache', $cache); + $phpbb_container->set('log', $this->log); + $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); + $phpbb_container->set('dispatcher', $this->phpbb_dispatcher); + $phpbb_container->set('event_dispatcher', $this->phpbb_dispatcher); + $phpbb_container->setParameter('core.root_path', $phpbb_root_path); + $phpbb_container->setParameter('core.php_ext', $phpEx); + $phpbb_container->setParameter('tables.notifications', 'phpbb_notifications'); + $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); + $phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types'); + $phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails'); + $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); + $phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions'); + $phpbb_container->set( + 'text_formatter.s9e.mention_helper', + new \phpbb\textformatter\s9e\mention_helper( + $this->db, + $auth, + $this->user, + $phpbb_root_path, + $phpEx + ) + ); + + $ban_type_email = new \phpbb\ban\type\email($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_user = new \phpbb\ban\type\user($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_ip = new \phpbb\ban\type\ip($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $phpbb_container->set('ban.type.email', $ban_type_email); + $phpbb_container->set('ban.type.user', $ban_type_user); + $phpbb_container->set('ban.type.ip', $ban_type_ip); + $collection = new \phpbb\di\service_collection($phpbb_container); + $collection->add('ban.type.email'); + $collection->add('ban.type.user'); + $collection->add('ban.type.ip'); + $ban_manager = new \phpbb\ban\manager($collection, new \phpbb\cache\driver\dummy(), $this->db, $this->language, $this->log, $user, 'phpbb_bans', 'phpbb_users'); + $phpbb_container->set('ban.manager', $ban_manager); + + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + + $this->notification_method_webpush = new \phpbb\notification\method\webpush( + $phpbb_container->get('config'), + $phpbb_container->get('dbal.conn'), + $phpbb_container->get('log'), + $phpbb_container->get('user_loader'), + $phpbb_container->get('user'), + $phpbb_root_path, + $phpEx, + $phpbb_container->getParameter('tables.notification_push'), + $phpbb_container->getParameter('tables.push_subscriptions') + ); + + $phpbb_container->set('notification.method.webpush', $this->notification_method_webpush); + + $this->notifications = new phpbb_notification_manager_helper( + array(), + array(), + $this->container, + $this->user_loader, + $this->phpbb_dispatcher, + $this->db, + $this->cache, + $this->language, + $this->user, + 'phpbb_notification_types', + 'phpbb_user_notifications' + ); + + $phpbb_container->set('notification_manager', $this->notifications); + + $phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass()); + + $phpbb_container->compile(); + + $this->notifications->setDependencies($this->auth, $this->config); + + $types = array(); + foreach ($this->get_notification_types() as $type) + { + $class = $this->build_type($type); + + $types[$type] = $class; + } + + $this->notifications->set_var('notification_types', $types); + + $methods = array(); + foreach ($this->get_notification_methods() as $method) + { + $class = $this->container->get($method); + + $methods[$method] = $class; + } + + $this->notifications->set_var('notification_methods', $methods); + } + + public static function data_notification_webpush() + { + return [ + /** + * Normal post + * + * User => State description + * 2 => Topic id=1 and id=2 subscribed, should receive a new topics post notification + * 3 => Topic id=1 subscribed, should receive a new topic post notification + * 4 => Topic id=1 subscribed, should receive a new topic post notification + * 5 => Topic id=1 subscribed, post id=1 already notified, should receive a new topic post notification + * 6 => Topic id=1 and forum id=1 subscribed, should receive a new topic/forum post notification + * 7 => Forum id=1 subscribed, should NOT receive a new topic post but a forum post notification + * 8 => Forum id=1 subscribed, post id=1 already notified, should NOT receive a new topic post but a forum post notification + */ + [ + 'notification.type.post', + [ + 'forum_id' => '1', + 'post_id' => '2', + 'topic_id' => '1', + ], + [ + 2 => ['user_id' => '2'], + 3 => ['user_id' => '3'], + 4 => ['user_id' => '4'], + 5 => ['user_id' => '5'], + 6 => ['user_id' => '6'], + ], + ], + [ + 'notification.type.forum', + [ + 'forum_id' => '1', + 'post_id' => '3', + 'topic_id' => '1', + ], + [ + 6 => ['user_id' => '6'], + 7 => ['user_id' => '7'], + 8 => ['user_id' => '8'] + ], + ], + [ + 'notification.type.post', + [ + 'forum_id' => '1', + 'post_id' => '4', + 'topic_id' => '2', + ], + [ + 2 => ['user_id' => '2'], + ], + ], + [ + 'notification.type.forum', + [ + 'forum_id' => '1', + 'post_id' => '5', + 'topic_id' => '2', + ], + [ + 6 => ['user_id' => '6'], + 7 => ['user_id' => '7'], + 8 => ['user_id' => '8'], + ], + ], + [ + 'notification.type.post', + [ + 'forum_id' => '2', + 'post_id' => '6', + 'topic_id' => '3', + ], + [ + ], + ], + [ + 'notification.type.forum', + [ + 'forum_id' => '2', + 'post_id' => '6', + 'topic_id' => '3', + ], + [ + ], + ], + ]; + } + + /** + * @dataProvider data_notification_webpush + */ + public function test_notification_webpush($notification_type, $post_data, $expected_users) + { + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + $post_data['post_id']++; + $notification_options['item_id'] = $post_data['post_id']; + $post_data['post_time'] = 1349413323; + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users2 = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users2, 'Assert that expected users stay the same after replying to same topic'); + } + + /** + * @dataProvider data_notification_webpush + */ + public function test_get_subscription($notification_type, $post_data, $expected_users): void + { + $subscription_info = []; + foreach ($expected_users as $user_id => $user_data) + { + $subscription_info[$user_id][] = $this->create_subscription_for_user($user_id); + } + + // Create second subscription for first user ID passed + if (count($expected_users)) + { + $first_user_id = array_key_first($expected_users); + $subscription_info[$first_user_id][] = $this->create_subscription_for_user($first_user_id); + } + + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertEmpty($messages); + } + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.'); + } + } + + /** + * @dataProvider data_notification_webpush + */ + public function test_notify_empty_queue($notification_type, $post_data, $expected_users): void + { + foreach ($expected_users as $user_id => $user_data) + { + $this->create_subscription_for_user($user_id); + } + + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + $this->notification_method_webpush->notify(); // should have no effect + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + $post_data['post_id']++; + $notification_options['item_id'] = $post_data['post_id']; + $post_data['post_time'] = 1349413323; + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users2 = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users2, 'Assert that expected users stay the same after replying to same topic'); + } + + /** + * @dataProvider data_notification_webpush + */ + public function test_notify_invalid_endpoint($notification_type, $post_data, $expected_users): void + { + $subscription_info = []; + foreach ($expected_users as $user_id => $user_data) + { + $subscription_info[$user_id][] = $this->create_subscription_for_user($user_id); + } + + // Create second subscription for first user ID passed + if (count($expected_users)) + { + $first_user_id = array_key_first($expected_users); + $first_user_sub = $this->create_subscription_for_user($first_user_id, true); + $subscription_info[$first_user_id][] = $first_user_sub; + } + + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertEmpty($messages); + } + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.'); + } + + if (isset($first_user_sub)) + { + $admin_logs = $this->log->get_logs('admin'); + $this->db->sql_query('DELETE FROM phpbb_log'); // Clear logs + $this->assertCount(1, $admin_logs, 'Assert that an admin log was created for invalid endpoint'); + + $log_entry = $admin_logs[0]; + + $this->assertStringStartsWith('Web Push message could not be sent:', $log_entry['action']); + $this->assertStringContainsString('400', $log_entry['action']); + } + } + + /** + * @dataProvider data_notification_webpush + */ + public function test_notify_expired($notification_type, $post_data, $expected_users) + { + $subscription_info = []; + foreach ($expected_users as $user_id => $user_data) + { + $subscription_info[$user_id][] = $this->create_subscription_for_user($user_id); + } + + $expected_delivered_users = $expected_users; + + // Expire subscriptions for first user + if (count($expected_users)) + { + + $first_user_id = array_key_first($expected_users); + $first_user_subs = $subscription_info[$first_user_id]; + unset($expected_delivered_users[$first_user_id]); + $this->expire_subscription($first_user_subs[0]['clientHash']); + } + + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + foreach ($expected_delivered_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertEmpty($messages); + } + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + foreach ($expected_delivered_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.'); + } + } + + public function test_get_type(): void + { + $this->assertEquals('notification.method.webpush', $this->notification_method_webpush->get_type()); + } + + /** + * @dataProvider data_notification_webpush + */ + public function test_prune_notifications($notification_type, $post_data, $expected_users): void + { + $subscription_info = []; + foreach ($expected_users as $user_id => $user_data) + { + $subscription_info[$user_id][] = $this->create_subscription_for_user($user_id); + } + + // Create second subscription for first user ID passed + if (count($expected_users)) + { + $first_user_id = array_key_first($expected_users); + $subscription_info[$first_user_id][] = $this->create_subscription_for_user($first_user_id); + } + + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertEmpty($messages); + } + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.'); + } + + // Prune notifications with 0 time, shouldn't change anything + $prune_time = time(); + $this->notification_method_webpush->prune_notifications(0); + $this->assertGreaterThanOrEqual($prune_time, $this->config->offsetGet('read_notification_last_gc'), 'Assert that prune time was set'); + + $cur_notifications = $this->get_notifications(); + $this->assertSameSize($cur_notifications, $expected_users, 'Assert that no notifications have been pruned'); + + // Prune only read not supported, will prune all + $this->notification_method_webpush->prune_notifications($prune_time); + $this->assertGreaterThanOrEqual($prune_time, $this->config->offsetGet('read_notification_last_gc'), 'Assert that prune time was set'); + + $cur_notifications = $this->get_notifications(); + $this->assertCount(0, $cur_notifications, 'Assert that no notifications have been pruned'); + } + + public static function data_set_endpoint_padding(): array + { + return [ + [ + 'foo.mozilla.com', + webpush::MOZILLA_FALLBACK_PADDING + ], + [ + 'foo.mozaws.net', + webpush::MOZILLA_FALLBACK_PADDING + ], + [ + 'foo.android.googleapis.com', + \Minishlink\WebPush\Encryption::MAX_COMPATIBILITY_PAYLOAD_LENGTH, + ], + ]; + } + + /** + * @dataProvider data_set_endpoint_padding + */ + public function test_set_endpoint_padding($endpoint, $expected_padding): void + { + $web_push_reflection = new \ReflectionMethod($this->notification_method_webpush, 'set_endpoint_padding'); + + $auth = [ + 'VAPID' => [ + 'subject' => generate_board_url(), + 'publicKey' => $this->config['webpush_vapid_public'], + 'privateKey' => $this->config['webpush_vapid_private'], + ], + ]; + + $web_push = new \Minishlink\WebPush\WebPush($auth); + + $this->assertEquals(\Minishlink\WebPush\Encryption::MAX_COMPATIBILITY_PAYLOAD_LENGTH, $web_push->getAutomaticPadding()); + $web_push_reflection->invoke($this->notification_method_webpush, $web_push, $endpoint); + $this->assertEquals($expected_padding, $web_push->getAutomaticPadding()); + } + + protected function create_subscription_for_user($user_id, bool $invalidate_endpoint = false): array + { + $client = new \GuzzleHttp\Client(); + try + { + $response = $client->request('POST', 'http://localhost:9012/subscribe', ['form_params' => [ + 'applicationServerKey' => self::VAPID_KEYS['publicKey'], + ]]); + } + catch (\GuzzleHttp\Exception\GuzzleException $exception) + { + $this->fail('Failed getting subscription from web-push-testing client: ' . $exception->getMessage()); + } + + $subscription_return = \phpbb\json\sanitizer::decode((string) $response->getBody()); + $subscription_data = $subscription_return['data']; + $this->assertNotEmpty($subscription_data['endpoint']); + $this->assertStringStartsWith('http://localhost:9012/notify/', $subscription_data['endpoint']); + $this->assertIsArray($subscription_data['keys']); + + if ($invalidate_endpoint) + { + $subscription_data['endpoint'] .= 'invalid'; + } + + $push_subscriptions_table = $this->container->getParameter('tables.push_subscriptions'); + + $sql = 'INSERT INTO ' . $push_subscriptions_table . ' ' . $this->db->sql_build_array('INSERT', [ + 'user_id' => $user_id, + 'endpoint' => $subscription_data['endpoint'], + 'p256dh' => $subscription_data['keys']['p256dh'], + 'auth' => $subscription_data['keys']['auth'], + ]); + $this->db->sql_query($sql); + + return $subscription_data; + } + + protected function expire_subscription(string $client_hash): void + { + $client = new \GuzzleHttp\Client(); + try + { + $response = $client->request('POST', 'http://localhost:9012/expire-subscription/' . $client_hash); + } + catch (\GuzzleHttp\Exception\GuzzleException $exception) + { + $this->fail('Failed expiring subscription with web-push-testing client: ' . $exception->getMessage()); + } + + $subscription_return = \phpbb\json\sanitizer::decode((string) $response->getBody()); + $this->assertEquals(200, $response->getStatusCode(), 'Expected response status to be 200'); + } + + protected function get_messages_for_subscription($client_hash): array + { + $client = new \GuzzleHttp\Client(); + try + { + $response = $client->request('POST', 'http://localhost:9012/get-notifications', ['form_params' => [ + 'clientHash' => $client_hash, + ]]); + } + catch (\GuzzleHttp\Exception\GuzzleException $exception) + { + $this->fail('Failed getting messages from web-push-testing client: ' . $exception->getMessage()); + } + + $response_data = json_decode($response->getBody()->getContents(), true); + $this->assertNotEmpty($response_data); + $this->assertArrayHasKey('data', $response_data); + $this->assertArrayHasKey('messages', $response_data['data']); + + return $response_data['data']['messages']; + } + + protected function get_notifications(): array + { + $webpush_table = $this->container->getParameter('tables.notification_push'); + $sql = 'SELECT * FROM ' . $webpush_table; + $result = $this->db->sql_query($sql); + $sql_ary = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + + return $sql_ary; + } +} diff --git a/tests/notification/notification_test.php b/tests/notification/notification_test.php index 6bbabfc6025..4658f4c39a9 100644 --- a/tests/notification/notification_test.php +++ b/tests/notification/notification_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_notification_test extends phpbb_tests_notification_base { @@ -19,7 +19,7 @@ class phpbb_notification_test extends phpbb_tests_notification_base public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/notification.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/notification.xml'); } public function test_get_notification_type_id() @@ -59,6 +59,7 @@ public function test_get_subscription_types() self::assertArrayHasKey('NOTIFICATION_GROUP_POSTING', $subscription_types); self::assertArrayHasKey('notification.type.bookmark', $subscription_types['NOTIFICATION_GROUP_POSTING']); + self::assertArrayHasKey('notification.type.mention', $subscription_types['NOTIFICATION_GROUP_POSTING']); self::assertArrayHasKey('notification.type.post', $subscription_types['NOTIFICATION_GROUP_POSTING']); self::assertArrayHasKey('notification.type.quote', $subscription_types['NOTIFICATION_GROUP_POSTING']); self::assertArrayHasKey('notification.type.topic', $subscription_types['NOTIFICATION_GROUP_POSTING']); @@ -72,6 +73,8 @@ public function test_get_subscription_types() public function test_subscriptions() { $expected_subscriptions = array( + 'notification.type.forum' => array('notification.method.board'), + 'notification.type.mention' => array('notification.method.board'), 'notification.type.post' => array('notification.method.board'), 'notification.type.topic' => array('notification.method.board'), 'notification.type.quote' => array('notification.method.board'), @@ -159,6 +162,8 @@ public function test_notifications() 'post_subject' => 'Re: test-title', 'forum_id' => 2, 'forum_name' => 'Your first forum', + 'post_username' => '', + 'post_text' => 'test text', )); $this->db->sql_query('INSERT INTO ' . BOOKMARKS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array( @@ -175,6 +180,8 @@ public function test_notifications() 'post_subject' => 'Re: test-title', 'forum_id' => 2, 'forum_name' => 'Your first forum', + 'post_username' => '', + 'post_text' => 'test text', )); $this->notifications->delete_subscription('test'); @@ -266,6 +273,9 @@ public function test_notifications() 'post_subject' => 'Re: test-title2', // change post_subject 'forum_id' => 3, // change forum_id 'forum_name' => 'Your second forum', // change forum_name + 'post_username' => '', + 'post_text' => 'test text2', + 'post_time' => 1349413325, )); $this->assert_notifications( diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index baa90f29b1a..6c5979be05b 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -15,12 +15,11 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_posting.php'; abstract class phpbb_notification_submit_post_base extends phpbb_database_test_case { - protected $notifications, $db, $container, $user, $config, $auth, $cache; - + protected $db; protected $item_type = ''; protected $poll_data = array(); @@ -39,19 +38,22 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c 'bbcode_bitfield' => '', 'bbcode_uid' => '', 'post_edit_locked' => false, + 'notify_set' => 0, + 'notify' => false, + 'forum_name' => 'Test forum name', //'force_approved_state' => 1, ); public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/submit_post_' . $this->item_type . '.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/submit_post_' . $this->item_type . '.xml'); } - public function setUp() + protected function setUp(): void { - parent::setUp(); + global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log; - global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader; + parent::setUp(); // Database $this->db = $this->new_dbal(); @@ -67,6 +69,8 @@ public function setUp() array('f_noapprove', 1, true), array('f_postcount', 1, true), array('m_edit', 1, false), + array('f_mention', 1, true), + array('u_mention', 0, true), ))); // Config @@ -74,47 +78,56 @@ public function setUp() 'num_topics' => 1, 'num_posts' => 1, 'allow_board_notifications' => true, + 'allow_mentions' => true, + 'board_startdate' => 1692429414, )); + // Event dispatcher + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $cache_driver = new \phpbb\cache\driver\dummy(); $cache = new \phpbb\cache\service( $cache_driver, $config, $db, + $phpbb_dispatcher, $phpbb_root_path, $phpEx ); - // Event dispatcher - $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - // Language $lang = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + // Storage + $storage = $this->createMock('\phpbb\storage\storage'); + // User - $user = $this->createMock('\phpbb\user', array(), array( - $lang, - '\phpbb\datetime' - )); + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $lang = new \phpbb\language\language($lang_loader); + $user = new \phpbb\user($lang, '\phpbb\datetime'); $user->ip = ''; - $user->data = array( - 'user_id' => 2, - 'username' => 'user-name', - 'is_registered' => true, - 'user_colour' => '', - ); + $user->data['user_id'] = 2; + $user->data['username'] = 'user-name'; + $user->data['is_registered'] = true; + $user->data['user_colour'] = ''; + $user->data['user_lastmark'] = 0; // Request - $type_cast_helper = $this->createMock('\phpbb\request\type_cast_helper_interface'); - $request = $this->createMock('\phpbb\request\request'); + $request = new phpbb_mock_request(); + + $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') + ->disableOriginalConstructor() + ->getMock(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user_loader = new \phpbb\user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE); + $user_loader = new \phpbb\user_loader($avatar_helper, $db, $phpbb_root_path, $phpEx, USERS_TABLE); + $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); // Container $phpbb_container = new ContainerBuilder(); $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); $loader->load('services_notification.yml'); + $phpbb_container->set('avatar.helper', $avatar_helper); $phpbb_container->set('user_loader', $user_loader); $phpbb_container->set('user', $user); $phpbb_container->set('language', $lang); @@ -123,18 +136,40 @@ public function setUp() $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('cache', $cache); + $phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper')); + $phpbb_container->set('log', new \phpbb\log\dummy()); $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); - $phpbb_container->set('dispatcher', $phpbb_dispatcher); + $phpbb_container->set( + 'text_formatter.s9e.mention_helper', + new \phpbb\textformatter\s9e\mention_helper( + $this->db, + $auth, + $user, + $phpbb_root_path, + $phpEx + ) + ); + $phpbb_container->set('event_dispatcher', $phpbb_dispatcher); + $phpbb_container->set('storage.attachment', $storage); $phpbb_container->setParameter('core.root_path', $phpbb_root_path); $phpbb_container->setParameter('core.php_ext', $phpEx); $phpbb_container->setParameter('tables.notifications', 'phpbb_notifications'); $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); $phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types'); + $phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails'); + $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); + $phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions'); $phpbb_container->set('content.visibility', new \phpbb\content_visibility($auth, $config, $phpbb_dispatcher, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE)); + + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $messenger_method_collection->add('messenger.method.email'); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + + $phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass()); $phpbb_container->compile(); // Notification Types - $notification_types = array('quote', 'bookmark', 'post', 'post_in_queue', 'topic', 'topic_in_queue', 'approve_topic', 'approve_post'); + $notification_types = array('quote', 'mention', 'bookmark', 'post', 'post_in_queue', 'topic', 'topic_in_queue', 'approve_topic', 'approve_post', 'forum'); $notification_types_array = array(); foreach ($notification_types as $type) { @@ -157,6 +192,14 @@ public function setUp() */ public function test_submit_post($additional_post_data, $expected_before, $expected_after) { + global $db, $auth, $user, $config, $phpEx, $phpbb_root_path, $phpbb_container, $phpbb_dispatcher, $phpbb_log, $request; + + if (isset($additional_post_data['message'])) + { + $parser = $this->get_test_case_helpers()->set_s9e_services($phpbb_container)->get('text_formatter.parser'); + $additional_post_data['message'] = $parser->parse($additional_post_data['message']); + } + $sql = 'SELECT user_id, item_id, item_parent_id FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt WHERE nt.notification_type_name = '" . $this->item_type . "' diff --git a/tests/notification/submit_post_type_bookmark_test.php b/tests/notification/submit_post_type_bookmark_test.php index 7c3b9f938f4..1726d09e9bf 100644 --- a/tests/notification/submit_post_type_bookmark_test.php +++ b/tests/notification/submit_post_type_bookmark_test.php @@ -11,14 +11,16 @@ * */ -require_once dirname(__FILE__) . '/submit_post_base.php'; +require_once __DIR__ . '/submit_post_base.php'; class phpbb_notification_submit_post_type_bookmark_test extends phpbb_notification_submit_post_base { protected $item_type = 'notification.type.bookmark'; - public function setUp() + protected function setUp(): void { + global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log; + parent::setUp(); global $auth; @@ -49,7 +51,7 @@ public function setUp() * submit_post() $mode = 'reply' * Notification item_type = 'bookmark' */ - public function submit_post_data() + public static function submit_post_data() { return array( /** diff --git a/tests/notification/submit_post_type_forum_test.php b/tests/notification/submit_post_type_forum_test.php new file mode 100644 index 00000000000..e6c20fd9dd6 --- /dev/null +++ b/tests/notification/submit_post_type_forum_test.php @@ -0,0 +1,111 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +require_once __DIR__ . '/submit_post_base.php'; + +class phpbb_notification_submit_post_type_forum_test extends phpbb_notification_submit_post_base +{ + protected $item_type = 'notification.type.forum'; + + public function setUp(): void + { + global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log; + + parent::setUp(); + + global $auth; + + // Add additional permissions + $auth->expects($this->any()) + ->method('acl_get_list') + ->with($this->anything(), + $this->stringContains('_'), + $this->greaterThan(0)) + ->will($this->returnValueMap(array( + array( + array(3, 4, 5, 6), + 'f_read', + 1, + array( + 1 => array( + 'f_read' => array(3, 5, 6), + ), + ), + ), + array( + array(3, 4, 5, 6, 7, 8), + 'f_read', + 1, + array( + 1 => array( + 'f_read' => array(3, 5, 6, 7, 8), + ), + ), + ), + ))); + } + + /** + * submit_post() Notifications test + * + * submit_post() $mode = 'reply' + * Notification item_type = 'notification.type.forum' + */ + public static function submit_post_data() + { + return array( + /** + * Normal post + * + * User => State description + * 2 => Poster, should NOT receive a notification + * 3 => Forum subscribed, should receive a notification + * 4 => Forum subscribed, but unauthed to read, should NOT receive a notification + * 5 => Forum subscribed, but already notified, should NOT receive a new notification + * 6 => Topic and forum subscribed, should receive ONE notification + * 7 => Topic subscribed, should NOT receive a notification + * 8 => Topic subscribed, and already notified, should NOT receive a new notification + */ + array( + array(), + array( + array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), + array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1), + ), + array( + array('user_id' => 3, 'item_id' => 2, 'item_parent_id' => 1), + array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), + array('user_id' => 6, 'item_id' => 2, 'item_parent_id' => 1), + array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1), + ), + ), + + /** + * Unapproved post + * + * No new notifications + */ + array( + array('force_approved_state' => false), + array( + array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), + array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1), + ), + array( + array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), + array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1), + ), + ), + ); + } +} diff --git a/tests/notification/submit_post_type_mention_test.php b/tests/notification/submit_post_type_mention_test.php new file mode 100644 index 00000000000..80204b8351f --- /dev/null +++ b/tests/notification/submit_post_type_mention_test.php @@ -0,0 +1,126 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +require_once __DIR__ . '/submit_post_base.php'; + +class phpbb_notification_submit_post_type_mention_test extends phpbb_notification_submit_post_base +{ + protected $item_type = 'notification.type.mention'; + + public function setUp(): void + { + global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log; + + parent::setUp(); + + // Add additional permissions + $auth->expects($this->any()) + ->method('acl_get_list') + ->with($this->anything(), + $this->stringContains('_'), + $this->greaterThan(0)) + ->will($this->returnValueMap(array( + array( + array(3, 4, 5, 6, 7, 8, 10), + 'f_read', + 1, + array( + 1 => array( + 'f_read' => array(3, 5, 6, 7, 8), + ), + ), + ), + ))); + $auth->expects($this->any()) + ->method('acl_gets') + ->with('a_group', 'a_groupadd', 'a_groupdel') + ->will($this->returnValue(false)); + } + + /** + * submit_post() Notifications test + * + * submit_post() $mode = 'reply' + * Notification item_type = 'mention' + */ + public static function submit_post_data() + { + return array( + /** + * Normal post + * + * User => State description + * 2 => Poster, should NOT receive a notification + * 3 => mentioned, should receive a notification + * 4 => mentioned, but unauthed to read, should NOT receive a notification + * 5 => mentioned, but already notified, should STILL receive a new notification + * 6 => mentioned, but option disabled, should NOT receive a notification + * 7 => mentioned, option set to default, should receive a notification + * 8 => mentioned as a member of group 1, should receive a notification + */ + array( + array( + 'message' => implode(' ', array( + '[mention=u:2]poster[/mention] poster should not be notified', + '[mention=u:3]test[/mention] test should be notified', + '[mention=u:4]unauthorized[/mention] unauthorized to read, should not receive a notification', + '[mention=u:5]notified[/mention] already notified, should not receive a new notification', + '[mention=u:6]disabled[/mention] option disabled, should not receive a notification', + '[mention=u:7]default[/mention] option set to default, should receive a notification', + '[mention=g:1]normal group[/mention] group members of a normal group shoud receive a notification', + '[mention=g:2]hidden group[/mention] group members of a hidden group shoud not receive a notification from a non-member', + '[mention=u:10]doesn\'t exist[/mention] user does not exist, should not receive a notification', + )), + 'bbcode_uid' => 'uid', + ), + array( + array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), + ), + array( + array('user_id' => 3, 'item_id' => 2, 'item_parent_id' => 1), + array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), + array('user_id' => 5, 'item_id' => 2, 'item_parent_id' => 1), + array('user_id' => 7, 'item_id' => 2, 'item_parent_id' => 1), + array('user_id' => 8, 'item_id' => 2, 'item_parent_id' => 1), + ), + ), + + /** + * Unapproved post + * + * No new notifications + */ + array( + array( + 'message' => implode(' ', array( + '[mention=u:2]poster[/mention] poster should not be notified', + '[mention=u:3]test[/mention] test should be notified', + '[mention=u:4]unauthorized[/mention] unauthorized to read, should not receive a notification', + '[mention=u:5]notified[/mention] already notified, should not receive a new notification', + '[mention=u:6]disabled[/mention] option disabled, should not receive a notification', + '[mention=u:7]default[/mention] option set to default, should receive a notification', + '[mention=u:8]doesn\'t exist[/mention] user does not exist, should not receive a notification', + )), + 'bbcode_uid' => 'uid', + 'force_approved_state' => false, + ), + array( + array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), + ), + array( + array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), + ), + ), + ); + } +} diff --git a/tests/notification/submit_post_type_post_in_queue_test.php b/tests/notification/submit_post_type_post_in_queue_test.php index 1390e92d96a..002bb60f2b9 100644 --- a/tests/notification/submit_post_type_post_in_queue_test.php +++ b/tests/notification/submit_post_type_post_in_queue_test.php @@ -11,14 +11,16 @@ * */ -require_once dirname(__FILE__) . '/submit_post_base.php'; +require_once __DIR__ . '/submit_post_base.php'; class phpbb_notification_submit_post_type_post_in_queue_test extends phpbb_notification_submit_post_base { protected $item_type = 'notification.type.post_in_queue'; - public function setUp() + protected function setUp(): void { + global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log; + parent::setUp(); global $auth; @@ -62,7 +64,7 @@ public function setUp() * submit_post() $mode = 'reply' * Notification item_type = 'post_in_queue' */ - public function submit_post_data() + public static function submit_post_data() { return array( /** diff --git a/tests/notification/submit_post_type_post_test.php b/tests/notification/submit_post_type_post_test.php index 037c326bc01..cb6008f500e 100644 --- a/tests/notification/submit_post_type_post_test.php +++ b/tests/notification/submit_post_type_post_test.php @@ -11,14 +11,16 @@ * */ -require_once dirname(__FILE__) . '/submit_post_base.php'; +require_once __DIR__ . '/submit_post_base.php'; class phpbb_notification_submit_post_type_post_test extends phpbb_notification_submit_post_base { protected $item_type = 'notification.type.post'; - public function setUp() + protected function setUp(): void { + global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log; + parent::setUp(); global $auth; @@ -30,6 +32,16 @@ public function setUp() $this->stringContains('_'), $this->greaterThan(0)) ->will($this->returnValueMap(array( + array( + array(3, 4, 5, 6), + 'f_read', + 1, + array( + 1 => array( + 'f_read' => array(3, 5, 6), + ), + ), + ), array( array(3, 4, 5, 6, 7, 8), 'f_read', @@ -49,7 +61,7 @@ public function setUp() * submit_post() $mode = 'reply' * Notification item_type = 'post' */ - public function submit_post_data() + public static function submit_post_data() { return array( /** @@ -61,8 +73,8 @@ public function submit_post_data() * 4 => Topic subscribed, but unauthed to read, should NOT receive a notification * 5 => Topic subscribed, but already notified, should NOT receive a new notification * 6 => Topic and forum subscribed, should receive ONE notification - * 7 => Forum subscribed, should receive a notification - * 8 => Forum subscribed, but already notified, should NOT receive a new notification + * 7 => Forum subscribed, should NOT receive a notification + * 8 => Forum subscribed, and already notified, should NOT receive a new notification */ array( array(), @@ -74,7 +86,6 @@ public function submit_post_data() array('user_id' => 3, 'item_id' => 2, 'item_parent_id' => 1), array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), array('user_id' => 6, 'item_id' => 2, 'item_parent_id' => 1), - array('user_id' => 7, 'item_id' => 2, 'item_parent_id' => 1), array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1), ), ), diff --git a/tests/notification/submit_post_type_quote_test.php b/tests/notification/submit_post_type_quote_test.php index 3fab8c05ba9..92222f9e41f 100644 --- a/tests/notification/submit_post_type_quote_test.php +++ b/tests/notification/submit_post_type_quote_test.php @@ -11,14 +11,16 @@ * */ -require_once dirname(__FILE__) . '/submit_post_base.php'; +require_once __DIR__ . '/submit_post_base.php'; class phpbb_notification_submit_post_type_quote_test extends phpbb_notification_submit_post_base { protected $item_type = 'notification.type.quote'; - public function setUp() + protected function setUp(): void { + global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log; + parent::setUp(); global $auth; @@ -49,11 +51,8 @@ public function setUp() * submit_post() $mode = 'reply' * Notification item_type = 'quote' */ - public function submit_post_data() + public static function submit_post_data() { - // The new mock container is needed because the data providers may be executed before phpunit call setUp() - $parser = $this->get_test_case_helpers()->set_s9e_services(new phpbb_mock_container_builder())->get('text_formatter.parser'); - return array( /** * Normal post @@ -68,7 +67,7 @@ public function submit_post_data() */ array( array( - 'message' => $parser->parse(implode(' ', array( + 'message' => implode(' ', array( '[quote="poster"]poster should not be notified[/quote]', '[quote="test"]test should be notified[/quote]', '[quote="unauthorized"]unauthorized to read, should not receive a notification[/quote]', @@ -76,7 +75,7 @@ public function submit_post_data() '[quote="disabled"]option disabled, should not receive a notification[/quote]', '[quote="default"]option set to default, should receive a notification[/quote]', '[quote="doesn\'t exist"]user does not exist, should not receive a notification[/quote]', - ))), + )), 'bbcode_uid' => 'uid', ), array( @@ -97,7 +96,7 @@ public function submit_post_data() */ array( array( - 'message' => $parser->parse(implode(' ', array( + 'message' => implode(' ', array( '[quote="poster"]poster should not be notified[/quote]', '[quote="test"]test should be notified[/quote]', '[quote="unauthorized"]unauthorized to read, should not receive a notification[/quote]', @@ -105,7 +104,7 @@ public function submit_post_data() '[quote="disabled"]option disabled, should not receive a notification[/quote]', '[quote="default"]option set to default, should receive a notification[/quote]', '[quote="doesn\'t exist"]user does not exist, should not receive a notification[/quote]', - ))), + )), 'bbcode_uid' => 'uid', 'force_approved_state' => false, ), diff --git a/tests/notification/submit_post_type_topic_test.php b/tests/notification/submit_post_type_topic_test.php index a51f0780b1b..28403ec0ed9 100644 --- a/tests/notification/submit_post_type_topic_test.php +++ b/tests/notification/submit_post_type_topic_test.php @@ -11,17 +11,17 @@ * */ -require_once dirname(__FILE__) . '/submit_post_base.php'; +require_once __DIR__ . '/submit_post_base.php'; class phpbb_notification_submit_post_type_topic_test extends phpbb_notification_submit_post_base { protected $item_type = 'notification.type.topic'; - public function setUp() + protected function setUp(): void { - parent::setUp(); + global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log; - global $auth, $phpbb_log; + parent::setUp(); // Add additional permissions $auth->expects($this->any()) @@ -41,8 +41,6 @@ public function setUp() ), ), ))); - - $phpbb_log = $this->createMock('\phpbb\log\dummy'); } /** @@ -51,7 +49,7 @@ public function setUp() * submit_post() $mode = 'post' * Notification item_type = 'topic' */ - public function submit_post_data() + public static function submit_post_data() { return array( /** @@ -97,6 +95,8 @@ public function submit_post_data() */ public function test_submit_post($additional_post_data, $expected_before, $expected_after) { + global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $lang, $user, $request, $phpEx, $phpbb_root_path, $user_loader, $phpbb_log; + $sql = 'SELECT user_id, item_id, item_parent_id FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt WHERE nt.notification_type_name = '" . $this->item_type . "' @@ -135,9 +135,10 @@ public function test_submit_post($additional_post_data, $expected_before, $expec $this->db->sql_freeresult($result); $result = $this->db->sql_query( - 'SELECT * - FROM ' . POSTS_TABLE . ' - WHERE post_id = ' . $reply_id); + 'SELECT p.*, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_first_post_id, t.topic_last_post_id + FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t + WHERE p.topic_id = t.topic_id + AND p.post_id = ' . $reply_id); $reply_edit_data = array_merge($this->post_data, $this->db->sql_fetchrow($result), array( 'force_approved_state' => false, 'post_edit_reason' => 'PHPBB3-12370', diff --git a/tests/notification/user_list_trim_test.php b/tests/notification/user_list_trim_test.php index 0de62944910..640adf6e4e4 100644 --- a/tests/notification/user_list_trim_test.php +++ b/tests/notification/user_list_trim_test.php @@ -17,10 +17,10 @@ class phpbb_notification_user_list_trim_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_list_trim.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/user_list_trim.xml'); } - public function setUp() + protected function setUp(): void { global $phpbb_root_path, $phpEx, $phpbb_dispatcher, $user, $cache, $auth; @@ -35,6 +35,7 @@ public function setUp() new \phpbb\cache\driver\dummy(), $config, $db, + $phpbb_dispatcher, $phpbb_root_path, $phpEx ); @@ -51,18 +52,25 @@ public function setUp() $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->data = array('user_lang' => 'en'); + $user->data = [ + 'user_id' => 1, + 'user_lang' => 'en', + ]; $lang->add_lang('common'); - $user_loader = new phpbb\user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE); + $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') + ->disableOriginalConstructor() + ->getMock(); + + $user_loader = new phpbb\user_loader($avatar_helper, $db, $phpbb_root_path, $phpEx, USERS_TABLE); $user_loader->load_users(array(2, 3, 4, 5, 6)); $this->notification = new phpbb_mock_notification_type_post( - $user_loader, null, null, $lang, $user, null, null, $phpbb_root_path, $phpEx, null, null + $user_loader, null, null, null, $lang, $user, null, null, $phpbb_root_path, $phpEx, null, null ); } - public function user_list_trim_data() + public static function user_list_trim_data() { return array( array( diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php index a9c78059a58..51b2f8752b3 100644 --- a/tests/pagination/pagination_test.php +++ b/tests/pagination/pagination_test.php @@ -11,10 +11,14 @@ * */ -require_once dirname(__FILE__) . '/../template/template_test_case.php'; +require_once __DIR__ . '/../template/template_test_case.php'; class phpbb_pagination_pagination_test extends phpbb_template_template_test_case { + protected $config; + protected $helper; + protected $routing_helper; + protected $pagination; protected $test_path = 'tests/pagination'; public function return_callback_implode() @@ -22,31 +26,31 @@ public function return_callback_implode() return implode('-', func_get_args()); } - public function setUp() + protected function setUp(): void { parent::setUp(); global $phpbb_dispatcher, $phpbb_root_path, $phpEx; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $this->user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + $this->user = $this->createMock('\phpbb\user'); $this->user->expects($this->any()) ->method('lang') ->will($this->returnCallback(array($this, 'return_callback_implode'))); $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); - $manager = new phpbb_mock_extension_manager(dirname(__FILE__) . '/', array()); - + $manager = new phpbb_mock_extension_manager(__DIR__ . '/', array()); $loader = new \Symfony\Component\Routing\Loader\YamlFileLoader( - new \phpbb\routing\file_locator(dirname(__FILE__) . '/') + new \phpbb\routing\file_locator(__DIR__ . '/') ); - $resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $manager); - $router = new phpbb_mock_router(new phpbb_mock_container_builder(), $resources_locator, $loader, dirname(__FILE__) . '/', 'php'); + $resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(__DIR__ . '/', PHPBB_ENVIRONMENT, $manager); + + $mock_container = new phpbb_mock_container_builder(); + $mock_container->set('cron.task_collection', []); + + $router = new phpbb_mock_router(new phpbb_mock_container_builder(), $resources_locator, $loader, 'php', __DIR__ . '/', true, true); $request = new phpbb_mock_request(); $request->overwrite('SCRIPT_NAME', '/app.php', \phpbb\request\request_interface::SERVER); @@ -57,12 +61,32 @@ public function setUp() $request ); + $db = $this->getMockBuilder('\phpbb\db\driver\mysqli') + ->disableOriginalConstructor() + ->getMock(); + $this->routing_helper = new \phpbb\routing\helper($this->config, $router, $symfony_request, $request, '', 'php'); - $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $symfony_request, $request, $this->routing_helper); + $this->helper = new phpbb_mock_controller_helper( + new \phpbb\auth\auth(), + new \phpbb\cache\driver\dummy(), + $this->config, + new \phpbb\cron\manager($mock_container, $this->routing_helper, '', 'php', null), + $db, + new phpbb_mock_event_dispatcher(), + new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), + $request, + $this->routing_helper, + $symfony_request, + $this->template, + $this->user, + $phpbb_root_path, + 'adm/', + 'php' + ); $this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper, $phpbb_dispatcher); } - public function generate_template_pagination_data() + public static function generate_template_pagination_data() { return array( array( @@ -209,7 +233,7 @@ public function test_generate_template_pagination_double_nested($base_url, $star $this->assertEquals(str_replace("\t", '', $expect), $this->display('test')); } - public function on_page_data() + public static function on_page_data() { return array( array( @@ -235,7 +259,7 @@ public function test_on_page($num_items, $per_page, $start_item, $expect_return) $this->assertEquals($expect_return, $this->pagination->on_page($num_items, $per_page, $start_item)); } - public function validate_start_data() + public static function validate_start_data() { return array( array( @@ -284,7 +308,7 @@ public function test_validate_start($start, $num_items, $expect) $this->assertEquals($expect, $this->pagination->validate_start($start, 10, $num_items)); } - public function reverse_start_data() + public static function reverse_start_data() { return array( array( @@ -310,7 +334,7 @@ public function test_reverse_start($start, $limit, $num_items, $expect) $this->assertEquals($expect, $this->pagination->reverse_start($start, $limit, $num_items)); } - public function reverse_limit_data() + public static function reverse_limit_data() { return array( array( diff --git a/tests/passwords/drivers_test.php b/tests/passwords/drivers_test.php index 01c69a38bb0..d690979a8d0 100644 --- a/tests/passwords/drivers_test.php +++ b/tests/passwords/drivers_test.php @@ -11,15 +11,29 @@ * */ -class phpbb_passwords_helper_test extends \phpbb_test_case +class phpbb_passwords_drivers_test extends \phpbb_test_case { - public function setUp() + /** @var \phpbb\passwords\driver\helper */ + protected $driver_helper = []; + + /** @var array */ + protected $passwords_drivers = []; + + // Initialize argon2 default options + public static $argon2_default_cost_options = + [ + 'memory_cost' => 65536, + 'time_cost' => 4, + 'threads' => 2 + ]; + + protected function setUp(): void { // Prepare dependencies for drivers $config = new \phpbb\config\config(array()); $request = new phpbb_mock_request(array(), array(), array(), array(), array('password' => 'fööbar')); $this->driver_helper = new \phpbb\passwords\driver\helper($config); - $phpbb_root_path = dirname(__FILE__) . '/../../phpBB/'; + $phpbb_root_path = __DIR__ . '/../../phpBB/'; $php_ext = 'php'; $this->passwords_drivers = array( @@ -37,13 +51,26 @@ public function setUp() ); $this->passwords_drivers['passwords.driver.md5_phpbb2'] = new \phpbb\passwords\driver\md5_phpbb2($request, $this->passwords_drivers['passwords.driver.salted_md5'], $this->driver_helper, $phpbb_root_path, $php_ext); $this->passwords_drivers['passwords.driver.bcrypt_wcf2'] = new \phpbb\passwords\driver\bcrypt_wcf2($this->passwords_drivers['passwords.driver.bcrypt'], $this->driver_helper); + + $pwhash_supported = function_exists('password_hash') && function_exists('password_needs_rehash') && function_exists('password_verify'); + if (defined('PASSWORD_ARGON2I') && $pwhash_supported) + { + $this->passwords_drivers['passwords.driver.argon2i'] = new \phpbb\passwords\driver\argon2i($config, $this->driver_helper); + self::$argon2_default_cost_options = $this->passwords_drivers['passwords.driver.argon2i']->get_options(); + } + + if (defined('PASSWORD_ARGON2ID') && $pwhash_supported) + { + $this->passwords_drivers['passwords.driver.argon2id'] = new \phpbb\passwords\driver\argon2id($config, $this->driver_helper); + self::$argon2_default_cost_options = $this->passwords_drivers['passwords.driver.argon2id']->get_options(); + } } - public function data_helper_encode64() + public static function data_helper_encode64() { return array( - array('foobar', 6, 'axqPW3aQ'), - array('foobar', 7, 'axqPW3aQ..'), + array('foobars', 6, 'axqPW3aQ'), + array('foobarss', 7, 'axqPW3aQn/'), array('foobar', 5, 'axqPW34'), ); } @@ -57,7 +84,7 @@ public function test_helper_encode64($input, $length, $output) $this->assertSame($output, $return); } - public function data_get_random_salt() + public static function data_get_random_salt() { return array( array(24, false), @@ -95,7 +122,7 @@ public function test_get_hash_settings_salted_md5() $this->assertEquals(false, $this->passwords_drivers['passwords.driver.salted_md5']->get_hash_settings(false)); } - public function data_hash_sha1_smf() + public static function data_hash_sha1_smf() { return array( array(false, 'test', array()), @@ -112,7 +139,7 @@ public function test_hash_sha1_smf($expected, $password, $user_row) $this->assertSame($expected, $this->passwords_drivers['passwords.driver.sha1_smf']->hash($password, $user_row)); } - public function data_get_settings() + public static function data_get_settings() { return array( array(false, '6f9e2a1899e1f15708fd2e554103480eb53e8b57', 'passwords.driver.sha1_smf'), @@ -127,7 +154,7 @@ public function test_get_settings_only($expected, $hash, $driver) $this->assertSame($expected, $this->passwords_drivers[$driver]->get_settings_only($hash)); } - public function data_md5_phpbb2_check() + public static function data_md5_phpbb2_check() { return array( array(false, 'foobar', 'ae2fc75e20ee25d4520766788fbc96ae'), @@ -135,8 +162,8 @@ public function data_md5_phpbb2_check() array(false, 'fööbar', 'ae2fc75e20ee25d4520766788fbc96ae'), array(true, 'fööbar', 'ae2fc75e20ee25d4520766788fbc96ae', utf8_decode('fööbar')), array(true, 'fööbar', '$H$966CepJh9RC3hFIm7aKywR6jEn0kpA0', utf8_decode('fööbar')), - array(true, 'fööbar', '$H$9rNjgwETtmc8befO8JL1xFMrrMw8MC.', $this->utf8_to_cp1252(utf8_decode('fööbar'))), - array(true, 'fööbar', '$H$9rNjgwETtmc8befO8JL1xFMrrMw8MC.', $this->utf8_to_cp1252('fööbar')), + array(true, 'fööbar', '$H$9rNjgwETtmc8befO8JL1xFMrrMw8MC.', self::utf8_to_cp1252(utf8_decode('fööbar'))), + array(true, 'fööbar', '$H$9rNjgwETtmc8befO8JL1xFMrrMw8MC.', self::utf8_to_cp1252('fööbar')), ); } @@ -171,7 +198,7 @@ public function test_sha1_driver() $this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1']->hash('foobar')); } - public function data_md5_mybb_check() + public static function data_md5_mybb_check() { return array( array(false, 'foobar', '083d11daea8675b1b4b502c7e55f8dbd'), @@ -193,7 +220,7 @@ public function test_md5_mybb_driver() $this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_mybb']->hash('foobar')); } - public function data_md5_vb_check() + public static function data_md5_vb_check() { return array( array(false, 'foobar', '083d11daea8675b1b4b502c7e55f8dbd'), @@ -217,7 +244,7 @@ public function test_md5_vb_driver() $this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_vb']->hash('foobar')); } - public function data_sha1_wcf1_check() + public static function data_sha1_wcf1_check() { return array( array(false, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff'), @@ -239,7 +266,7 @@ public function test_sha1_wcf1_driver() $this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1_wcf1']->hash('foobar')); } - public function data_bcrypt_wcf2_check() + public static function data_bcrypt_wcf2_check() { return array( array(false, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff'), @@ -261,7 +288,7 @@ public function test_bcrypt_wcf2_driver() $this->assertSame(false, $this->passwords_drivers['passwords.driver.bcrypt_wcf2']->hash('foobar')); } - public function data_sha_xf1_check() + public static function data_sha_xf1_check() { return array( array(false, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff'), @@ -284,7 +311,7 @@ public function test_sha_xf1_driver() $this->assertSame(false, $this->passwords_drivers['passwords.driver.sha_xf1']->hash('foobar')); } - protected function utf8_to_cp1252($string) + protected static function utf8_to_cp1252($string) { static $transform = array( "\xE2\x82\xAC" => "\x80", @@ -414,15 +441,24 @@ protected function utf8_to_cp1252($string) return strtr($string, $transform); } - public function data_needs_rehash() + public static function data_needs_rehash() { - return array( + return [ array('passwords.driver.bcrypt_2y', '$2y$10$somerandomhash', false), array('passwords.driver.bcrypt', '$2a$10$somerandomhash', false), array('passwords.driver.salted_md5', 'foobar', false), array('passwords.driver.bcrypt_2y', '$2y$9$somerandomhash', true), array('passwords.driver.bcrypt', '$2a$04$somerandomhash', true), - ); + + array('passwords.driver.argon2i', '$argon2i$v=19$m=' . self::$argon2_default_cost_options['memory_cost'] . ',t=' . self::$argon2_default_cost_options['time_cost'] . ',p=' . self::$argon2_default_cost_options['threads'] . '$NEF0S1JSN04yNGQ1UVRKdA$KYGNI9CbjoKh1UEu1PpdlqbuLbveGwkMcwcT2Un9pPM', false), + array('passwords.driver.argon2i', '$argon2i$v=19$m=128,t=2,p=2$M29GUi51QjdKLjIzbC9scQ$6h1gZDqn7JTmVdQ0lJh1x5nyvgO/DaJWUKOFJ0itCJ0', true), + array('passwords.driver.argon2i', '$argon2i$v=19$m=1024,t=1,p=2$UnFHb2F4NER3M0xWWmxMUQ$u3javvoAZJeIyR1P3eg0tb8VjEeXvQPagqwetonq1NA', true), + array('passwords.driver.argon2i', '$argon2i$v=19$m=1024,t=2,p=1$bm5SeGJ3R3ZRY1A0YXJPNg$v1A9m4sJW+ge0RBtpJ4w9861+J9xkguKBAsZHrG8LQU', true), + + array('passwords.driver.argon2id', '$argon2id$v=19$m=' . self::$argon2_default_cost_options['memory_cost'] . ',t=' . self::$argon2_default_cost_options['time_cost'] . ',p=' . self::$argon2_default_cost_options['threads'] . '$MXB4OW5sczE5TnFPYkEuYQ$2bxaMIp8+9x37O6v8zkqpBU72ohCibUrtgVZw7vyr5Q', false), + array('passwords.driver.argon2id', '$argon2id$v=19$m=128,t=2,p=2$RWV2VFAuWXk5bTVjbktOLg$Nt7Z7koa25SVRSKr3RKqjwKz26FENDuU+aL1DfMcWRo', true), + array('passwords.driver.argon2id', '$argon2id$v=19$m=1024,t=1,p=2$Rmw5M21IUFZDVEltYU0uTA$GIObGbHV6sOw5OQEtF8z+2ESztT96OWhCk17sUlwLAY', true), + ]; } /** @@ -430,6 +466,10 @@ public function data_needs_rehash() */ public function test_needs_rehash($driver, $hash, $expected) { - $this->assertSame($this->passwords_drivers[$driver]->needs_rehash($hash), $expected); + if (!isset($this->passwords_drivers[$driver]) || !$this->passwords_drivers[$driver]->is_supported()) + { + $this->markTestSkipped($driver . ' is not supported'); + } + $this->assertSame($expected, $this->passwords_drivers[$driver]->needs_rehash($hash)); } } diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php index 40e2849f9c4..273683a0976 100644 --- a/tests/passwords/manager_test.php +++ b/tests/passwords/manager_test.php @@ -13,19 +13,28 @@ class phpbb_passwords_manager_test extends \phpbb_test_case { + /** @var \phpbb\passwords\driver\helper */ + protected $driver_helper; + + /** @var \phpbb\passwords\helper */ + protected $helper; + + /** @var \phpbb\passwords\manager */ + protected $manager; + protected $passwords_drivers; protected $pw_characters = '0123456789abcdefghijklmnopqrstuvwyzABCDEFGHIJKLMNOPQRSTUVXYZ.,_!?/\\'; protected $default_pw = 'foobar'; - public function setUp() + protected function setUp(): void { // Prepare dependencies for manager and driver $config = new \phpbb\config\config(array()); $this->driver_helper = new \phpbb\passwords\driver\helper($config); $request = new phpbb_mock_request(array(), array(), array(), array(), array('password' => 'töst')); - $phpbb_root_path = dirname(__FILE__) . '/../../phpBB/'; + $phpbb_root_path = __DIR__ . '/../../phpBB/'; $php_ext = 'php'; $this->passwords_drivers = array( @@ -49,28 +58,15 @@ public function setUp() $this->manager = new \phpbb\passwords\manager($config, $this->passwords_drivers, $this->helper, array_keys($this->passwords_drivers)); } - public function hash_password_data() + public static function hash_password_data() { - if (version_compare(PHP_VERSION, '5.3.7', '<')) - { - return array( - array('', '2a', 60), - array('passwords.driver.bcrypt_2y', '2a', 60), - array('passwords.driver.bcrypt', '2a', 60), - array('passwords.driver.salted_md5', 'H', 34), - array('passwords.driver.foobar', '', false), - ); - } - else - { - return array( - array('', '2y', 60), - array('passwords.driver.bcrypt_2y', '2y', 60), - array('passwords.driver.bcrypt', '2a', 60), - array('passwords.driver.salted_md5', 'H', 34), - array('passwords.driver.foobar', '', false), - ); - } + return array( + array('', '2y', 60), + array('passwords.driver.bcrypt_2y', '2y', 60), + array('passwords.driver.bcrypt', '2a', 60), + array('passwords.driver.salted_md5', 'H', 34), + array('passwords.driver.foobar', '', false), + ); } /** @@ -98,25 +94,14 @@ public function test_hash_password($type, $prefix, $length) } } - public function check_password_data() + public static function check_password_data() { - if (version_compare(PHP_VERSION, '5.3.7', '<')) - { - return array( - array('passwords.driver.bcrypt'), - array('passwords.driver.salted_md5'), - array('passwords.driver.phpass'), - ); - } - else - { - return array( - array('passwords.driver.bcrypt_2y'), - array('passwords.driver.bcrypt'), - array('passwords.driver.salted_md5'), - array('passwords.driver.phpass'), - ); - } + return array( + array('passwords.driver.bcrypt_2y'), + array('passwords.driver.bcrypt'), + array('passwords.driver.salted_md5'), + array('passwords.driver.phpass'), + ); } /** @@ -136,12 +121,12 @@ public function test_check_password($hash_type) } // Check if convert_flag is correctly set - $default_type = (version_compare(PHP_VERSION, '5.3.7', '<')) ? 'passwords.driver.bcrypt' : 'passwords.driver.bcrypt_2y'; + $default_type = 'passwords.driver.bcrypt_2y'; $this->assertEquals(($hash_type !== $default_type), $this->manager->convert_flag); } - public function check_hash_exceptions_data() + public static function check_hash_exceptions_data() { return array( array('3858f62230ac3c915f300c664312c63f', true), @@ -179,7 +164,7 @@ public function test_check_hash_exceptions($hash, $expected, $password = 'foobar $this->assertEquals($expected, $this->manager->check($password, $hash, $user_row)); } - public function data_hash_password_length() + public static function data_hash_password_length() { return array( array('passwords.driver.bcrypt', false), @@ -200,79 +185,43 @@ public function test_hash_password_length($driver, $expected) public function test_hash_password_8bit_bcrypt() { $this->assertEquals(false, $this->manager->hash('foobar𝄞', 'passwords.driver.bcrypt')); - if (version_compare(PHP_VERSION, '5.3.7', '<')) - { - $this->assertEquals(false, $this->manager->hash('foobar𝄞', 'passwords.driver.bcrypt_2y')); - } - else - { - $this->assertNotEquals(false, $this->manager->hash('foobar𝄞', 'passwords.driver.bcrypt_2y')); - } + $this->assertNotEquals(false, $this->manager->hash('foobar𝄞', 'passwords.driver.bcrypt_2y')); } - public function combined_hash_data() + public static function combined_hash_data() { - if (version_compare(PHP_VERSION, '5.3.7', '<')) - { - return array( - array( - 'passwords.driver.salted_md5', - array('passwords.driver.bcrypt'), - ), - array( - 'passwords.driver.phpass', - array('passwords.driver.salted_md5'), - ), - array( - 'passwords.driver.salted_md5', - array('passwords.driver.phpass', 'passwords.driver.bcrypt'), - ), - array( - 'passwords.driver.salted_md5', - array('passwords.driver.salted_md5'), - false, - ), - array( - '$H$', - array('$2a$'), - ), - ); - } - else - { - return array( - array( - 'passwords.driver.salted_md5', - array('passwords.driver.bcrypt_2y'), - ), - array( - 'passwords.driver.salted_md5', - array('passwords.driver.bcrypt'), - ), - array( - 'passwords.driver.phpass', - array('passwords.driver.salted_md5'), - ), - array( - 'passwords.driver.salted_md5', - array('passwords.driver.bcrypt_2y', 'passwords.driver.bcrypt'), - ), - array( - 'passwords.driver.salted_md5', - array('passwords.driver.salted_md5'), - false, - ), - array( - 'passwords.driver.bcrypt_2y', - array('passwords.driver.salted_md4'), - false, - ), - array( - '$H$', - array('$2y$'), - ), - ); - } + return array( + array( + 'passwords.driver.salted_md5', + array('passwords.driver.bcrypt_2y'), + ), + array( + 'passwords.driver.salted_md5', + array('passwords.driver.bcrypt'), + ), + array( + 'passwords.driver.phpass', + array('passwords.driver.salted_md5'), + ), + array( + 'passwords.driver.salted_md5', + array('passwords.driver.bcrypt_2y', 'passwords.driver.bcrypt'), + ), + array( + 'passwords.driver.salted_md5', + array('passwords.driver.salted_md5'), + false, + ), + array( + 'passwords.driver.bcrypt_2y', + array('passwords.driver.salted_md4'), + false, + ), + array( + '$H$', + array('$2y$'), + ), + ); } /** @@ -327,7 +276,7 @@ public function test_hash_password_with_large_input() $this->assertLessThanOrEqual(5, time() - $start_time); } - public function data_test_string_compare() + public static function data_test_string_compare() { return array( array('foo', 'bar', false), @@ -345,7 +294,7 @@ public function test_string_compare($a, $b, $expected) $this->assertSame($expected, $this->driver_helper->string_compare($a, $b)); } - public function data_driver_interface_driver() + public static function data_driver_interface_driver() { return array( array(false, false, false), @@ -361,13 +310,13 @@ public function test_driver_interface_driver($use_new_interface, $needs_rehash, { if ($use_new_interface) { - $test_driver = $this->createMock('\phpbb\passwords\driver\rehashable_driver_interface', array('needs_rehash', 'get_prefix', 'check', 'is_supported', 'is_legacy', 'hash', 'get_settings_only')); + $test_driver = $this->createMock('\phpbb\passwords\driver\rehashable_driver_interface'); $test_driver->method('needs_rehash') ->willReturn($needs_rehash); } else { - $test_driver = $this->createMock('\phpbb\passwords\driver\driver_interface', array('get_prefix', 'check', 'is_supported', 'is_legacy', 'hash', 'get_settings_only')); + $test_driver = $this->createMock('\phpbb\passwords\driver\driver_interface'); } $config = new \phpbb\config\config(array()); diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php index f22606843cd..09693c1ceb4 100644 --- a/tests/path_helper/path_helper_test.php +++ b/tests/path_helper/path_helper_test.php @@ -17,21 +17,22 @@ class phpbb_path_helper_test extends phpbb_test_case { /** @var \phpbb\path_helper */ protected $path_helper; - protected $phpbb_root_path = ''; + protected static $phpbb_root_path = ''; - public function setUp() + protected function setUp(): void { parent::setUp(); - $this->set_phpbb_root_path(); + self::set_phpbb_root_path(); $this->path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( new phpbb_mock_request() ), $this->createMock('\phpbb\request\request'), - $this->phpbb_root_path, - 'php' + self::$phpbb_root_path, + 'php', + 'adm/' ); } @@ -43,40 +44,52 @@ public function setUp() * any time we wish to use it in one of these functions (and * also in general for everything else) */ - public function set_phpbb_root_path() + public static function set_phpbb_root_path() { - $this->phpbb_root_path = filesystem_helper::clean_path(dirname(__FILE__) . '/../../phpBB/'); + self::$phpbb_root_path = filesystem_helper::clean_path(__DIR__ . '/../../phpBB/'); } public function test_get_web_root_path() { - // Symfony Request = null, so always should return phpbb_root_path - $this->assertEquals($this->phpbb_root_path, $this->path_helper->get_web_root_path()); + $this->assertEquals(self::$phpbb_root_path, $this->path_helper->get_web_root_path()); + + // Second call will use class property + $this->assertEquals(self::$phpbb_root_path, $this->path_helper->get_web_root_path()); } - public function basic_update_web_root_path_data() + public function test_get_adm_relative_path() { - $this->set_phpbb_root_path(); + $this->assertEquals( 'adm/', $this->path_helper->get_adm_relative_path()); + } - return array( - array( + public function test_get_php_ext() + { + $this->assertSame('php', $this->path_helper->get_php_ext()); + } + + public static function basic_update_web_root_path_data() + { + self::set_phpbb_root_path(); + + return [ + [ 'http://www.test.com/test.php', 'http://www.test.com/test.php', '/', - ), - array( - $this->phpbb_root_path . 'test.php', - $this->phpbb_root_path . 'test.php', - ), - array( + ], + [ + self::$phpbb_root_path . 'test.php', + self::$phpbb_root_path . 'test.php', + ], + [ 'test.php', 'test.php', - ), - array( - $this->phpbb_root_path . $this->phpbb_root_path . 'test.php', - filesystem_helper::clean_path($this->phpbb_root_path . $this->phpbb_root_path . 'test.php'), - ), - ); + ], + [ + self::$phpbb_root_path . self::$phpbb_root_path . 'test.php', + filesystem_helper::clean_path(self::$phpbb_root_path . self::$phpbb_root_path . 'test.php'), + ], + ]; } /** @@ -87,88 +100,100 @@ public function test_basic_update_web_root_path($input, $expected) $this->assertEquals($expected, $this->path_helper->update_web_root_path($input)); } - public function update_web_root_path_data() + public function test_update_web_root_path_app() + { + $path_helper = $this->getMockBuilder('\phpbb\path_helper') + ->setConstructorArgs([ + new \phpbb\symfony_request( + new phpbb_mock_request() + ), + $this->createMock('\phpbb\request\request'), + self::$phpbb_root_path, + 'php', + 'adm/' + ]) + ->onlyMethods(['get_web_root_path']) + ->getMock(); + $path_helper->method('get_web_root_path') + ->willReturn('/var/www/phpbb/app.php/'); + $this->assertEquals('/var/www/phpbb/app.php/foo', $path_helper->update_web_root_path(self::$phpbb_root_path . 'app.php/foo')); + } + + public static function update_web_root_path_data() { - $this->set_phpbb_root_path(); + self::set_phpbb_root_path(); return array( array( - $this->phpbb_root_path . 'test.php', + self::$phpbb_root_path . 'test.php', '/', - null, - null, + '', + '', '', ), array( - $this->phpbb_root_path . 'test.php', - '//', - null, - null, - './../', - ), - array( - $this->phpbb_root_path . 'test.php', + self::$phpbb_root_path . 'test.php', '//', 'foo/bar.php', 'bar.php', './../', ), array( - $this->phpbb_root_path . 'test.php', + self::$phpbb_root_path . 'test.php', '/foo/template', - '/phpbb3-fork/phpBB/app.php/foo/template', - '/phpbb3-fork/phpBB/app.php', + '/phpbb-fork/phpBB/app.php/foo/template', + '/phpbb-fork/phpBB/app.php', './../../', ), array( - $this->phpbb_root_path . 'test.php', + self::$phpbb_root_path . 'test.php', '/foo/template', - '/phpbb3-fork/phpBB/foo/template', - '/phpbb3-fork/phpBB/app.php', + '/phpbb-fork/phpBB/foo/template', + '/phpbb-fork/phpBB/app.php', './../', ), array( - $this->phpbb_root_path . 'test.php', + self::$phpbb_root_path . 'test.php', '/', - '/phpbb3-fork/phpBB/app.php/', - '/phpbb3-fork/phpBB/app.php', + '/phpbb-fork/phpBB/app.php/', + '/phpbb-fork/phpBB/app.php', './../', ), // No correction if the path is already prepend by the web root path array( - './../' . $this->phpbb_root_path . 'test.php', - '//', - null, - null, - '', - ), - array( - './../' . $this->phpbb_root_path . 'test.php', + './../' . self::$phpbb_root_path . 'test.php', '//', 'foo/bar.php', 'bar.php', '', ), array( - './../../' . $this->phpbb_root_path . 'test.php', + './../../' . self::$phpbb_root_path . 'test.php', '/foo/template', - '/phpbb3-fork/phpBB/app.php/foo/template', - '/phpbb3-fork/phpBB/app.php', + '/phpbb-fork/phpBB/app.php/foo/template', + '/phpbb-fork/phpBB/app.php', '', ), array( - './../' . $this->phpbb_root_path . 'test.php', + './../' . self::$phpbb_root_path . 'test.php', '/foo/template', - '/phpbb3-fork/phpBB/foo/template', - '/phpbb3-fork/phpBB/app.php', + '/phpbb-fork/phpBB/foo/template', + '/phpbb-fork/phpBB/app.php', '', ), array( - './../'.$this->phpbb_root_path . 'test.php', + './../'.self::$phpbb_root_path . 'test.php', '/', - '/phpbb3-fork/phpBB/app.php/', - '/phpbb3-fork/phpBB/app.php', + '/phpbb-fork/phpBB/app.php/', + '/phpbb-fork/phpBB/app.php', + '', + ), + array( + './../'.self::$phpbb_root_path . 'test.php', + '', + '/phpbb-fork/phpBB/foo', + '/phpbb-fork/phpBB/app.php', '', ), ); @@ -179,9 +204,7 @@ public function update_web_root_path_data() */ public function test_update_web_root_path($input, $getPathInfo, $getRequestUri, $getScriptName, $correction) { - $symfony_request = $this->createMock('\phpbb\symfony_request', array(), array( - new phpbb_mock_request(), - )); + $symfony_request = $this->createMock('\phpbb\symfony_request'); $symfony_request->expects($this->any()) ->method('getPathInfo') ->will($this->returnValue($getPathInfo)); @@ -195,14 +218,53 @@ public function test_update_web_root_path($input, $getPathInfo, $getRequestUri, $path_helper = new \phpbb\path_helper( $symfony_request, $this->createMock('\phpbb\request\request'), - $this->phpbb_root_path, + self::$phpbb_root_path, 'php' ); - $this->assertEquals($correction . $input, $path_helper->update_web_root_path($input, $symfony_request)); + $this->assertEquals($correction . $input, $path_helper->update_web_root_path($input)); } - public function clean_url_data() + public static function remove_web_root_path_data() + { + self::set_phpbb_root_path(); + + return [ + [ + 'web/root/path/some_url', + 'web/root/path/some_url' + ], + [ + '/var/www/phpbb/test.php', + self::$phpbb_root_path . 'test.php' + ] + ]; + } + + /** + * @dataProvider remove_web_root_path_data + */ + public function test_remove_web_root_path($input, $expected) + { + $path_helper = $this->getMockBuilder('\phpbb\path_helper') + ->setConstructorArgs([ + new \phpbb\symfony_request( + new phpbb_mock_request() + ), + $this->createMock('\phpbb\request\request'), + self::$phpbb_root_path, + 'php', + 'adm/' + ]) + ->onlyMethods(['get_web_root_path']) + ->getMock(); + $path_helper->method('get_web_root_path') + ->willReturn('/var/www/phpbb/'); + + $this->assertEquals($expected, $path_helper->remove_web_root_path($input)); + } + + public static function clean_url_data() { return array( array('', ''), @@ -225,7 +287,7 @@ public function test_clean_url($input, $expected) $this->assertEquals($expected, $this->path_helper->clean_url($input)); } - public function glue_url_params_data() + public static function glue_url_params_data() { return array( array( @@ -263,7 +325,7 @@ public function test_glue_url_params($params, $expected) $this->assertEquals($expected, $this->path_helper->glue_url_params($params)); } - public function get_url_parts_data() + public static function get_url_parts_data() { return array( array( @@ -327,7 +389,7 @@ public function test_get_url_parts($url, $is_amp, $expected) $this->assertEquals($expected, $this->path_helper->get_url_parts($url, $is_amp)); } - public function strip_url_params_data() + public static function strip_url_params_data() { return array( array( @@ -365,7 +427,7 @@ public function test_strip_url_params($url, $strip, $is_amp, $expected) $this->assertEquals($expected, $this->path_helper->strip_url_params($url, $strip, $is_amp)); } - public function append_url_params_data() + public static function append_url_params_data() { return array( array( @@ -395,6 +457,40 @@ public function append_url_params_data() ); } + public function test_get_web_root_path_ajax() + { + $symfony_request = $this->getMockBuilder('\phpbb\symfony_request') + ->setConstructorArgs([new phpbb_mock_request()]) + ->onlyMethods(['get', 'getSchemeAndHttpHost', 'getBasePath', 'getPathInfo']) + ->getMock(); + $symfony_request->method('getSchemeAndHttpHost') + ->willReturn('http://www.phpbb.com'); + $symfony_request->method('getBasePath') + ->willReturn('/community'); + $symfony_request->expects($this->any()) + ->method('getPathInfo') + ->will($this->returnValue('foo/bar')); + + $request = $this->createMock('phpbb\request\request'); + $request->method('is_ajax') + ->willReturn(true); + $request->method('escape') + ->willReturnArgument(0); + $request->method('header') + ->with('Referer') + ->willReturn('http://www.phpbb.com/community/route1/route2/'); + + $path_helper = new \phpbb\path_helper( + $symfony_request, + $request, + self::$phpbb_root_path, + 'php', + 'adm/' + ); + + $this->assertEquals(self::$phpbb_root_path . '../../', $path_helper->get_web_root_path()); + } + /** * @dataProvider append_url_params_data */ @@ -403,65 +499,80 @@ public function test_append_url_params($url, $params, $is_amp, $expected) $this->assertEquals($expected, $this->path_helper->append_url_params($url, $params, $is_amp)); } - public function get_web_root_path_from_ajax_referer_data() + public static function get_web_root_path_from_ajax_referer_data() { - return array( - array( + return [ + [ 'http://www.phpbb.com/community/route1/route2/', 'http://www.phpbb.com/community', '../../', - ), - array( + ], + [ + 'http://www.phpbb.com/community/route1/route2/?f=9', + 'http://www.phpbb.com/community', + '../../', + ], + [ 'http://www.phpbb.com/community/route1/route2', 'http://www.phpbb.com/community', '../', - ), - array( + ], + [ 'http://www.phpbb.com/community/route1', 'http://www.phpbb.com/community', '', - ), - array( + ], + [ 'http://www.phpbb.com/community/', 'http://www.phpbb.com/community', '', - ), - array( + ], + [ 'http://www.phpbb.com/notcommunity/route1/route2/', 'http://www.phpbb.com/community', '../../../community/', - ), - array( + ], + [ + 'http://www.phpbb.com/notcommunity/route1/route2/?f=9', + 'http://www.phpbb.com/community', + '../../../community/', + ], + [ 'http://www.phpbb.com/notcommunity/route1/route2', 'http://www.phpbb.com/community', '../../community/', - ), - array( + ], + [ 'http://www.phpbb.com/notcommunity/route1', 'http://www.phpbb.com/community', '../community/', - ), - array( + ], + [ 'http://www.phpbb.com/notcommunity/', 'http://www.phpbb.com/community', '../community/', - ), - array( + ], + [ 'http://www.phpbb.com/foobar', 'http://www.phpbb.com', '', - ), - array( + ], + [ 'http://www.foobar.com', 'http://www.phpbb.com', '/www.phpbb.com/', - ), - array( + ], + [ 'foobar', 'http://www.phpbb.com/community', '', - ) - ); + ], + [ + 'https://www.phpbb.com', + 'https://www.phpbb.com', + '' + ] + ]; } /** @@ -469,10 +580,10 @@ public function get_web_root_path_from_ajax_referer_data() */ public function test_get_web_root_path_from_ajax_referer($referer_url, $board_url, $expected) { - $this->assertEquals($this->phpbb_root_path . $expected, $this->path_helper->get_web_root_path_from_ajax_referer($referer_url, $board_url)); + $this->assertEquals(self::$phpbb_root_path . $expected, $this->path_helper->get_web_root_path_from_ajax_referer($referer_url, $board_url)); } - public function data_get_valid_page() + public static function data_get_valid_page() { return array( // array( current page , mod_rewrite setting , expected output ) @@ -494,6 +605,43 @@ public function data_get_valid_page() */ public function test_get_valid_page($page, $mod_rewrite, $expected) { - $this->assertEquals($this->phpbb_root_path . $expected, $this->path_helper->get_valid_page($page, $mod_rewrite)); + $this->assertEquals(self::$phpbb_root_path . $expected, $this->path_helper->get_valid_page($page, $mod_rewrite)); + } + + public static function is_router_used_data() + { + return [ + [ + 'index.php', + false, + ], + [ + 'app.php', + true, + ], + ]; + } + + /** + * @dataProvider is_router_used_data + */ + public function test_is_router_used($script_name, $expected) + { + $symfony_request = $this->getMockBuilder('\phpbb\symfony_request') + ->setConstructorArgs([new phpbb_mock_request()]) + ->onlyMethods(['getScriptName']) + ->getMock(); + $symfony_request->method('getScriptName') + ->willReturn($script_name); + + $path_helper = new \phpbb\path_helper( + $symfony_request, + $this->createMock('\phpbb\request\request'), + self::$phpbb_root_path, + 'php', + 'adm/' + ); + + $this->assertSame($expected, $path_helper->is_router_used()); } } diff --git a/tests/plupload/plupload_test.php b/tests/plupload/plupload_test.php index 46bebb8d350..4d020bbdbf7 100644 --- a/tests/plupload/plupload_test.php +++ b/tests/plupload/plupload_test.php @@ -13,18 +13,22 @@ class phpbb_plupload_test extends phpbb_test_case { - public function generate_resize_string_data() + public static function generate_resize_string_data() { return array( array( 0, 0, + 85, + 0, '', ), array( 130, 150, - 'resize: {width: 130, height: 150, quality: 85},' + 85, + 1, + 'resize: {width: 130, height: 150, quality: 85, preserve_headers: false},' ), ); } @@ -32,7 +36,7 @@ public function generate_resize_string_data() /** * @dataProvider generate_resize_string_data */ - public function test_generate_resize_string($config_width, $config_height, $expected) + public function test_generate_resize_string($config_width, $config_height, $config_quality, $config_metadata, $expected) { global $phpbb_root_path, $phpEx; @@ -41,6 +45,8 @@ public function test_generate_resize_string($config_width, $config_height, $expe $config = new \phpbb\config\config(array( 'img_max_width' => $config_width, 'img_max_height' => $config_height, + 'img_quality' => $config_quality, + 'img_strip_metadata' => $config_metadata, 'upload_path' => 'files', )); $plupload = new \phpbb\plupload\plupload( @@ -54,4 +60,77 @@ public function test_generate_resize_string($config_width, $config_height, $expe $this->assertEquals($expected, $plupload->generate_resize_string()); } + + public static function data_get_chunk_size() + { + return [ + [[ + 'memory_limit' => -1, + 'upload_max_filesize' => 0, + 'post_max_size' => 0, + ], 0], + [[ + 'memory_limit' => -1, + 'upload_max_filesize' => 500, + 'post_max_size' => 400, + ], 200], + [[ + 'memory_limit' => 100, + 'upload_max_filesize' => 0, + 'post_max_size' => 300, + ], 50], + [[ + 'memory_limit' => 300, + 'upload_max_filesize' => 200, + 'post_max_size' => 0, + ], 100], + [[ + 'memory_limit' => 3000, + 'upload_max_filesize' => 800, + 'post_max_size' => 900, + ], 400], + [[ + 'memory_limit' => 2000, + 'upload_max_filesize' => 1000, + 'post_max_size' => 600, + ], 300], + [[ + 'memory_limit' => 1000, + 'upload_max_filesize' => 2000, + 'post_max_size' => 3000, + ], 500], + ]; + } + + /** + * @dataProvider data_get_chunk_size + */ + public function test_get_chunk_size($limits_ary, $expected) + { + global $phpbb_root_path, $phpEx; + + $lang = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $config = new \phpbb\config\config([]); + + $ini_wrapper = $this->getMockBuilder('\bantu\IniGetWrapper\IniGetWrapper') + ->onlyMethods(['getBytes']) + ->getMock(); + $ini_wrapper->method('getBytes') + ->will($this->returnValueMap([ + ['memory_limit', $limits_ary['memory_limit']], + ['upload_max_filesize', $limits_ary['upload_max_filesize']], + ['post_max_size', $limits_ary['post_max_size']] + ])); + + $plupload = new \phpbb\plupload\plupload( + '', + $config, + new phpbb_mock_request, + new \phpbb\user($lang, '\phpbb\datetime'), + $ini_wrapper, + new \phpbb\mimetype\guesser(array(new \phpbb\mimetype\extension_guesser)) + ); + + $this->assertEquals($expected, $plupload->get_chunk_size()); + } } diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php index 9d6ba7a9173..e618d7c2e6a 100644 --- a/tests/privmsgs/delete_user_pms_test.php +++ b/tests/privmsgs/delete_user_pms_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_privmsgs.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_privmsgs.php'; class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/delete_user_pms.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/delete_user_pms.xml'); } static public function delete_user_pms_data() @@ -85,16 +85,19 @@ static public function delete_user_pms_data() */ public function test_delete_user_pms($delete_user, $remaining_privmsgs, $remaining_privmsgs_to) { - global $db, $phpbb_container, $phpbb_root_path; + global $db, $phpbb_container; $db = $this->new_dbal(); $phpbb_container = new phpbb_mock_container_builder(); $phpbb_container->set('notification_manager', new phpbb_mock_notification_manager()); + + $storage = $this->createMock('\phpbb\storage\storage'); + // Works as a workaround for tests - $phpbb_container->set('attachment.manager', new \phpbb\attachment\delete(new \phpbb\config\config(array()), $db, new \phpbb_mock_event_dispatcher(), new \phpbb\filesystem\filesystem(), new \phpbb\attachment\resync($db), $phpbb_root_path)); + $phpbb_container->set('attachment.manager', new \phpbb\attachment\delete(new \phpbb\config\config(array()), $db, new \phpbb_mock_event_dispatcher(), new \phpbb\attachment\resync($db), $storage)); - phpbb_delete_user_pms($delete_user); + phpbb_delete_users_pms([$delete_user]); $sql = 'SELECT msg_id FROM ' . PRIVMSGS_TABLE; diff --git a/tests/profilefields/fixtures/manager.xml b/tests/profilefields/fixtures/manager.xml new file mode 100644 index 00000000000..b0b118bb138 --- /dev/null +++ b/tests/profilefields/fixtures/manager.xml @@ -0,0 +1,31 @@ + + + + field_id + field_ident + field_active + field_type + field_order + + 1 + pf_1 + 1 + foo_bar_type + 1 + + + 2 + pf_2 + 1 + foo_bar_type + 2 + + + 3 + pf_3 + 1 + other_type + 3 + +
      +       diff --git a/tests/profilefields/manager_test.php b/tests/profilefields/manager_test.php new file mode 100644 index 00000000000..92f160c2767 --- /dev/null +++ b/tests/profilefields/manager_test.php @@ -0,0 +1,186 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +class manager_test extends phpbb_database_test_case +{ + /** @var \phpbb\config\db_text */ + protected $config_text; + + /** @var \phpbb\db\driver\driver_interface */ + protected $db; + + /** @var \Doctrine\DBAL\Connection */ + protected $db_doctrine; + + /** @var \phpbb\db\tools\doctrine */ + protected $db_tools; + + /** @var \phpbb\log\log_interface */ + protected $log; + + /** @var \phpbb\profilefields\manager */ + protected $manager; + + /** @var string Table prefix */ + protected $table_prefix; + + /** + * {@inheritdoc} + */ + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/manager.xml'); + } + + protected function setUp(): void + { + parent::setUp(); + + global $phpbb_root_path, $phpEx, $table_prefix; + + $this->db = $this->new_dbal(); + $this->db_doctrine = $this->new_doctrine_dbal(); + $this->db_tools = $this->getMockBuilder('\phpbb\db\tools\doctrine') + ->setConstructorArgs([$this->db_doctrine]) + ->getMock(); + $this->config_text = new \phpbb\config\db_text($this->db, $table_prefix . 'config_text'); + $this->table_prefix = $table_prefix; + + $container = new phpbb_mock_container_builder(); + $dispatcher = new phpbb_mock_event_dispatcher(); + + $template = $this->getMockBuilder('\phpbb\template\template') + ->disableOriginalConstructor() + ->getMock(); + + $auth = new \phpbb\auth\auth(); + $language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $collection = new \phpbb\di\service_collection($container); + $user = new \phpbb\user($language, '\phpbb\datetime'); + $user->data['user_id'] = 2; + $user->ip = ''; + + $this->log = new \phpbb\log\log($this->db, $user, $auth, $dispatcher, $phpbb_root_path, 'adm/', $phpEx, $table_prefix . 'log'); + + $this->manager = new \phpbb\profilefields\manager( + $auth, + $this->config_text, + $this->db, + $this->db_tools, + $dispatcher, + $language, + $this->log, + $template, + $collection, + $user, + $table_prefix . 'profile_fields', + $table_prefix . 'profile_fields_data', + $table_prefix . 'profile_fields_lang', + $table_prefix . 'profile_lang' + ); + } + + public function test_disable_profilefields() + { + // Disable the profile field type + $this->manager->disable_profilefields('foo_bar_type'); + + $sql = 'SELECT field_id, field_ident + FROM ' . $this->table_prefix . "profile_fields + WHERE field_active = 1 + AND field_type = 'foo_bar_type'"; + $this->assertSqlResultEquals([], $sql, 'All profile fields should be disabled'); + + // Test that the config entry exists + $saved = $this->config_text->get('foo_bar_type.saved'); + $saved = (array) json_decode($saved, true); + $this->assertEquals([ + 1 => 'pf_1', + 2 => 'pf_2', + ], $saved, 'All disable profile fields should be saved'); + } + + public function test_enable_profilefields() + { + // Enable the profile field type + $this->manager->enable_profilefields('foo_bar_type'); + + $sql = 'SELECT field_id + FROM ' . $this->table_prefix . "profile_fields + WHERE field_active = 1 + AND field_type = 'foo_bar_type' + ORDER BY field_id ASC"; + $this->assertSqlResultEquals([ + ['field_id' => '1'], + ['field_id' => '2'], + ], $sql, 'All profile fields should be enabled'); + + // Test that the config entry was removed + $saved = $this->config_text->get('foo_bar_type.saved'); + $this->assertEquals($saved, null, 'All disable profile fields should be removed'); + } + + public function test_purge_profilefields() + { + $this->db_tools + ->expects($this->exactly(2)) + ->method('sql_column_remove') + ->with( + $this->table_prefix . 'profile_fields_data', + $this->stringStartsWith('pf_') + ); + + // Get the field identifiers + $sql = 'SELECT field_id + FROM ' . $this->table_prefix . "profile_fields + WHERE field_type = 'foo_bar_type'"; + $result = $this->db->sql_query($sql); + $rowset = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + + $field_ids = array_map('intval', array_column($rowset, 'field_id')); + + // Purge the profile field type + $this->manager->purge_profilefields('foo_bar_type'); + + // Test all the profile field tables + $sql = 'SELECT field_id + FROM ' . $this->table_prefix . "profile_fields + WHERE field_type = 'foo_bar_type'"; + $this->assertSqlResultEquals([], $sql, 'All profile fields should be removed'); + + $sql = 'SELECT field_id + FROM ' . $this->table_prefix . "profile_fields_lang + WHERE field_type = 'foo_bar_type'"; + $this->assertSqlResultEquals([], $sql, 'All profile fields lang should be removed'); + + $sql = 'SELECT lang_name + FROM ' . $this->table_prefix . 'profile_lang + WHERE ' . $this->db->sql_in_set('field_id', $field_ids); + $this->assertSqlResultEquals([], $sql, 'All profile fields lang should be removed'); + + $sql = 'SELECT field_id, field_order + FROM ' . $this->table_prefix . 'profile_fields + ORDER BY field_id ASC'; + $this->assertSqlResultEquals([ + [ + 'field_id' => '3', + 'field_order' => '1' + ] + ], $sql, 'Profile fields order should be recalculated, starting by 1'); + + // Test that the config entry was removed + $saved = $this->config_text->get('foo_bar_type.saved'); + $this->assertEquals($saved, null, 'All disable profile fields should be removed'); + } +} diff --git a/tests/profilefields/type_bool_test.php b/tests/profilefields/type_bool_test.php index 66e1578e8a6..f102badb31b 100644 --- a/tests/profilefields/type_bool_test.php +++ b/tests/profilefields/type_bool_test.php @@ -23,10 +23,8 @@ class phpbb_profilefield_type_bool_test extends phpbb_test_case * @access public * @return void */ - public function setUp() + protected function setUp(): void { - global $phpbb_root_path, $phpEx; - $db = $this->createMock('phpbb\\db\\driver\\driver'); $user = $this->createMock('\phpbb\user'); @@ -35,12 +33,12 @@ public function setUp() ->will($this->returnCallback(array($this, 'return_callback_implode'))); $lang = $this->getMockBuilder('\phpbb\profilefields\lang_helper') - ->setMethods(array('get_options_lang', 'is_set', 'get')) + ->onlyMethods(array('load_option_lang', 'is_set', 'get')) ->setConstructorArgs(array($db, LANG_TABLE)) ->getMock(); $lang->expects($this->any()) - ->method('get_options_lang'); + ->method('load_option_lang'); $lang->expects($this->any()) ->method('is_set') @@ -67,8 +65,10 @@ public function setUp() 'lang_id' => 1, 'lang_name' => 'field', 'field_required' => false, - 'field_default_value' => 1, - 'field_length' => 1, + 'field_default_value' => 1, + 'field_length' => 1, + 'field_show_novalue' => null, + 'field_novalue' => null, ); $this->options = array( @@ -77,7 +77,7 @@ public function setUp() ); } - public function validate_profile_field_data() + public static function validate_profile_field_data() { return array( array( @@ -101,7 +101,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $ $this->assertSame($expected, $result, $description); } - public function profile_value_data() + public static function profile_value_data() { return array( array( @@ -137,7 +137,7 @@ public function test_get_profile_value($value, $field_options, $expected, $descr $this->assertSame($expected, $result, $description); } - public function profile_value_raw_data() + public static function profile_value_raw_data() { return array( array( @@ -187,7 +187,7 @@ public function test_get_profile_value_raw($value, $field_options, $expected, $d public function is_set_callback($field_id, $lang_id, $field_value) { - return isset($this->options[$field_value]); + return isset($field_value, $this->options[$field_value]); } public function get($field_id, $lang_id, $field_value) diff --git a/tests/profilefields/type_date_test.php b/tests/profilefields/type_date_test.php index dc547c2d104..679ce99256a 100644 --- a/tests/profilefields/type_date_test.php +++ b/tests/profilefields/type_date_test.php @@ -20,17 +20,11 @@ class phpbb_profilefield_type_date_test extends phpbb_test_case /** * Sets up basic test objects * - * @access public - * @return null + * @access protected */ - public function setUp() + protected function setUp(): void { - global $phpbb_root_path, $phpEx; - - $this->user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + $this->user = $this->createMock('\phpbb\user'); $this->user->expects($this->any()) ->method('lang') ->will($this->returnCallback(array($this, 'return_callback_implode'))); @@ -40,10 +34,11 @@ public function setUp() ->will($this->returnCallback(array($this, 'create_datetime_callback'))); $this->user->timezone = new DateTimeZone('UTC'); - $this->user->lang = array( - 'datetime' => array(), - 'DATE_FORMAT' => 'm/d/Y', - ); + $this->user->expects($this->any()) + ->method('__get')->with('lang')->willReturn([ + 'datetime' => [], + 'DATE_FORMAT' => 'm/d/Y', + ]); $request = $this->createMock('\phpbb\request\request'); $template = $this->createMock('\phpbb\template\template'); @@ -61,10 +56,12 @@ public function setUp() 'lang_id' => 1, 'lang_name' => 'field', 'field_required' => false, + 'field_show_novalue' => null, + 'field_novalue' => null, ); } - public function profile_value_data() + public static function profile_value_data() { return array( array( @@ -100,7 +97,7 @@ public function test_get_profile_value($value, $field_options, $expected, $descr $this->assertSame($expected, $result, $description); } - public function validate_profile_field_data() + public static function validate_profile_field_data() { return array( array( @@ -184,7 +181,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $ $this->assertSame($expected, $result, $description); } - public function profile_value_raw_data() + public static function profile_value_raw_data() { return array( array( @@ -225,7 +222,7 @@ public function return_callback_implode() return implode('-', func_get_args()); } - public function create_datetime_callback($time = 'now', \DateTimeZone $timezone = null) + public function create_datetime_callback($time = 'now', \DateTimeZone|null $timezone = null) { $timezone = $timezone ?: $this->user->timezone; return new \phpbb\datetime($this->user, $time, $timezone); diff --git a/tests/profilefields/type_dropdown_test.php b/tests/profilefields/type_dropdown_test.php index 96b2ad31beb..9e979b80e26 100644 --- a/tests/profilefields/type_dropdown_test.php +++ b/tests/profilefields/type_dropdown_test.php @@ -20,13 +20,10 @@ class phpbb_profilefield_type_dropdown_test extends phpbb_test_case /** * Sets up basic test objects * - * @access public - * @return null + * @access protected */ - public function setUp() + protected function setUp(): void { - global $phpbb_root_path, $phpEx; - $db = $this->createMock('phpbb\\db\\driver\\driver'); $user = $this->createMock('\phpbb\user'); @@ -38,12 +35,12 @@ public function setUp() $template = $this->createMock('\phpbb\template\template'); $lang = $this->getMockBuilder('\phpbb\profilefields\lang_helper') - ->setMethods(array('get_options_lang', 'is_set', 'get')) + ->onlyMethods(array('load_option_lang', 'is_set', 'get')) ->setConstructorArgs(array($db, LANG_TABLE)) ->getMock(); $lang->expects($this->any()) - ->method('get_options_lang'); + ->method('load_option_lang'); $lang->expects($this->any()) ->method('is_set') @@ -69,6 +66,7 @@ public function setUp() 'field_required' => false, 'field_validation' => '.*', 'field_novalue' => 0, + 'field_show_novalue' => null, ); $this->dropdown_options = array( @@ -80,7 +78,7 @@ public function setUp() ); } - public function validate_profile_field_data() + public static function validate_profile_field_data() { return array( array( @@ -134,7 +132,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $ $this->assertSame($expected, $result, $description); } - public function profile_value_data() + public static function profile_value_data() { return array( array( @@ -156,7 +154,7 @@ public function profile_value_data() 'Field should output nothing for empty value', ), array( - '', + null, // Since PHP 8, '' == 0 returns false, hence use null instead of '' (empty string) array('field_show_novalue' => false), null, 'Field should simply output null for empty value', @@ -177,7 +175,7 @@ public function test_get_profile_value($value, $field_options, $expected, $descr $this->assertSame($expected, $result, $description); } - public function profile_value_raw_data() + public static function profile_value_raw_data() { return array( array( @@ -187,7 +185,7 @@ public function profile_value_raw_data() 'Field should return the correct raw value', ), array( - '', + null, // Since PHP 8, '' == 0 returns false, hence use null instead of '' (empty string) array('field_show_novalue' => false), null, 'Field should null for empty value without show_novalue', @@ -227,7 +225,7 @@ public function test_get_profile_value_raw($value, $field_options, $expected, $d public function is_set_callback($field_id, $lang_id, $field_value) { - return isset($this->dropdown_options[$field_value]); + return isset($field_value, $this->dropdown_options[$field_value]); } public function get($field_id, $lang_id, $field_value) diff --git a/tests/profilefields/type_googleplus_test.php b/tests/profilefields/type_googleplus_test.php deleted file mode 100644 index 06ba231e68f..00000000000 --- a/tests/profilefields/type_googleplus_test.php +++ /dev/null @@ -1,96 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -class phpbb_profilefield_type_googleplus_test extends phpbb_test_case -{ - protected $field; - - public function setUp() - { - parent::setUp(); - - global $phpbb_root_path, $phpEx; - - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->add_lang('ucp'); - $request = $this->createMock('\phpbb\request\request'); - $template = $this->createMock('\phpbb\template\template'); - - $this->field = new \phpbb\profilefields\type\type_googleplus( - $request, - $template, - $user - ); - } - public function get_profile_contact_value_data() - { - return array( - array( - '112010191010100', - array(), - '112010191010100', - 'Field should return a numerical Google+ ID as is', - ), - array( - 'TestUsername', - array(), - '+TestUsername', - 'Field should return a string Google+ ID with a + prefixed', - ), - ); - } - - /** - * @dataProvider get_profile_contact_value_data - */ - public function test_get_profile_contact_value($value, $field_options, $expected, $description) - { - $default_field_options = array( - 'field_type' => '\phpbb\profilefields\type\type_googleplus', - 'field_name' => 'field', - 'field_id' => 1, - 'lang_id' => 1, - 'lang_name' => 'field', - 'field_required' => false, - 'field_validation' => '[\w]+', - ); - $field_options = array_merge($default_field_options, $field_options); - - $this->assertSame($expected, $this->field->get_profile_contact_value($value, $field_options), $description); - } - - public function data_validate_googleplus() - { - return array( - array('foobar', false), - array('2342340929304', false), - array('foo 'googleplus'), $this->field->get_default_option_values()); - $this->assertSame($expected, $this->field->validate_string_profile_field('string', $input, $field_data)); - } -} diff --git a/tests/profilefields/type_int_test.php b/tests/profilefields/type_int_test.php index 326c6051b31..1fb512e1a6a 100644 --- a/tests/profilefields/type_int_test.php +++ b/tests/profilefields/type_int_test.php @@ -19,17 +19,11 @@ class phpbb_profilefield_type_int_test extends phpbb_test_case /** * Sets up basic test objects * - * @access public - * @return null + * @access protected */ - public function setUp() + protected function setUp(): void { - global $phpbb_root_path, $phpEx; - - $user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + $user = $this->createMock('\phpbb\user'); $user->expects($this->any()) ->method('lang') ->will($this->returnCallback(array($this, 'return_callback_implode'))); @@ -50,10 +44,14 @@ public function setUp() 'lang_id' => 1, 'lang_name' => 'field', 'field_required' => false, + 'field_show_novalue' => null, + 'field_novalue' => null, + 'field_minlen' => null, + 'field_maxlen' => null, ); } - public function profile_value_data() + public static function profile_value_data() { return array( array( @@ -120,7 +118,7 @@ public function test_get_profile_value($value, $field_options, $expected, $descr $this->assertSame($expected, $result, $description); } - public function validate_profile_field_data() + public static function validate_profile_field_data() { return array( array( @@ -174,7 +172,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $ $this->assertSame($expected, $result, $description); } - public function profile_value_raw_data() + public static function profile_value_raw_data() { return array( array( diff --git a/tests/profilefields/type_string_test.php b/tests/profilefields/type_string_test.php index 946e513e96b..351495069d0 100644 --- a/tests/profilefields/type_string_test.php +++ b/tests/profilefields/type_string_test.php @@ -19,17 +19,13 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case /** * Sets up basic test objects * - * @access public - * @return null + * @access protected */ - public function setUp() + protected function setUp(): void { - global $config, $request, $user, $cache, $phpbb_root_path, $phpEx; + global $config, $request, $user, $cache; - $user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + $user = $this->createMock('\phpbb\user'); $cache = new phpbb_mock_cache; $user->expects($this->any()) ->method('lang') @@ -53,10 +49,14 @@ public function setUp() 'lang_name' => 'field', 'field_required' => false, 'field_validation' => '.*', + 'field_show_novalue' => null, + 'field_novalue' => null, + 'field_minlen' => null, + 'field_maxlen' => null, ); } - public function validate_profile_field_data() + public static function validate_profile_field_data() { return array( array( @@ -243,7 +243,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $ $this->assertSame($expected, $result, $description); } - public function profile_value_data() + public static function profile_value_data() { return array( array( @@ -298,7 +298,7 @@ public function test_get_profile_value($value, $field_options, $expected, $descr $this->assertSame($expected, $result, $description); } - public function profile_value_raw_data() + public static function profile_value_raw_data() { return array( array( diff --git a/tests/profilefields/type_url_test.php b/tests/profilefields/type_url_test.php index 18aa214e3d6..177b3efbb12 100644 --- a/tests/profilefields/type_url_test.php +++ b/tests/profilefields/type_url_test.php @@ -11,9 +11,9 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; +require_once __DIR__ . '/../../phpBB/includes/functions.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_content.php'; +require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php'; class phpbb_profilefield_type_url_test extends phpbb_test_case { @@ -23,19 +23,15 @@ class phpbb_profilefield_type_url_test extends phpbb_test_case /** * Sets up basic test objects * - * @access public - * @return null + * @access protected */ - public function setUp() + protected function setUp(): void { - global $config, $request, $user, $cache, $phpbb_root_path, $phpEx; + global $config, $request, $user, $cache; $config = new \phpbb\config\config([]); $cache = new phpbb_mock_cache; - $user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + $user = $this->createMock('\phpbb\user'); $user->expects($this->any()) ->method('lang') ->will($this->returnCallback(array($this, 'return_callback_implode'))); @@ -56,10 +52,14 @@ public function setUp() 'lang_id' => 1, 'lang_name' => 'field', 'field_required' => false, + 'field_show_novalue' => null, + 'field_novalue' => null, + 'field_minlen' => null, + 'field_maxlen' => null, ); } - public function validate_profile_field_data() + public static function validate_profile_field_data() { return array( array( @@ -152,7 +152,7 @@ public function test_validate_profile_field($value, $field_options, $expected, $ $this->assertSame($expected, $result, $description); } - public function profile_value_raw_data() + public static function profile_value_raw_data() { return array( array( @@ -184,7 +184,7 @@ public function profile_value_raw_data() ); } - public function profile_value_data() + public static function profile_value_data() { return array( array( diff --git a/tests/random/gen_rand_string_test.php b/tests/random/gen_rand_string_test.php index a9d1ea20de6..cb89a1703e4 100644 --- a/tests/random/gen_rand_string_test.php +++ b/tests/random/gen_rand_string_test.php @@ -17,7 +17,7 @@ class phpbb_random_gen_rand_string_test extends phpbb_test_case const MIN_STRING_LENGTH = 1; const MAX_STRING_LENGTH = 15; - public function setUp() + protected function setUp(): void { global $config; @@ -40,8 +40,11 @@ public function test_gen_rand_string() $random_string_length = strlen($random_string); $this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH); - $this->assertTrue($random_string_length <= $num_chars); - $this->assertRegExp('#^[A-Z0-9]+$#', $random_string); + $this->assertTrue( + $random_string_length == $num_chars, + sprintf('Failed asserting that random string length matches expected length. Expected %1$u, Actual %2$u', $num_chars, $random_string_length) + ); + $this->assertMatchesRegularExpression('#^[A-Z0-9]+$#', $random_string); } } } @@ -56,8 +59,11 @@ public function test_gen_rand_string_friendly() $random_string_length = strlen($random_string); $this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH); - $this->assertTrue($random_string_length <= $num_chars); - $this->assertRegExp('#^[A-NP-Z1-9]+$#', $random_string); + $this->assertTrue( + $random_string_length == $num_chars, + sprintf('Failed asserting that random string length matches expected length. Expected %1$u, Actual %2$u', $num_chars, $random_string_length) + ); + $this->assertMatchesRegularExpression('#^[A-NP-Z1-9]+$#', $random_string); } } } diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php index 5a516b71de2..8b1410ac7f0 100644 --- a/tests/regex/censor_test.php +++ b/tests/regex/censor_test.php @@ -13,7 +13,7 @@ class phpbb_regex_censor_test extends phpbb_test_case { - public function censor_test_data() + public static function censor_test_data() { return array( array('bad*word', 'bad word'), @@ -37,6 +37,6 @@ public function test_censor_unicode($pattern, $subject) { $regex = get_censor_preg_expression($pattern); - $this->assertRegExp($regex, $subject); + $this->assertMatchesRegularExpression($regex, $subject); } } diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php index 5187b8bda63..ccb98558dc8 100644 --- a/tests/regex/email_test.php +++ b/tests/regex/email_test.php @@ -15,12 +15,12 @@ class phpbb_regex_email_test extends phpbb_test_case { protected $regex; - public function setUp() + protected function setUp(): void { $this->regex = '#^' . get_preg_expression('email') . '$#i'; } - public function positive_match_data() + public static function positive_match_data() { return array( array('nobody@phpbb.com'), @@ -36,7 +36,7 @@ public function positive_match_data() //array('"John Doe"@example.com'), //array('Alice@[192.168.2.1]'), // IPv4 //array('Bob@[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]'), // IPv6 - + // http://fightingforalostcause.net/misc/2006/compare-email-regex.php array('l3tt3rsAndNumb3rs@domain.com'), array('has-dash@domain.com'), @@ -60,7 +60,7 @@ public function positive_match_data() ); } - public function negative_match_data() + public static function negative_match_data() { return array( array('foo.example.com'), // @ is missing @@ -80,7 +80,7 @@ public function negative_match_data() array('abc,def@example.com'), // invalid character , array('abcdef@example.com'), // invalid character > - + // http://fightingforalostcause.net/misc/2006/compare-email-regex.php array('missingDomain@.com'), array('@missingLocal.org'), diff --git a/tests/regex/ipv4_test.php b/tests/regex/ipv4_test.php index e21a2d77fa8..954f24bbcdb 100644 --- a/tests/regex/ipv4_test.php +++ b/tests/regex/ipv4_test.php @@ -15,12 +15,12 @@ class phpbb_regex_ipv4_test extends phpbb_test_case { protected $regex; - public function setUp() + protected function setUp(): void { $this->regex = get_preg_expression('ipv4'); } - public function positive_match_data() + public static function positive_match_data() { return array( array('0.0.0.0'), @@ -30,7 +30,7 @@ public function positive_match_data() ); } - public function negative_match_data() + public static function negative_match_data() { return array( // IPv6 addresses diff --git a/tests/regex/ipv6_test.php b/tests/regex/ipv6_test.php index 223161df7f9..720161ee8c3 100644 --- a/tests/regex/ipv6_test.php +++ b/tests/regex/ipv6_test.php @@ -15,12 +15,12 @@ class phpbb_regex_ipv6_test extends phpbb_test_case { protected $regex; - public function setUp() + protected function setUp(): void { $this->regex = get_preg_expression('ipv6'); } - public function positive_match_data() + public static function positive_match_data() { return array( // Full length IPv6 address @@ -97,7 +97,7 @@ public function positive_match_data() ); } - public function negative_match_data() + public static function negative_match_data() { return array( // Empty address diff --git a/tests/regex/password_complexity_test.php b/tests/regex/password_complexity_test.php index 933dc1ac911..2ee325e40dc 100644 --- a/tests/regex/password_complexity_test.php +++ b/tests/regex/password_complexity_test.php @@ -11,11 +11,11 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_password_complexity_test extends phpbb_test_case { - public function password_complexity_test_data_positive() + public static function password_complexity_test_data_positive() { return array( array('12345', 'PASS_TYPE_ANY'), @@ -33,7 +33,7 @@ public function password_complexity_test_data_positive() ); } - public function password_complexity_test_data_negative() + public static function password_complexity_test_data_negative() { return array( array('qwerty', 'PASS_TYPE_CASE'), diff --git a/tests/regex/table_prefix_test.php b/tests/regex/table_prefix_test.php index bf7b59ccc61..0fad1d0e1c7 100644 --- a/tests/regex/table_prefix_test.php +++ b/tests/regex/table_prefix_test.php @@ -13,11 +13,11 @@ class phpbb_regex_table_prefix_test extends phpbb_test_case { - public function table_prefix_test_data() + public static function table_prefix_test_data() { return array( array('phpbb_', 1), - array('phpBB3', 1), + array('phpBB', 1), array('a', 1), array('', 0), diff --git a/tests/regex/url_test.php b/tests/regex/url_test.php index 5e2a22bf73a..5e39a7ba36c 100644 --- a/tests/regex/url_test.php +++ b/tests/regex/url_test.php @@ -13,7 +13,7 @@ class phpbb_regex_url_test extends phpbb_test_case { - public function url_test_data() + public static function url_test_data() { return array( array('http://www.phpbb.com/community/', 1), diff --git a/tests/request/request_test.php b/tests/request/request_test.php index 47798177e19..3744d9b38e6 100644 --- a/tests/request/request_test.php +++ b/tests/request/request_test.php @@ -19,7 +19,7 @@ class phpbb_request_test extends phpbb_test_case /** @var \phpbb\request\request */ private $request; - protected function setUp() + protected function setUp(): void { // populate super globals $_POST['test'] = 1; @@ -146,7 +146,7 @@ public function test_is_ajax_with_ajax() $this->assertTrue($this->request->is_ajax()); } - public function data_is_secure() + public static function data_is_secure() { return array( array( @@ -264,7 +264,7 @@ public function test_variable_names() /** * Makes sure super globals work properly after these tests */ - protected function tearDown() + protected function tearDown(): void { $this->request->enable_super_globals(); } diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php index 84c81c4e84a..253b7abb735 100644 --- a/tests/request/request_var_test.php +++ b/tests/request/request_var_test.php @@ -13,15 +13,6 @@ class phpbb_request_var_test extends phpbb_test_case { - /** - * Makes sure request_var has its standard behaviour. - */ - protected function setUp() - { - parent::setUp(); - request_var(false, false, false, false, false); - } - /** * @dataProvider request_variables */ @@ -33,7 +24,8 @@ public function test_post($variable_value, $default, $multibyte, $expected) $_POST[$variable_name] = $variable_value; $_REQUEST[$variable_name] = $variable_value; - $result = request_var($variable_name, $default, $multibyte); + $request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false); + $result = $request->variable($variable_name, $default, $multibyte); $label = 'Requesting POST variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : ''); $this->assertEquals($expected, $result, $label); @@ -50,7 +42,8 @@ public function test_get($variable_value, $default, $multibyte, $expected) $_GET[$variable_name] = $variable_value; $_REQUEST[$variable_name] = $variable_value; - $result = request_var($variable_name, $default, $multibyte); + $request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false); + $result = $request->variable($variable_name, $default, $multibyte); $label = 'Requesting GET variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : ''); $this->assertEquals($expected, $result, $label); @@ -69,7 +62,8 @@ public function test_cookie($variable_value, $default, $multibyte, $expected) $_REQUEST[$variable_name] = false; $_COOKIE[$variable_name] = $variable_value; - $result = request_var($variable_name, $default, $multibyte, true); + $request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false); + $result = $request->variable($variable_name, $default, $multibyte, \phpbb\request\request_interface::COOKIE); $label = 'Requesting COOKIE variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : ''); $this->assertEquals($expected, $result, $label); @@ -109,11 +103,12 @@ public function test_deep_multi_dim_array_access($path, $default, $expected) ), ); - $result = request_var($path, $default); - $this->assertEquals($expected, $result, 'Testing deep access to multidimensional input arrays: ' . $path); + $request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false); + $result = $request->variable($path, $default); + $this->assertEquals($expected, $result); } - public function deep_access() + public static function deep_access() { return array( // array(path, default, expected result) @@ -124,7 +119,7 @@ public function deep_access() ); } - public function request_variables() + public static function request_variables() { return array( // strings diff --git a/tests/request/type_cast_helper_test.php b/tests/request/type_cast_helper_test.php index 143c05aa9c3..87989646eb5 100644 --- a/tests/request/type_cast_helper_test.php +++ b/tests/request/type_cast_helper_test.php @@ -15,58 +15,91 @@ class phpbb_type_cast_helper_test extends phpbb_test_case { private $type_cast_helper; - protected function setUp() + protected function setUp(): void { $this->type_cast_helper = new \phpbb\request\type_cast_helper(); } - public function test_addslashes_recursively() + public static function type_cast_helper_test_data() { - $data = array('some"string' => array('that"' => 'really"', 'needs"' => '"escaping')); - $expected = array('some\\"string' => array('that\\"' => 'really\\"', 'needs\\"' => '\\"escaping')); - - $this->type_cast_helper->addslashes_recursively($data); - - $this->assertEquals($expected, $data); - } - - public function test_simple_recursive_set_var() - { - $data = 'eviL<3'; - $expected = 'eviL<3'; - - $this->type_cast_helper->recursive_set_var($data, '', true); - - $this->assertEquals($expected, $data); - } - - public function test_nested_recursive_set_var() - { - $data = array('eviL<3'); - $expected = array('eviL<3'); - - $this->type_cast_helper->recursive_set_var($data, array(0 => ''), true); - - $this->assertEquals($expected, $data); + return [ + [ + 'eviL<3', + 'eviL<3', + '', + true, + ], + [ + ['eviL<3'], + ['eviL<3'], + [0 => ''], + true, + ], + [ + " eviL<3\t\t", + " eviL<3\t\t", + '', + true, + false, + ], + [ + [" eviL<3\t\t"], + [" eviL<3\t\t"], + [0 => ''], + true, + false, + ], + // Test multiline unicode vars + [ + " + +Тест ", + " + +Тест ", + '', + true, + false, + ], + [ + " + +Тест ", + "Тест", + '', + true, + true, + ], + [ + [" + +Тест "], + [" + +Тест "], + [0 => ''], + true, + false, + ], + [ + [" + +Тест "], + ["Тест"], + [0 => ''], + true, + true, + ], + ]; } - public function test_simple_untrimmed_recursive_set_var() + /** + * @dataProvider type_cast_helper_test_data + */ + public function test_recursive_set_var($var, $expected, $default, $multibyte, $trim = true) { - $data = " eviL<3\t\t"; - $expected = " eviL<3\t\t"; - - $this->type_cast_helper->recursive_set_var($data, '', true, false); - - $this->assertEquals($expected, $data); - } - - public function test_nested_untrimmed_recursive_set_var() - { - $data = array(" eviL<3\t\t"); - $expected = array(" eviL<3\t\t"); - - $this->type_cast_helper->recursive_set_var($data, array(0 => ''), true, false); + $this->type_cast_helper->recursive_set_var($var, $default, $multibyte, $trim); - $this->assertEquals($expected, $data); + $this->assertEquals($expected, $var); } } diff --git a/tests/search/common_test_case.php b/tests/search/common_test_case.php index 0bb45498322..f797d414f98 100644 --- a/tests/search/common_test_case.php +++ b/tests/search/common_test_case.php @@ -11,11 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_search_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_search_test_case.php'; abstract class phpbb_search_common_test_case extends phpbb_search_test_case { - public function keywords() + protected $search; + + public static function keywords() { return array( // keywords @@ -200,6 +202,9 @@ public function test_split_keywords($keywords, $terms, $ok, $split_words, $commo $this->assertEquals($ok, $rv); if ($ok) { + // If there are valid keywords, search->split_keywords perfoms array sort + sort($split_words); + // only check criteria if the search is going to be performed $this->assert_array_content_equals($split_words, $this->search->get_split_words()); } diff --git a/tests/search/mysql_test.php b/tests/search/mysql_test.php index 3a791f5e816..981d04d11ca 100644 --- a/tests/search/mysql_test.php +++ b/tests/search/mysql_test.php @@ -11,35 +11,37 @@ * */ -require_once dirname(__FILE__) . '/common_test_case.php'; +require_once __DIR__ . '/common_test_case.php'; class phpbb_search_mysql_test extends phpbb_search_common_test_case { protected $db; - protected $search; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); } - protected function setUp() + protected function setUp(): void { - global $phpbb_root_path, $phpEx, $config, $user, $cache; + global $phpbb_root_path, $phpEx, $config, $cache; parent::setUp(); // dbal uses cache - $cache = new phpbb_mock_cache(); + $cache = $this->createMock('\phpbb\cache\service'); + $language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $user = $this->createMock('\phpbb\user'); // set config values - $config['fulltext_mysql_min_word_len'] = 4; - $config['fulltext_mysql_max_word_len'] = 254; + $config = new \phpbb\config\config([ + 'fulltext_mysql_min_word_len' => 4, + 'fulltext_mysql_max_word_len' => 254, + ]); $this->db = $this->new_dbal(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $error = null; - $class = self::get_search_wrapper('\phpbb\search\fulltext_mysql'); - $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user, $phpbb_dispatcher); + $class = self::get_search_wrapper('\phpbb\search\backend\fulltext_mysql'); + $this->search = new $class($config, $this->db, $phpbb_dispatcher, $language, $user, SEARCH_RESULTS_TABLE, $phpbb_root_path, $phpEx); } } diff --git a/tests/search/native_test.php b/tests/search/native_test.php index 29d0d0a8d39..8f74d23e6d1 100644 --- a/tests/search/native_test.php +++ b/tests/search/native_test.php @@ -11,37 +11,48 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_search_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_search_test_case.php'; class phpbb_search_native_test extends phpbb_search_test_case { protected $db; + protected $db_tools; protected $search; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/posts.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/posts.xml'); } - protected function setUp() + protected function setUp(): void { - global $phpbb_root_path, $phpEx, $config, $user, $cache; + global $phpbb_root_path, $phpEx, $config, $cache; parent::setUp(); // dbal uses cache - $cache = new phpbb_mock_cache(); + $cache = $this->createMock('\phpbb\cache\service'); + $language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $user = $this->createMock('\phpbb\user'); + + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $lang = new \phpbb\language\language($lang_loader); + $user = new \phpbb\user($lang, '\phpbb\datetime'); $this->db = $this->new_dbal(); + $tools_factory = new \phpbb\db\tools\factory(); + $this->db_tools = $tools_factory->get($this->new_doctrine_dbal()); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $error = null; - $class = self::get_search_wrapper('\phpbb\search\fulltext_native'); - $config['fulltext_native_min_chars'] = 2; - $config['fulltext_native_max_chars'] = 14; - $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user, $phpbb_dispatcher); + $class = self::get_search_wrapper('\phpbb\search\backend\fulltext_native'); + $config = new \phpbb\config\config([ + 'fulltext_native_min_chars' => 2, + 'fulltext_native_max_chars' => 14, + 'max_num_search_keywords' => 10, + ]); + $this->search = new $class($config, $this->db, $this->db_tools, $phpbb_dispatcher, $language, $user, SEARCH_RESULTS_TABLE, SEARCH_WORDLIST_TABLE, SEARCH_WORDMATCH_TABLE, $phpbb_root_path, $phpEx); } - public function keywords() + public static function keywords() { return array( // keywords @@ -70,7 +81,7 @@ public function keywords() 'ba*az', 'all', true, - array('\'ba%az\''), + array(4), array(), array(), ), @@ -78,7 +89,7 @@ public function keywords() 'ba*z', 'all', true, - array('\'ba%z\''), + array(), // <= 3 chars after removing * array(), array(), ), @@ -86,7 +97,7 @@ public function keywords() 'baa* baaz*', 'all', true, - array('\'baa%\'', '\'baaz%\''), + array('\'baa%\'', 4), array(), array(), ), @@ -94,7 +105,7 @@ public function keywords() 'ba*z baa*', 'all', true, - array('\'ba%z\'', '\'baa%\''), + array('\'baa%\''), // baz is <= 3 chars, only baa* is left array(), array(), ), @@ -195,7 +206,7 @@ public function keywords() 'foo foo-', 'all', true, - array(1), + array(1, 1), array(), array(), ), @@ -203,7 +214,7 @@ public function keywords() 'foo- foo', 'all', true, - array(1), + array(1, 1), array(), array(), ), @@ -219,7 +230,7 @@ public function keywords() 'foo-bar-foo', 'all', true, - array(1, 2), + array(1, 2, 1), array(), array(), ), @@ -259,4 +270,78 @@ public function test_split_keywords($keywords, $terms, $ok, $must_contain, $must } $this->assert_array_content_equals($common, $this->search->get_common_words()); } + + public static function data_split_keywords_max(): array + { + return [ + 'character count within limits separated by more spaces' => [ + 'foo bar baz boo far faz roo rar raz zoo', + 'all', + false, + ], + 'character count within limits separated by spaces' => [ + 'foo bar baz boo far faz roo rar raz zoo', + 'all', + false, + ], + 'character count within limits separated by +, spaces after +' => [ + 'foo+ bar+ baz+ boo+ far+ faz+ roo+ rar+ raz+ zoo', + 'all', + false, + ], + 'character count within limits separated by +, no spaces' => [ + 'foo+bar+baz+boo+far+faz+roo+rar+raz+zoo', + 'all', + false, + ], + 'character count outside limits separated by +, no spaces' => [ + 'foo+bar+baz+boo+far+faz+roo+rar+raz+zoo+zar', + 'all', + true, + ], + 'character count outside limits separated by + and spaces' => [ + 'foo +bar +baz +boo +far +faz +roo +rar +raz +zoo +zar', + 'all', + true, + ], + 'character count outside limits separated by spaces' => [ + 'foo bar baz boo far faz roo rar raz zoo zar', + 'all', + true, + ], + 'character count outside limits separated by -, no spaces' => [ + 'foo-bar-baz-boo-far-faz-roo-rar-raz-zoo-zar', + 'all', + true, + ], + 'character count outside limits separated by - and spaces' => [ + 'foo -bar -baz -boo -far -faz -roo -rar -raz -zoo -zar', + 'all', + true, + ], + 'character count outside limits separated by |, no spaces' => [ + 'foo|bar|baz|boo|far|faz|roo|rar|raz|zoo|zar', + 'all', + true, + ], + 'character count outside limits separated by | and spaces' => [ + 'foo |bar |baz |boo |far |faz |roo |rar |raz |zoo |zar', + 'all', + true, + ], + ]; + } + + /** + * @dataProvider data_split_keywords_max + */ + public function test_split_max_keywords($keywords, $terms, $expect_error) + { + if ($expect_error) + { + $this->setExpectedTriggerError(E_USER_NOTICE, 'MAX_NUM_SEARCH_KEYWORDS_REFINE'); + } + + $this->assertTrue($this->search->split_keywords($keywords, $terms)); + } } diff --git a/tests/search/postgres_test.php b/tests/search/postgres_test.php index 97cca0e70cc..3a699eda2c5 100644 --- a/tests/search/postgres_test.php +++ b/tests/search/postgres_test.php @@ -11,35 +11,37 @@ * */ -require_once dirname(__FILE__) . '/common_test_case.php'; +require_once __DIR__ . '/common_test_case.php'; class phpbb_search_postgres_test extends phpbb_search_common_test_case { protected $db; - protected $search; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); } - protected function setUp() + protected function setUp(): void { - global $phpbb_root_path, $phpEx, $config, $user, $cache; + global $phpbb_root_path, $phpEx, $config, $cache; parent::setUp(); // dbal uses cache - $cache = new phpbb_mock_cache(); + $cache = $this->createMock('\phpbb\cache\service'); + $language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $user = $this->createMock('\phpbb\user'); // set config values - $config['fulltext_postgres_min_word_len'] = 4; - $config['fulltext_postgres_max_word_len'] = 254; + $config = new \phpbb\config\config([ + 'fulltext_postgres_min_word_len' => 4, + 'fulltext_postgres_max_word_len' => 254, + ]); $this->db = $this->new_dbal(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $error = null; - $class = self::get_search_wrapper('\phpbb\search\fulltext_postgres'); - $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user, $phpbb_dispatcher); + $class = self::get_search_wrapper('\phpbb\search\backend\fulltext_postgres'); + $this->search = new $class($config, $this->db, $phpbb_dispatcher, $language, $user, SEARCH_RESULTS_TABLE, $phpbb_root_path, $phpEx); } } diff --git a/tests/security/base.php b/tests/security/base.php index d2abdbc3623..77747bf243e 100644 --- a/tests/security/base.php +++ b/tests/security/base.php @@ -18,7 +18,7 @@ abstract class phpbb_security_test_base extends phpbb_test_case /** * Set up the required user object and server variables for the suites */ - protected function setUp() + protected function setUp(): void { global $user, $phpbb_root_path, $phpEx, $request, $symfony_request, $phpbb_filesystem; @@ -52,7 +52,6 @@ protected function setUp() $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->lang = true; $user->browser = $this->server['HTTP_USER_AGENT']; $user->referer = ''; $user->forwarded_for = ''; @@ -60,7 +59,7 @@ protected function setUp() $user->page = \phpbb\session::extract_current_page($phpbb_root_path); } - protected function tearDown() + protected function tearDown(): void { global $user; $user = NULL; diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php index f764449ecae..f308468ce39 100644 --- a/tests/security/extract_current_page_test.php +++ b/tests/security/extract_current_page_test.php @@ -11,12 +11,12 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_security_extract_current_page_test extends phpbb_security_test_base { - public function security_variables() + public static function security_variables() { return array( array('mark=forums&x=">', 'mark=forums&x=%22%3E%3Cscript%3Ealert%28%2FXSS%2F%29%3B%3C%2Fscript%3E'), diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php index 113c32bf7fe..203d142cb78 100644 --- a/tests/security/hash_test.php +++ b/tests/security/hash_test.php @@ -13,7 +13,7 @@ class phpbb_security_hash_test extends phpbb_test_case { - public function setUp() + protected function setUp(): void { global $phpbb_container; @@ -40,16 +40,26 @@ public function setUp() public function test_check_hash_with_phpass() { - $this->assertTrue(phpbb_check_hash('test', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); - $this->assertTrue(phpbb_check_hash('test', '$P$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); - $this->assertFalse(phpbb_check_hash('foo', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); + global $phpbb_container; + + /** @var \phpbb\passwords\manager $passwords_manager */ + $passwords_manager = $phpbb_container->get('passwords.manager'); + + $this->assertTrue($passwords_manager->check('test', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); + $this->assertTrue($passwords_manager->check('test', '$P$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); + $this->assertFalse($passwords_manager->check('foo', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); } public function test_check_hash_with_large_input() { + global $phpbb_container; + + /** @var \phpbb\passwords\manager $passwords_manager */ + $passwords_manager = $phpbb_container->get('passwords.manager'); + // 16 MB password, should be rejected quite fast $start_time = time(); - $this->assertFalse(phpbb_check_hash(str_repeat('a', 1024 * 1024 * 16), '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); + $this->assertFalse($passwords_manager->check(str_repeat('a', 1024 * 1024 * 16), '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); $this->assertLessThanOrEqual(5, time() - $start_time); } } diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php index b71f487e4fa..8568832600d 100644 --- a/tests/security/redirect_test.php +++ b/tests/security/redirect_test.php @@ -11,14 +11,14 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_security_redirect_test extends phpbb_security_test_base { protected $path_helper; - public function provider() + public static function provider() { // array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false)) return array( @@ -60,6 +60,8 @@ public function provider() protected function get_path_helper() { + global $phpbb_root_path; + if (!($this->path_helper instanceof \phpbb\path_helper)) { $this->path_helper = new \phpbb\path_helper( @@ -67,14 +69,14 @@ protected function get_path_helper() new phpbb_mock_request() ), $this->createMock('\phpbb\request\request'), - $this->phpbb_root_path, + $phpbb_root_path, 'php' ); } return $this->path_helper; } - protected function setUp() + protected function setUp(): void { global $phpbb_dispatcher; @@ -108,7 +110,7 @@ public function test_redirect($test, $disable_cd_check, $expected_error, $expect if ($expected_error !== false) { - $this->setExpectedTriggerError(E_USER_ERROR, $user->lang[$expected_error]); + $this->setExpectedTriggerError(E_USER_WARNING, $expected_error); } $result = redirect($test, true, $disable_cd_check); diff --git a/tests/session/append_sid_test.php b/tests/session/append_sid_test.php index 4e5a2386445..4bd5dbdbdd3 100644 --- a/tests/session/append_sid_test.php +++ b/tests/session/append_sid_test.php @@ -14,7 +14,7 @@ class phpbb_session_append_sid_test extends phpbb_test_case { - public function append_sid_data() + public static function append_sid_data() { return array( array('viewtopic.php?t=1&f=2', false, true, false, 'viewtopic.php?t=1&f=2', 'parameters in url-argument'), diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php index 04da5f08b99..9efaaf0a42d 100644 --- a/tests/session/check_ban_test.php +++ b/tests/session/check_ban_test.php @@ -11,55 +11,107 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_check_ban_test extends phpbb_session_test_case { protected $user_id = 4; protected $key_id = 4; + /** @var \phpbb\session */ protected $session; protected $backup_cache; public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_banlist.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_banlist.xml'); } - static function check_banned_data() + static function check_banned_data(): array { - return array( - array('All false values, should not be banned', - false, false, false, false, /* should be banned? -> */ false), - array('Matching values in the database, should be banned', - 4, '127.0.0.1', 'bar@example.org', true, /* should be banned? -> */ true), - array('IP Banned, should be banned', - false, '127.1.1.1', false, false, /* should be banned? -> */ true), - ); + return [ + 'not_banned' => [ + 'All false values, should not be banned', + false, false, false, false, /* should be banned? -> */ false + ], + 'banned' => [ + 'Matching values in the database, should be banned', + 4, '127.0.0.1', 'bar@example.org', true, /* should be banned? -> */ true + ], + 'banned_with_trigger_error' => [ + 'Matching values in the database, should be banned', + 4, '127.0.0.1', 'bar@example.org', false, /* should be banned? -> */ true + ], + ]; } - public function setUp() + protected function setUp(): void { parent::setUp(); // Get session here so that config is mocked correctly $this->session = $this->session_factory->get_session($this->db); - global $cache, $config, $phpbb_root_path, $phpEx, $phpbb_filesystem; + $this->session->data['user_id'] = ANONYMOUS; // Don't get into the session_kill() procedure + $this->session->lang = [ + 'BOARD_BAN_TIME' => 'BOARD_BAN_TIME', + 'BOARD_BAN_PERM' => 'BOARD_BAN_PERM', + 'BOARD_BAN_REASON' => 'BOARD_BAN_REASON', + 'BAN_TRIGGERED_BY_EMAIL' => 'BAN_TRIGGERED_BY_EMAIL', + 'BAN_TRIGGERED_BY_IP' => 'BAN_TRIGGERED_BY_IP', + 'BAN_TRIGGERED_BY_USER' => 'BAN_TRIGGERED_BY_USER', + ]; + + global $cache, $config, $phpbb_root_path, $phpEx, $phpbb_filesystem, $phpbb_container, $user; + + $language = new phpbb\language\language(new phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $user = new \phpbb\user($language, '\phpbb\datetime'); $phpbb_filesystem = new \phpbb\filesystem\filesystem(); $this->backup_cache = $cache; + + // Event dispatcher + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + // Change the global cache object for this test because // the mock cache object does not hit the database as is needed // for this test. $cache = new \phpbb\cache\service( - new \phpbb\cache\driver\file(), + new \phpbb\cache\driver\dummy(), $config, $this->db, + $phpbb_dispatcher, $phpbb_root_path, $phpEx ); + + $phpbb_container = new phpbb_mock_container_builder(); + $ban_type_email = new \phpbb\ban\type\email($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_user = new \phpbb\ban\type\user($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_ip = new \phpbb\ban\type\ip($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $phpbb_container->set('ban.type.email', $ban_type_email); + $phpbb_container->set('ban.type.user', $ban_type_user); + $phpbb_container->set('ban.type.ip', $ban_type_ip); + $collection = new \phpbb\di\service_collection($phpbb_container); + $collection->add('ban.type.email'); + $collection->add('ban.type.user'); + $collection->add('ban.type.ip'); + $phpbb_log = new \phpbb\log\dummy(); + + $ban_manager = new \phpbb\ban\manager($collection, $cache->get_driver(), $this->db, $language, $phpbb_log, $user, 'phpbb_bans', 'phpbb_users'); + $phpbb_container->set('ban.manager', $ban_manager); + + $phpbb_container->set( + 'auth.provider.db', + new phpbb_mock_auth_provider() + ); + $provider_collection = new \phpbb\auth\provider_collection($phpbb_container, $config); + $provider_collection->add('auth.provider.db'); + $phpbb_container->set( + 'auth.provider_collection', + $provider_collection + ); } - public function tearDown() + protected function tearDown(): void { parent::tearDown(); // Set cache back to what it was before the test changed it @@ -70,15 +122,20 @@ public function tearDown() /** @dataProvider check_banned_data */ public function test_check_is_banned($test_msg, $user_id, $user_ips, $user_email, $return, $should_be_banned) { - try - { - $is_banned = $this->session->check_ban($user_id, $user_ips, $user_email, $return); - } - catch (PHPUnit_Framework_Error_Notice $e) - { - // User error was triggered, user must have been banned + $is_banned = false; + + // Set a custom handler to "catch" the notice + set_error_handler(function ($errno, $errstr) use (&$is_banned) { $is_banned = true; - } + return true; // Stop PHP from handling the error further + }, E_USER_NOTICE); + + $ban = $this->session->check_ban($user_id, $user_ips, $user_email, $return); + + // Restore the default handler immediately after the call + restore_error_handler(); + + $is_banned = !empty($ban) || $is_banned; $this->assertEquals($should_be_banned, $is_banned, $test_msg); } diff --git a/tests/session/check_isvalid_test.php b/tests/session/check_isvalid_test.php index 90554bfe5f7..9629267caa4 100644 --- a/tests/session/check_isvalid_test.php +++ b/tests/session/check_isvalid_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_check_isvalid_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_full.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_full.xml'); } protected function access_with($session_id, $user_id, $user_agent, $ip) diff --git a/tests/session/create_test.php b/tests/session/create_test.php index 105c76eb7fd..2647313bd50 100644 --- a/tests/session/create_test.php +++ b/tests/session/create_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_create_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_full.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_full.xml'); } static function bot($bot_agent, $user_id, $bot_ip) diff --git a/tests/session/extract_hostname_test.php b/tests/session/extract_hostname_test.php index 3a9d498007d..fe2032f547d 100644 --- a/tests/session/extract_hostname_test.php +++ b/tests/session/extract_hostname_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_extract_hostname_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_empty.xml'); } static public function extract_current_hostname_data() diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php index f8aa3d27a54..bfcd1838ef4 100644 --- a/tests/session/extract_page_test.php +++ b/tests/session/extract_page_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_extract_page_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_empty.xml'); } static public function extract_current_page_data() diff --git a/tests/session/fixtures/sessions_banlist.xml b/tests/session/fixtures/sessions_banlist.xml index e720e35f0a7..b6c123e119e 100644 --- a/tests/session/fixtures/sessions_banlist.xml +++ b/tests/session/fixtures/sessions_banlist.xml @@ -26,34 +26,46 @@ 1 - +
      ban_id - ban_userid - ban_ip - ban_email + ban_mode + ban_itemban_startban_end - ban_excludeban_reason - ban_give_reason + ban_reason_display 2 - 4 + ip 127.0.0.1 - bar@example.org 1111 0 - 0 HAHAHA 1 3 - 0 + ip 127.1.1.1 - 1111 0 + HAHAHA + 1 + + + 4 + user + 4 + 1111 + 0 + HAHAHA + 1 + + + 5 + email + bar@example.org + 1111 0 HAHAHA 1 diff --git a/tests/session/fixtures/sessions_empty.xml b/tests/session/fixtures/sessions_empty.xml index 068951dc4cb..4df982ab7f7 100644 --- a/tests/session/fixtures/sessions_empty.xml +++ b/tests/session/fixtures/sessions_empty.xml @@ -30,11 +30,13 @@ session_ip session_browser
      - +
      ban_id - ban_userid - ban_email + ban_mode + ban_item + ban_start + ban_endban_reason - ban_give_reason + ban_reason_display
      diff --git a/tests/session/fixtures/sessions_full.xml b/tests/session/fixtures/sessions_full.xml index 4fb6b9dfd4b..268e19f905d 100644 --- a/tests/session/fixtures/sessions_full.xml +++ b/tests/session/fixtures/sessions_full.xml @@ -23,6 +23,12 @@ + + 13 + bot + + + session_id diff --git a/tests/session/fixtures/sessions_garbage.xml b/tests/session/fixtures/sessions_garbage.xml index 5eace839d07..59a2dc2ebe7 100644 --- a/tests/session/fixtures/sessions_garbage.xml +++ b/tests/session/fixtures/sessions_garbage.xml @@ -5,11 +5,23 @@ username_cleanuser_permissionsuser_sig + user_lastpage + user_lastvisit 4 bar + oldpage_user_bar.php + 1400000000 + + + 5 + foo + + + oldpage_user_foo.php + 1400000000
      @@ -18,12 +30,16 @@ session_ipsession_browsersession_admin + session_page + session_time anon_session00000000000000000000 1 127.0.0.1 anonymous user agent 0 + + 1500000005 bar_session000000000000000000000 @@ -31,6 +47,35 @@ 127.0.0.1 user agent 1 + newpage_user_bar.php + 1500000000 + + + bar_session000000000000000000002 + 4 + 127.0.0.1 + user agent + 1 + oldpage_user_bar.php + 1400000000 + + + foo_session000000000000000000000 + 5 + 127.0.0.1 + user agent + 0 + newpage_user_foo.php + 1500000000 + + + foo_session000000000000000000002 + 5 + 127.0.0.1 + user agent + 0 + oldpage_user_foo.php + 1400000000
      diff --git a/tests/session/fixtures/sessions_key.xml b/tests/session/fixtures/sessions_key.xml index 245f89a604d..0653dfee82a 100644 --- a/tests/session/fixtures/sessions_key.xml +++ b/tests/session/fixtures/sessions_key.xml @@ -29,11 +29,20 @@ username_cleanuser_permissionsuser_sig - + user_type + 4 bar + 0 + + + 1 + anonymous + + + 2
      diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php index 3dc591a328f..e8117f08c57 100644 --- a/tests/session/garbage_collection_test.php +++ b/tests/session/garbage_collection_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_garbage_collection_test extends phpbb_session_test_case { @@ -19,10 +19,10 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_garbage.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_garbage.xml'); } - public function setUp() + protected function setUp(): void { parent::setUp(); $this->session = $this->session_factory->get_session($this->db); @@ -30,40 +30,112 @@ public function setUp() global $phpbb_container; $plugins = new \phpbb\di\service_collection($phpbb_container); - $plugins->add('core.captcha.plugins.nogd'); + $plugins->add('core.captcha.plugins.recaptcha'); $phpbb_container->set( 'captcha.factory', new \phpbb\captcha\factory($phpbb_container, $plugins) ); $phpbb_container->set( - 'core.captcha.plugins.nogd', - new \phpbb\captcha\plugins\nogd() + 'core.captcha.plugins.recaptcha', + new \phpbb\captcha\plugins\recaptcha() + ); + } + + public function test_session_gc() + { + global $config; + $config['session_length'] = 3600; + + $this->check_expired_sessions_recent( + [ + [ + 'session_user_id' => 4, + 'recent_time' => 1500000000, + ], + [ + 'session_user_id' => 5, + 'recent_time' => 1500000000, + ], + ], + 'Before test, should get recent expired sessions only.' + ); + + $this->check_user_session_data( + [ + [ + 'username_clean' => 'bar', + 'user_lastvisit' => 1400000000, + 'user_lastpage' => 'oldpage_user_bar.php', + ], + [ + 'username_clean' => 'foo', + 'user_lastvisit' => 1400000000, + 'user_lastpage' => 'oldpage_user_foo.php', + ], + ], + 'Before test, users session data is not updated yet.' + ); + + // There is an error unless the captcha plugin is set + $config['captcha_plugin'] = 'core.captcha.plugins.recaptcha'; + $this->session->session_gc(); + $this->check_expired_sessions_recent( + [], + 'After garbage collection, all expired sessions should be removed.' + ); + + $this->check_user_session_data( + [ + [ + 'username_clean' => 'bar', + 'user_lastvisit' => '1500000000', + 'user_lastpage' => 'newpage_user_bar.php', + ], + [ + 'username_clean' => 'foo', + 'user_lastvisit' => '1500000000', + 'user_lastpage' => 'newpage_user_foo.php', + ], + ], + 'After garbage collection, users session data should be updated to the recent expired sessions data.' ); } public function test_cleanup_all() { $this->check_sessions_equals( - array( - array( + [ + [ 'session_id' => 'anon_session00000000000000000000', 'session_user_id' => 1, - ), - array( + ], + [ 'session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4, - ), - ), + ], + [ + 'session_id' => 'bar_session000000000000000000002', + 'session_user_id' => 4, + ], + [ + 'session_id' => 'foo_session000000000000000000000', + 'session_user_id' => 5, + ], + [ + 'session_id' => 'foo_session000000000000000000002', + 'session_user_id' => 5, + ], + ], 'Before test, should have some sessions.' ); // Set session length so it clears all global $config; $config['session_length'] = 0; // There is an error unless the captcha plugin is set - $config['captcha_plugin'] = 'core.captcha.plugins.nogd'; + $config['captcha_plugin'] = 'core.captcha.plugins.recaptcha'; $this->session->session_gc(); $this->check_sessions_equals( - array(), + [], 'After setting session time to 0, should remove all.' ); } diff --git a/tests/session/session_key_test.php b/tests/session/session_login_keys_test.php similarity index 78% rename from tests/session/session_key_test.php rename to tests/session/session_login_keys_test.php index 2499ea1d55f..1ba4319f795 100644 --- a/tests/session/session_key_test.php +++ b/tests/session/session_login_keys_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_login_keys_test extends phpbb_session_test_case { @@ -20,7 +20,7 @@ class phpbb_session_login_keys_test extends phpbb_session_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_key.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_key.xml'); } public function test_set_key_manually() @@ -34,6 +34,8 @@ public function test_set_key_manually() $session->cookie_data['k'] = $this->key_id; // Try to access session with the session key + global $request, $symfony_request, $phpbb_filesystem, $phpbb_root_path; + $session->page = $session->extract_current_page($phpbb_root_path); $session->session_create(false, false, false); $this->assertEquals($this->user_id, $session->data['user_id'], 'User should be logged in by the session key'); } @@ -45,6 +47,8 @@ public function test_reset_keys() $session = $this->session_factory->get_session($this->db); // Reset of the keys for this user + $session->cookie_data['k'] = $this->key_id; + $session->data['user_id'] = $this->user_id; $session->reset_login_keys($this->user_id); // Using a user_id and key that was in the database (before reset) @@ -52,6 +56,8 @@ public function test_reset_keys() $session->cookie_data['k'] = $this->key_id; // Try to access session with the session key + global $request, $symfony_request, $phpbb_filesystem, $phpbb_root_path; + $session->page = $session->extract_current_page($phpbb_root_path); $session->session_create(false, false, $this->user_id); $this->assertNotEquals($this->user_id, $session->data['user_id'], 'User is not logged in because the session key is invalid'); diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php index 05858c8a638..a3462039820 100644 --- a/tests/session/testable_facade.php +++ b/tests/session/testable_facade.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/testable_factory.php'; -require_once dirname(__FILE__) . '/../../phpBB/phpbb/session.php'; +require_once __DIR__ . '/testable_factory.php'; +require_once __DIR__ . '/../../phpBB/phpbb/session.php'; /** * This class exists to expose session.php's functions in a more testable way. @@ -94,10 +94,12 @@ function session_create( $this->session_factory->merge_config_data($config_overrides); // Bots $this->session_factory->merge_cache_data(array('_bots' => $bot_overrides)); - global $request; + global $request, $symfony_request, $phpbb_filesystem, $phpbb_root_path; $session = $this->session_factory->get_session($this->db); $session->browser = $user_agent; $session->ip = $ip_address; + $session->page = $session->extract_current_page($phpbb_root_path); + // Uri sid if ($uri_sid) { diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php index 6f8b49122b7..a73a9eaf3dc 100644 --- a/tests/session/testable_factory.php +++ b/tests/session/testable_factory.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../mock/container_builder.php'; -require_once dirname(__FILE__) . '/../mock/auth_provider.php'; +require_once __DIR__ . '/../mock/container_builder.php'; +require_once __DIR__ . '/../mock/auth_provider.php'; /** * This class exists to setup an instance of phpbb's session class for testing. @@ -31,6 +31,7 @@ class phpbb_session_testable_factory protected $config; protected $cache; protected $request; + protected $server_data; /** * Initialises the factory with a set of default config and cache values. @@ -38,7 +39,7 @@ class phpbb_session_testable_factory public function __construct() { // default configuration values - $this->config_data = array( + $this->config_data = [ 'allow_autologin' => false, 'auth_method' => 'db', 'forwarded_for_check' => true, @@ -53,13 +54,14 @@ public function __construct() 'limit_search_load' => 0, 'ip_check' => 3, 'browser_check' => 1, - ); + ]; - $this->cache_data = array( - '_bots' => array(), - ); + $this->cache_data = [ + '_bots' => [], + '_ban_info' => [], + ]; - $this->cookies = array(); + $this->cookies = []; $this->server_data = $_SERVER; } @@ -73,7 +75,8 @@ public function __construct() public function get_session(\phpbb\db\driver\driver_interface $dbal) { // set up all the global variables used by session - global $SID, $_SID, $db, $config, $cache, $request, $phpbb_container, $phpbb_root_path; + global $SID, $_SID, $db, $config, $cache, $request, $phpbb_container, $phpbb_dispatcher; + global $user, $phpbb_root_path, $phpEx; $request = $this->request = new phpbb_mock_request( array(), @@ -88,6 +91,8 @@ public function get_session(\phpbb\db\driver\driver_interface $dbal) $cache = $this->cache = new phpbb_mock_cache($this->get_cache_data()); $SID = $_SID = null; + $language = new phpbb\language\language(new phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + $user = new \phpbb\user($language, '\phpbb\datetime'); $phpbb_container = $this->container = new phpbb_mock_container_builder(); $phpbb_container->set( @@ -103,6 +108,24 @@ public function get_session(\phpbb\db\driver\driver_interface $dbal) $provider_collection ); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + + $ban_type_email = new \phpbb\ban\type\email($db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_user = new \phpbb\ban\type\user($db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_ip = new \phpbb\ban\type\ip($db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $phpbb_container->set('ban.type.email', $ban_type_email); + $phpbb_container->set('ban.type.user', $ban_type_user); + $phpbb_container->set('ban.type.ip', $ban_type_ip); + + $collection = new \phpbb\di\service_collection($phpbb_container); + $collection->add('ban.type.email'); + $collection->add('ban.type.user'); + $collection->add('ban.type.ip'); + $phpbb_log = new \phpbb\log\dummy(); + + $ban_manager = new \phpbb\ban\manager($collection, $cache, $db, $language, $phpbb_log, $user,'phpbb_bans', 'phpbb_users'); + $phpbb_container->set('ban.manager', $ban_manager); + $session = new phpbb_mock_session_testable; return $session; } @@ -120,10 +143,10 @@ public function set_cookies(array $cookies) /** * Check if the cache used for the generated session contains correct data. * - * @param PHPUnit_Framework_Assert $test The test case to call assert methods + * @param PHPUnit\Framework\Assert $test The test case to call assert methods * on */ - public function check(PHPUnit_Framework_Assert $test) + public function check(PHPUnit\Framework\Assert $test) { $this->cache->check($test, $this->get_cache_data()); } diff --git a/tests/session/unset_admin_test.php b/tests/session/unset_admin_test.php index 9633d77be65..55ac526c73c 100644 --- a/tests/session/unset_admin_test.php +++ b/tests/session/unset_admin_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_unset_admin_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_full.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_full.xml'); } function get_test_session() diff --git a/tests/session/validate_referrer_test.php b/tests/session/validate_referrer_test.php index 7690a890184..44cf9ed48fb 100644 --- a/tests/session/validate_referrer_test.php +++ b/tests/session/validate_referrer_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_validate_referrer_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_empty.xml'); } static function referrer_inputs() diff --git a/tests/storage/adapter/local_test.php b/tests/storage/adapter/local_test.php index b478ce4009f..01a78845969 100644 --- a/tests/storage/adapter/local_test.php +++ b/tests/storage/adapter/local_test.php @@ -11,115 +11,62 @@ * */ - class phpbb_storage_adapter_local_test extends phpbb_test_case - { - protected $adapter; +require_once __DIR__ . '/local_test_case.php'; - protected $path; - - public function setUp() +class phpbb_storage_adapter_local_test extends phpbb_local_test_case +{ + protected function setUp(): void { parent::setUp(); - $filesystem = new \phpbb\filesystem\filesystem(); - $phpbb_root_path = getcwd() . DIRECTORY_SEPARATOR; - - $this->adapter = new \phpbb\storage\adapter\local($filesystem, new \FastImageSize\FastImageSize(), new \phpbb\mimetype\guesser(array(new \phpbb\mimetype\extension_guesser)), $phpbb_root_path); $this->adapter->configure(['path' => 'test_path']); - - $this->path = $phpbb_root_path . 'test_path/'; - mkdir($this->path); } - public function data_test_exists() + public function test_delete_file(): void { - yield [$this->path . '../README.md', true]; - yield [$this->path . 'nonexistent_file.php', false]; - yield [$this->path . '../phpBB/phpbb', true]; - yield [$this->path . 'nonexistent/folder', false]; - } + // Given + touch($this->path . 'file.txt'); + $this->assertFileExists($this->path . 'file.txt'); - public function tearDown() - { - $this->adapter = null; - rmdir($this->path); - } + // When + $this->adapter->delete('file.txt'); - public function test_put_contents() - { - $this->adapter->put_contents('file.txt', 'abc'); - $this->assertTrue(file_exists($this->path . 'file.txt')); - $this->assertEquals(file_get_contents($this->path . 'file.txt'), 'abc'); - unlink($this->path . 'file.txt'); + // Then + $this->assertFileDoesNotExist($this->path . 'file.txt'); } - public function test_get_contents() + public function test_read() { + // Given file_put_contents($this->path . 'file.txt', 'abc'); - $this->assertEquals($this->adapter->get_contents('file.txt'), 'abc'); - unlink($this->path . 'file.txt'); - } - /** - * @dataProvider data_test_exists - */ - public function test_exists($path, $expected) - { - $this->assertSame($expected, $this->adapter->exists($path)); - } + // When + $stream = $this->adapter->read('file.txt'); - public function test_delete_file() - { - file_put_contents($this->path . 'file.txt', ''); - $this->assertTrue(file_exists($this->path . 'file.txt')); - $this->adapter->delete('file.txt'); - $this->assertFalse(file_exists($this->path . 'file.txt')); - } + // Then + $this->assertIsResource($stream); + $this->assertEquals('abc', stream_get_contents($stream)); - public function test_delete_folder() - { - mkdir($this->path . 'path/to/dir', 0777, true); - $this->assertTrue(file_exists($this->path . 'path/to/dir')); - $this->adapter->delete('path'); - $this->assertFalse(file_exists($this->path . 'path/to/dir')); - } - - public function test_rename() - { - file_put_contents($this->path . 'file.txt', ''); - $this->adapter->rename('file.txt', 'file2.txt'); - $this->assertFalse(file_exists($this->path . 'file.txt')); - $this->assertTrue(file_exists($this->path . 'file2.txt')); - unlink($this->path . 'file2.txt'); - } - - public function test_copy() - { - file_put_contents($this->path . 'file.txt', 'abc'); - $this->adapter->copy('file.txt', 'file2.txt'); - $this->assertEquals(file_get_contents($this->path . 'file.txt'), 'abc'); - $this->assertEquals(file_get_contents($this->path . 'file.txt'), 'abc'); - unlink($this->path . 'file.txt'); - unlink($this->path . 'file2.txt'); - } - - public function test_read_stream() - { - file_put_contents($this->path . 'file.txt', ''); - $stream = $this->adapter->read_stream('file.txt'); - $this->assertTrue(is_resource($stream)); + // Clean test fclose($stream); unlink($this->path . 'file.txt'); } - public function test_write_stream() + public function test_write() { + // Given file_put_contents($this->path . 'file.txt', 'abc'); $stream = fopen($this->path . 'file.txt', 'rb'); - $this->adapter->write_stream('file2.txt', $stream); + + // When + $this->adapter->write('file2.txt', $stream); fclose($stream); - $this->assertEquals(file_get_contents($this->path . 'file2.txt'), 'abc'); + + // Then + $this->assertFileContains($this->path . 'file2.txt', 'abc'); + + // Clean test unlink($this->path . 'file.txt'); unlink($this->path . 'file2.txt'); } - } +} diff --git a/tests/storage/adapter/local_test_case.php b/tests/storage/adapter/local_test_case.php new file mode 100644 index 00000000000..dff331c694b --- /dev/null +++ b/tests/storage/adapter/local_test_case.php @@ -0,0 +1,61 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use FastImageSize\FastImageSize; +use phpbb\mimetype\extension_guesser; +use phpbb\mimetype\guesser; +use phpbb\storage\adapter\local; + +class phpbb_local_test_case extends phpbb_test_case +{ + protected $adapter; + + protected $path; + + protected $filesystem; + + protected function setUp(): void + { + parent::setUp(); + + $this->filesystem = new \phpbb\filesystem\filesystem(); + $phpbb_root_path = getcwd() . DIRECTORY_SEPARATOR; + + $this->adapter = new local( + $this->filesystem, + $phpbb_root_path + ); + + $this->path = $phpbb_root_path . 'test_path/'; + mkdir($this->path); + } + + protected function tearDown(): void + { + parent::tearDown(); + + $this->adapter = null; + rmdir($this->path); + } + + /** + * Check if a file contains a string + * + * @param string $file + * @param string $content + */ + protected function assertFileContains(string $file, string $content): void + { + $this->assertEquals($content, file_get_contents($file)); + } +} diff --git a/tests/template/asset_test.php b/tests/template/asset_test.php index 3d2fdd89597..87000a0872d 100644 --- a/tests/template/asset_test.php +++ b/tests/template/asset_test.php @@ -15,7 +15,7 @@ class phpbb_template_asset_test extends phpbb_test_case { - public function set_path_data() + public static function set_path_data() { return array( // array(phpbb_root_path, given path, expected path), @@ -35,13 +35,13 @@ public function test_set_path($phpbb_root_path, $path, $expected) { $path_helper = $this->getMockBuilder('\phpbb\path_helper') ->disableOriginalConstructor() - ->setMethods(array()) + ->onlyMethods(['get_phpbb_root_path']) ->getMock(); $path_helper->method('get_phpbb_root_path') ->willReturn($phpbb_root_path); - $asset = new asset('', $path_helper, new phpbb\filesystem\filesystem()); + $asset = new asset('', $path_helper); $asset->set_path($path, true); $this->assertEquals($expected, $asset->get_path()); diff --git a/tests/template/context_test.php b/tests/template/context_test.php new file mode 100644 index 00000000000..0f88b66a45c --- /dev/null +++ b/tests/template/context_test.php @@ -0,0 +1,96 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +class context_test extends phpbb_test_case +{ + protected $context; + protected function setUp(): void + { + $this->context = new \phpbb\template\context(); + + for ($i = 0; $i < 10; $i++) + { + $this->context->assign_block_vars('block' . $i, array( + 'FOO' . $i => 'foo' . $i, + 'BAR' . $i => 'bar' . $i, + )); + + for ($j = 0; $j < 10; $j++) + { + $this->context->assign_block_vars('block' . $i . '.subblock', array( + 'SUBFOO' => 'subfoo' . $j, + 'SUBBAR' => 'subbar' . $j, + )); + + for ($k = 0; $k < 10; $k++) + { + $this->context->assign_block_vars('block' . $i . '.subblock.subsubblock', array( + 'SUBSUBFOO' => 'subsubfoo' . $k, + 'SUBSUBBAR' => 'subsubbar' . $k, + )); + } + } + } + } + + public static function retrieve_block_vars_data() + { + return array( + array('foo', array(), array()), // non-existent top-level block + array('block1.foo', array(), array()), // non-existent sub-level block + array('block1', array(), array( // top-level block, all vars + 'FOO1' => 'foo1', + 'BAR1' => 'bar1', + )), + array('block1', array('FOO1'), array( // top-level block, one var + 'FOO1' => 'foo1', + )), + array('block2.subblock', array(), array( // sub-level block, all vars + 'SUBFOO' => 'subfoo9', + 'SUBBAR' => 'subbar9', + )), + array('block2.subblock', array('SUBBAR'), array( // sub-level block, one var + 'SUBBAR' => 'subbar9', + )), + array('block2.subblock.subsubblock', array(), array( // sub-sub-level block, all vars + 'SUBSUBFOO' => 'subsubfoo9', + 'SUBSUBBAR' => 'subsubbar9', + )), + array('block2.subblock.subsubblock', array('SUBSUBBAR'), array( // sub-sub-level block, one var + 'SUBSUBBAR' => 'subsubbar9', + )), + array('block3.subblock[2]', array(), array( // sub-level, exact index, all vars + 'SUBFOO' => 'subfoo2', + 'SUBBAR' => 'subbar2', + )), + array('block3.subblock[2]', array('SUBBAR'), array( // sub-level, exact index, one var + 'SUBBAR' => 'subbar2', + )), + array('block3.subblock[3].subsubblock[5]', array(), array( // sub-sub-level, exact index, all vars + 'SUBSUBFOO' => 'subsubfoo5', + 'SUBSUBBAR' => 'subsubbar5', + )), + array('block3.subblock[4].subsubblock[6]', array('SUBSUBFOO'), array( // sub-sub-level, exact index, one var + 'SUBSUBFOO' => 'subsubfoo6', + )), + ); + } + + /** + * @dataProvider retrieve_block_vars_data + */ + public function test_retrieve_block_vars($blockname, $vararray, $result) + { + $this->assertEquals($result, $this->context->retrieve_block_vars($blockname, $vararray)); + } +} diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php new file mode 100644 index 00000000000..1d67cc21467 --- /dev/null +++ b/tests/template/extension_test.php @@ -0,0 +1,563 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +require_once __DIR__ . '/template_test_case.php'; + +class phpbb_template_extension_test extends phpbb_template_template_test_case +{ + protected function setup_engine(array $new_config = [], string $template_path = '') + { + global $config, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx; + + $defaults = $this->config_defaults(); + $defaults = array_merge($defaults, [ + 'allow_avatar' => true, + 'allow_avatar_upload' => true, + ]); + $config = new \phpbb\config\config(array_merge($defaults, $new_config)); + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $this->lang = $lang = new \phpbb\language\language($lang_loader); + $this->user = new \phpbb\user($lang, '\phpbb\datetime'); + $this->user->style['style_path'] = 'chameleon'; + $this->user->style['style_parent_id'] = 0; + + global $auth, $request, $symfony_request, $user; + $user = $this->createMock(\phpbb\user::class); + $user->optionset('user_id', 2); + $user->style['style_path'] = ''; + $user->data['user_id'] = 2; + $auth = $this->getMockBuilder('phpbb\auth\auth') + ->disableOriginalConstructor() + ->onlyMethods(['acl_get']) + ->getMock(); + $auth->method('acl_get') + ->willReturn(true); + + $filesystem = $this->createMock('\phpbb\filesystem\filesystem'); + $filesystem->expects($this->any()) + ->method('exists') + ->with($this->stringContains('theme/png/')) + ->will($this->returnValueMap([ + ['phpBB/styles/chameleon/theme/png/phone.png', true], + ['phpBB/styles/chameleon/theme/png/pencil.png', true], + ['phpBB/styles/chameleon/theme/png/user.png', false], + ])); + $request = new phpbb_mock_request; + $symfony_request = new \phpbb\symfony_request( + $request + ); + $phpbb_path_helper = new \phpbb\path_helper( + $symfony_request, + $request, + $phpbb_root_path, + $phpEx + ); + $storage = $this->getMockBuilder('\phpbb\storage\storage') + ->disableOriginalConstructor() + ->getMock(); + + $routing_helper = $this->createMock(\phpbb\routing\helper::class); + $routing_helper->method('route') + ->willReturnCallback(function($route, $params) { + return 'download/avatar/' . $params['file']; + }); + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $phpbb_container = new phpbb_mock_container_builder(); + $files = new phpbb\files\factory($phpbb_container); + $upload_avatar_driver = new phpbb\avatar\driver\upload($config, $phpbb_root_path, $phpEx, $storage, $phpbb_path_helper, $routing_helper, $phpbb_dispatcher, $files, new \bantu\IniGetWrapper\IniGetWrapper()); + $upload_avatar_driver->set_name('avatar.driver.upload'); + $phpbb_container->set('avatar.manager', new \phpbb\avatar\manager($config, $phpbb_dispatcher, [ + $upload_avatar_driver, + ])); + $phpbb_container->set('path_helper', $phpbb_path_helper); + + $class = new ReflectionClass('\phpbb\avatar\manager'); + $enabled_drivers = $class->getProperty('enabled_drivers'); + $enabled_drivers->setValue($class, false); + $avatar_helper = new phpbb\avatar\helper( + $config, + $phpbb_dispatcher, + $lang, + $phpbb_container->get('avatar.manager'), + $phpbb_path_helper, + $user + ); + + $this->template_path = $this->test_path . '/templates'; + + $cache_path = $phpbb_root_path . 'cache/twig'; + $context = new \phpbb\template\context(); + $loader = new \phpbb\template\twig\loader([]); + $log = new \phpbb\log\dummy(); + $assets_bag = new \phpbb\template\assets_bag(); + $twig = new \phpbb\template\twig\environment( + $assets_bag, + $config, + $filesystem, + $phpbb_path_helper, + $cache_path, + null, + $loader, + new \phpbb\event\dispatcher(), + [ + 'cache' => false, + 'debug' => false, + 'auto_reload' => true, + 'autoescape' => false, + ] + ); + $this->template = new phpbb\template\twig\twig( + $phpbb_path_helper, + $config, + $context, + $twig, + $cache_path, + $this->user, + [ + new \phpbb\template\twig\extension($context, $twig, $this->lang), + new \phpbb\template\twig\extension\avatar($avatar_helper), + new \phpbb\template\twig\extension\config($config), + new \phpbb\template\twig\extension\icon($this->user), + new \phpbb\template\twig\extension\username(), + ] + ); + $twig->setLexer(new \phpbb\template\twig\lexer($twig)); + + $this->template->set_custom_style('tests', [ + $this->template_path, + $phpbb_root_path . 'styles/all/imgs', + $phpbb_root_path . 'styles/all/template', + ]); + } + + public static function data_template_extensions() + { + return [ + [ + 'avatar_user.html', + [ + 'row' => [ + 'src' => 'great_avatar.png', + 'width' => 90, + 'height' => 90, + 'lazy' => false, + 'title' => 'foo' + ], + ], + [], + [], + 'foo', + [] + ], + [ + 'avatar_user.html', + [ + 'row' => [ + 'src' => 'great_avatar.png', + 'width' => 90, + 'height' => 90, + 'title' => 'foo', + 'lazy' => true, + ], + ], + [], + [], + 'foo', + [] + ], + [ + 'avatar_group.html', + [ + 'row' => [ + 'src' => 'great_avatar.png', + 'width' => 90, + 'height' => 90, + 'title' => 'foo', + ], + ], + [], + [], + 'foo', + [] + ], + [ + 'avatar_group.html', + [ + 'row' => [ + 'src' => 'great_avatar.png', + 'width' => 90, + 'height' => 90, + 'title' => 'foo', + 'lazy' => true, + ], + ], + [], + [], + 'foo', + [] + ], + [ + 'avatar_group.html', + [ + 'row' => [ + 'avatar' => 'foo@bar.com', + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar_width' => 90, + 'avatar_height' => 90, + ], + 'alt' => 'foo' + ], + [], + [], + '', + [] + ], + [ + 'extension_username_test.html', + [ + 'mode' => 'profile', + 'user_id' => 2, + 'username' => 'admin', + 'user_colour' => 'abcdef', + 'guest_username' => 'lol', + ], + [], + [], + 'phpBB/memberlist.php?mode=viewprofile&u=2', + [] + ], + [ + 'extension_username_test.html', + [ + 'mode' => 'profile', + 'user_id' => 2, + 'username' => 'admin', + 'user_colour' => 'abcdef', + 'guest_username' => 'lol', + 'custom_profile_url' => 'http://lol.bar', + ], + [], + [], + 'http://lol.bar&u=2', + [] + ], + [ + 'extension_username_test.html', + [ + 'mode' => 'full', + 'user_id' => 2, + 'username' => 'admin', + 'user_colour' => 'abcdef', + 'guest_username' => 'lol', + ], + [], + [], + 'admin', + [] + ], + [ + 'extension_username_test.html', + [ + 'mode' => 'no_profile', + 'user_id' => 2, + 'username' => 'admin', + 'user_colour' => 'abcdef', + 'guest_username' => 'lol', + ], + [], + [], + 'admin', + [] + ], + [ + 'extension_config_test.html', + [ + 'config_name' => 'allow_avatar', + ], + [], + [], + '1', + [] + ], + [ + 'extension_config_test.html', + [ + 'config_name' => 'does not exist', + ], + [], + [], + '', + [] + ], + ]; + } + + /** + * @dataProvider data_template_extensions + */ + public function test_template_extensions($file, $vars, $block_vars, $destroy_array, $expected, $lang_vars = []) + { + $this->run_template($file, $vars, $block_vars, $destroy_array, $expected, $lang_vars); + } + + public static function data_template_icon_extension() + { + return [ + /** Font: default */ + [ + [ + 'type' => 'font', + 'icon' => 'phone', + 'title' => 'ICON_PHONE', + 'hidden' => false, + 'classes' => '', + 'attributes' => [], + ], + [ + 'ICON_PHONE' => 'Phone icon', + ], + 'Phone icon', + + ], + /** Font: all options */ + [ + [ + 'type' => 'font', + 'icon' => 'pencil', + 'title' => 'ICON_PENCIL', + 'hidden' => true, + 'classes' => 'a-class another-class', + 'attributes' => [ + 'data-attr-1' => 'true', + 'data-attr-2' => 'two', + ], + ], + [ + 'ICON_PENCIL' => 'Pencil icon', + ], + ' + Pencil icon' + ], + /** Font: icons array */ + [ + [ + 'type' => 'font', + 'icon' => [ + 'bullhorn' => false, + 'thumbtack' => false, + 'lock' => true, + 'fire' => false, + 'file' => true, + ], + 'title' => 'ICON_TOPIC', + 'hidden' => false, + 'classes' => '', + 'attributes' => [], + ], + [ + 'ICON_TOPIC' => 'Topic icon', + ], + ' + Topic icon', + ], + /** Font: icons array with no key for the default */ + [ + [ + 'type' => 'font', + 'icon' => [ + 'bullhorn' => false, + 'thumbtack' => false, + 'lock' => false, + 'fire' => false, + 'file', + ], + 'title' => 'ICON_TOPIC', + 'hidden' => false, + 'classes' => '', + 'attributes' => [], + ], + [ + 'ICON_TOPIC' => 'Topic icon', + ], + ' + Topic icon', + ], + /** PNG: default */ + [ + [ + 'type' => 'png', + 'icon' => 'phone', + 'title' => 'ICON_PHONE', + 'hidden' => false, + 'classes' => '', + 'attributes' => [], + ], + [ + 'ICON_PHONE' => 'Phone icon', + ], + 'Phone icon', + ], + /** PNG: all options */ + [ + [ + 'type' => 'png', + 'icon' => 'pencil', + 'title' => 'ICON_PENCIL', + 'hidden' => true, + 'classes' => 'my-class', + 'attributes' => [ + 'data-url' => 'my-test-url/test-page.php?u=2', + ], + ], + [ + 'ICON_PENCIL' => 'Pencil icon', + ], + 'Pencil icon', + ], + /** PNG: Not found */ + [ + [ + 'type' => 'png', + 'icon' => 'user', + 'title' => 'ICON_USER', + 'hidden' => false, + 'classes' => 'my-class', + 'attributes' => [], + ], + [ + 'ICON_USER' => 'User icon', + ], + ' + User icon + + + + + + ', + ], + /** SVG: default */ + [ + [ + 'type' => 'svg', + 'icon' => 'phone', + 'title' => 'ICON_PHONE', + 'hidden' => false, + 'classes' => '', + 'attributes' => [], + ], + [ + 'ICON_PHONE' => 'Phone icon', + ], + ' + Phone icon + + + ', + ], + /** SVG: all options */ + [ + [ + 'type' => 'svg', + 'icon' => 'pencil', + 'title' => 'ICON_PENCIL', + 'hidden' => true, + 'classes' => 'my-svg-class', + 'attributes' => [ + 'data-ajax' => 'my_ajax_callback', + ], + ], + [ + 'ICON_PENCIL' => 'Pencil icon', + ], + '', + ], + /** SVG: Not found */ + [ + [ + 'type' => 'svg', + 'icon' => 'not-existent', + 'title' => 'Just a title', + 'hidden' => false, + 'classes' => '', + 'attributes' => [], + ], + [], + ' + Just a title + + + + + + ', + ], + /** SVG: Sanitization */ + [ + [ + 'type' => 'svg', + 'icon' => 'dirty', + 'title' => '', + 'hidden' => false, + 'classes' => '', + 'attributes' => [], + ], + [], + ' + + ', + ], + ]; + } + + /** + * @dataProvider data_template_icon_extension + */ + public function test_template_icon_extension($vars, $lang_vars, $expected) + { + $file = 'extension_icon_test.html'; + + $this->template->set_filenames(['test' => $file]); + $this->template->assign_vars($vars); + + foreach ($lang_vars as $name => $value) + { + self::$language_reflection_lang->setValue($this->lang, array_merge( + self::$language_reflection_lang->getValue($this->lang), + [$name => $value] + )); + } + + $expected = str_replace(["\n", "\r", "\t"], '', $expected); + $output = str_replace(["\n", "\r", "\t"], '', $this->display('test')); + + /** + * SVGs need their random identifier replaced (normalized). + * The 'user' is a PNG, but not existent, so it returns a 404 SVG. + */ + if ($vars['type'] === 'svg' || $vars['icon'] === 'user') + { + if (preg_match('##', $output, $unique_id)) + { + $expected = str_replace('{unique_id}', $unique_id[1], $expected); + } + } + + $this->assertEquals($expected, $output, "Testing {$file}"); + } +} diff --git a/tests/template/includephp_test.php b/tests/template/includephp_test.php deleted file mode 100644 index baf2eed11b5..00000000000 --- a/tests/template/includephp_test.php +++ /dev/null @@ -1,62 +0,0 @@ -<?php -/** -* -* This file is part of the phpBB Forum Software package. -* -* @copyright (c) phpBB Limited <https://www.phpbb.com> -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -use phpbb\filesystem\helper as filesystem_helper; - -require_once dirname(__FILE__) . '/template_test_case.php'; - -class phpbb_template_includephp_test extends phpbb_template_template_test_case -{ - public function test_includephp_relative() - { - $this->setup_engine(array('tpl_allow_php' => true)); - - $this->run_template('includephp_relative.html', array(), array(), array(), "Path is relative to board root.\ntesting included php"); - - $this->template->set_filenames(array('test' => 'includephp_relative.html')); - $this->assertEquals("Path is relative to board root.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP"); - } - - public function test_includephp_variables() - { - $this->setup_engine(array('tpl_allow_php' => true)); - - $this->run_template('includephp_variables.html', array('TEMPLATES' => 'templates'), array(), array(), "Path includes variables.\ntesting included php"); - - $this->template->set_filenames(array('test' => 'includephp_variables.html')); - $this->assertEquals("Path includes variables.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP"); - } - - public function test_includephp_absolute() - { - global $phpbb_root_path; - - $path_to_php = str_replace('\\', '/', dirname(__FILE__)) . '/templates/_dummy_include.php.inc'; - $this->assertTrue(filesystem_helper::is_absolute_path($path_to_php)); - $template_text = "Path is absolute.\n<!-- INCLUDEPHP $path_to_php -->"; - - $cache_dir = $phpbb_root_path . 'cache/'; - $fp = fopen($cache_dir . 'includephp_absolute.html', 'w'); - fputs($fp, $template_text); - fclose($fp); - - $this->setup_engine(array('tpl_allow_php' => true)); - - $this->template->set_custom_style('tests', $cache_dir); - - $this->run_template('includephp_absolute.html', array(), array(), array(), "Path is absolute.\ntesting included php"); - - $this->template->set_filenames(array('test' => 'includephp_absolute.html')); - $this->assertEquals("Path is absolute.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP"); - } -} diff --git a/tests/template/subdir/includephp_from_subdir_test.php b/tests/template/subdir/includephp_from_subdir_test.php deleted file mode 100644 index 08ffb0f7dce..00000000000 --- a/tests/template/subdir/includephp_from_subdir_test.php +++ /dev/null @@ -1,31 +0,0 @@ -<?php -/** -* -* This file is part of the phpBB Forum Software package. -* -* @copyright (c) phpBB Limited <https://www.phpbb.com> -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -require_once dirname(__FILE__) . '/../template_test_case.php'; - -class phpbb_template_subdir_includephp_from_subdir_test extends phpbb_template_template_test_case -{ - // Exact copy of test_includephp_relatve from ../includephp_test.php. - // Verifies that relative php inclusion works when including script - // (and thus current working directory) is in a subdirectory of - // board root. - public function test_includephp_relative() - { - $this->setup_engine(array('tpl_allow_php' => true)); - - $this->run_template('includephp_relative.html', array(), array(), array(), "Path is relative to board root.\ntesting included php"); - - $this->template->set_filenames(array('test' => 'includephp_relative.html')); - $this->assertEquals("Path is relative to board root.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP"); - } -} diff --git a/tests/template/template_allfolder_test.php b/tests/template/template_allfolder_test.php index 17a57fba353..6b76e97ae4c 100644 --- a/tests/template/template_allfolder_test.php +++ b/tests/template/template_allfolder_test.php @@ -11,10 +11,13 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_allfolder_test extends phpbb_template_template_test_case { + protected $extension_manager; + protected $ext_template_path; + public function test_allfolder() { $this->setup_engine_for_allfolder(); @@ -45,7 +48,7 @@ protected function setup_engine_for_allfolder(array $new_config = array()) ); $this->extension_manager = new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'vendor4/bar' => array( 'ext_name' => 'vendor4/bar', @@ -55,18 +58,20 @@ protected function setup_engine_for_allfolder(array $new_config = array()) ) ); - $container = new phpbb_mock_container_builder(); $cache_path = $phpbb_root_path . 'cache/twig'; $context = new \phpbb\template\context(); $loader = new \phpbb\template\twig\loader(''); + $log = new \phpbb\log\dummy(); + $assets_bag = new \phpbb\template\assets_bag(); $twig = new \phpbb\template\twig\environment( + $assets_bag, $config, $filesystem, $path_helper, $cache_path, $this->extension_manager, $loader, - new \phpbb\event\dispatcher($container), + new \phpbb\event\dispatcher(), array( 'cache' => false, 'debug' => false, @@ -74,7 +79,7 @@ protected function setup_engine_for_allfolder(array $new_config = array()) 'autoescape' => false, ) ); - $this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user)), $this->extension_manager); + $this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)), $this->extension_manager); $twig->setLexer(new \phpbb\template\twig\lexer($twig)); $this->template_path = $this->test_path . '/templates'; diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php index 024bdc57ce4..701c7f99ee6 100644 --- a/tests/template/template_events_test.php +++ b/tests/template/template_events_test.php @@ -11,11 +11,13 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_template_events_test extends phpbb_template_template_test_case { - public function template_data() + protected $extension_manager; + + public static function template_data() { return array( /* @@ -134,9 +136,9 @@ protected function setup_engine_for_events($dataset, $style_names, array $new_co $defaults = $this->config_defaults(); $config = new \phpbb\config\config(array_merge($defaults, $new_config)); - $this->template_path = dirname(__FILE__) . "/datasets/$dataset/styles/silver/template"; + $this->template_path = __DIR__ . "/datasets/$dataset/styles/silver/template"; $this->extension_manager = new phpbb_mock_filesystem_extension_manager( - dirname(__FILE__) . "/datasets/$dataset/" + __DIR__ . "/datasets/$dataset/" ); $filesystem = new \phpbb\filesystem\filesystem(); @@ -149,18 +151,20 @@ protected function setup_engine_for_events($dataset, $style_names, array $new_co $phpEx ); - $container = new phpbb_mock_container_builder(); $cache_path = $phpbb_root_path . 'cache/twig'; $context = new \phpbb\template\context(); $loader = new \phpbb\template\twig\loader(''); + $log = new \phpbb\log\dummy(); + $assets_bag = new \phpbb\template\assets_bag(); $twig = new \phpbb\template\twig\environment( + $assets_bag, $config, $filesystem, $path_helper, $cache_path, $this->extension_manager, $loader, - new \phpbb\event\dispatcher($container), + new \phpbb\event\dispatcher(), array( 'cache' => false, 'debug' => false, @@ -168,7 +172,7 @@ protected function setup_engine_for_events($dataset, $style_names, array $new_co 'autoescape' => false, ) ); - $this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user)), $this->extension_manager); + $this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)), $this->extension_manager); $twig->setLexer(new \phpbb\template\twig\lexer($twig)); $this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path)); diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php index f195742dc68..209d8c5c385 100644 --- a/tests/template/template_includecss_test.php +++ b/tests/template/template_includecss_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case_with_tree.php'; +require_once __DIR__ . '/template_test_case_with_tree.php'; class phpbb_template_template_includecss_test extends phpbb_template_template_test_case_with_tree { @@ -21,7 +21,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te /** @var string */ protected $parent_template_path; - protected function setup_engine(array $new_config = array()) + protected function setup_engine(array $new_config = array(), string $template_path = '') { global $phpbb_root_path, $phpEx, $user; @@ -41,18 +41,20 @@ protected function setup_engine(array $new_config = array()) $this->template_path = $this->test_path . '/templates'; $this->parent_template_path = $this->test_path . '/parent_templates'; - $container = new phpbb_mock_container_builder(); $cache_path = $phpbb_root_path . 'cache/twig'; $context = new \phpbb\template\context(); $loader = new \phpbb\template\twig\loader(''); + $log = new \phpbb\log\dummy(); + $assets_bag = new \phpbb\template\assets_bag(); $twig = new \phpbb\template\twig\environment( + $assets_bag, $config, $filesystem, $this->phpbb_path_helper, $cache_path, null, $loader, - new \phpbb\event\dispatcher($container), + new \phpbb\event\dispatcher(), array( 'cache' => false, 'debug' => false, @@ -67,9 +69,9 @@ protected function setup_engine(array $new_config = array()) $twig, $cache_path, $this->user, - array(new \phpbb\template\twig\extension($context, $this->user)), + array(new \phpbb\template\twig\extension($context, $twig, $this->user)), new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'include/css' => array( 'ext_name' => 'include/css', @@ -83,7 +85,7 @@ protected function setup_engine(array $new_config = array()) $this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path)); } - public function template_data() + public static function template_data() { return array( /* @@ -94,19 +96,19 @@ public function template_data() */ array( array('TEST' => 1), - '<link href="tests/template/templates/child_only.css?assets_version=1" rel="stylesheet" media="screen" />', + '<link href="tests/template/templates/child_only.css?assets_version=1" rel="stylesheet" media="screen">', ), array( array('TEST' => 2), - '<link href="tests/template/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" media="screen" />', + '<link href="tests/template/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" media="screen">', ), array( array('TEST' => 3), - '<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" media="screen" />', + '<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" media="screen">', ), array( array('TEST' => 4), - '<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" media="screen" />', + '<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" media="screen">', ), ); } @@ -124,4 +126,18 @@ public function test_includecss_compilation($vars, $expected) // Run test $this->run_template('includecss.html', array(), array(), array(), $expected); } + + /** + * @dataProvider template_data + */ + public function test_include_css_compilation($vars, $expected) + { + // Reset the engine state + $this->setup_engine(array('assets_version' => 1)); + + $this->template->assign_vars($vars); + + // Run test + $this->run_template('includecss_twig.html', array(), array(), array(), $expected); + } } diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php index 19c016ae5ef..63458187129 100644 --- a/tests/template/template_includejs_test.php +++ b/tests/template/template_includejs_test.php @@ -11,14 +11,12 @@ * */ -require_once dirname(__FILE__) . '/template_test_case_with_tree.php'; +require_once __DIR__ . '/template_test_case_with_tree.php'; class phpbb_template_template_includejs_test extends phpbb_template_template_test_case_with_tree { - public function template_data() + public static function template_data() { - $this->setup_engine(); - return array( /* array( @@ -106,4 +104,18 @@ public function test_includejs_compilation($vars, $expected) // Run test $this->run_template('includejs.html', array_merge(array('PARENT' => 'parent_only.js', 'SUBDIR' => 'subdir', 'EXT' => 'js'), $vars), array(), array(), $expected); } + + /** + * @dataProvider template_data + */ + public function test_include_js_compilation($vars, $expected) + { + // Reset the engine state + $this->setup_engine(array('assets_version' => 1)); + + $this->template->assign_vars($vars); + + // Run test + $this->run_template('includejs_twig.html', array_merge(array('PARENT' => 'parent_only.js', 'SUBDIR' => 'subdir', 'EXT' => 'js'), $vars), array(), array(), $expected); + } } diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php index 4d918b3167a..5a536a72e67 100644 --- a/tests/template/template_inheritance_test.php +++ b/tests/template/template_inheritance_test.php @@ -11,14 +11,14 @@ * */ -require_once dirname(__FILE__) . '/template_test_case_with_tree.php'; +require_once __DIR__ . '/template_test_case_with_tree.php'; class phpbb_template_template_inheritance_test extends phpbb_template_template_test_case_with_tree { /** * @todo put test data into templates/xyz.test */ - public function template_data() + public static function template_data() { return array( // First element of the array is test name - keep them distinct diff --git a/tests/template/template_parser_test.php b/tests/template/template_parser_test.php index 938b1bc8b8e..fe0fc97bf87 100644 --- a/tests/template/template_parser_test.php +++ b/tests/template/template_parser_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_template_parser_test extends phpbb_template_template_test_case { diff --git a/tests/template/template_test.php b/tests/template/template_test.php index 0f761abc765..bb4fa6ad6ae 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -11,14 +11,14 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_template_test extends phpbb_template_template_test_case { /** * @todo put test data into templates/xyz.test */ - public function template_data() + public static function template_data() { return array( /* @@ -256,13 +256,6 @@ public function template_data() . str_repeat("pass\n", 3) . "\n" . str_repeat("pass\n", 2) . "\n"), ), - array( - 'php.html', - array(), - array(), - array(), - '', - ), array( 'include.html', array('VARIABLE' => 'value'), @@ -364,9 +357,24 @@ public function template_data() array(), array(), array(), - "Value'\n1 O'Clock\nValue\\x27\n1\\x20O\\x27Clock", + "Value'\n1 O'Clock\nValue\\u0027\n1\\u0020O\\u0027Clock", array('VARIABLE' => "Value'", '1_VARIABLE' => "1 O'Clock"), ), + array( + 'lang_twig.html', + array(), + array(), + array(), + "VARIABLE\n1_VARIABLE\nVARIABLE\n1_VARIABLE\nVARIABLE\n1_VARIABLE\nARY_VARIABLE", + ), + array( + 'lang_twig.html', + array(), + array(), + array(), + "Value'\n1 O'Clock\nValue\\u0027\n1\\u0020O\\u0027Clock\nValue'\n1 O'Clock\nfoo|bar", + array('VARIABLE' => "Value'", '1_VARIABLE' => "1 O'Clock", 'ARY_VARIABLE' => ['foo', 'bar']), + ), array( 'loop_nested_multilevel_ref.html', array(), @@ -493,7 +501,8 @@ public function template_data() array( 'loop_expressions.html', array(), - array('loop' => array(array(),array(),array(),array(),array(),array()),), + // Do not use 'loop' as a block name to not override Twig's internal 'loop' object + array('loop1' => array(array(),array(),array(),array(),array(),array()),), array(), 'yesnononoyesnoyesnonoyesnono', ), @@ -519,9 +528,9 @@ public function test_missing_file() $filename = 'file_not_found.html'; $this->template->set_filenames(array('test' => $filename)); - $this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist'); + $this->assertFileDoesNotExist($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist'); - $this->setExpectedException('Twig_Error_Loader'); + $this->expectException(\Twig\Error\LoaderError::class); $this->display('test'); } @@ -529,7 +538,7 @@ public function test_missing_file() public function test_invalid_handle() { - $this->setExpectedException('Twig_Error_Loader'); + $this->expectException(\Twig\Error\LoaderError::class); $this->display('test'); } @@ -628,25 +637,7 @@ public function test_retrieve_data() $this->assertEquals(array('POSITION' => 'O3M2', 'ONE' => true, 'TWO' => 'two', 'THREE' => 3), $this->template->retrieve_block_vars('outer[2].middle[1]', array()), 'Retrieve all vars from a block in the template'); } - public function test_php() - { - global $phpbb_root_path; - - $template_text = '<!-- PHP -->echo "test";<!-- ENDPHP -->'; - - $cache_dir = $phpbb_root_path . 'cache/'; - $fp = fopen($cache_dir . 'php.html', 'w'); - fputs($fp, $template_text); - fclose($fp); - - $this->setup_engine(array('tpl_allow_php' => true)); - - $this->template->set_custom_style('tests', $cache_dir); - - $this->run_template('php.html', array(), array(), array(), 'test'); - } - - public function alter_block_array_data() + public static function alter_block_array_data() { return array( array( @@ -1039,7 +1030,7 @@ public function test_indexed_assign_block_vars() $this->assertEquals($expect, str_replace(array("\n", "\r", "\t"), '', $this->display('test')), 'Inserting another inner block in the same place'); } - public function assign_block_vars_array_data() + public static function assign_block_vars_array_data() { return array( array( @@ -1073,11 +1064,9 @@ public function test_assign_block_vars_array($block_data) $this->assertEquals("outer - 0 - Test assigning block vars array loop 0:outer - 1 - Test assigning block vars array loop 1:middle - 0 - 1st iterationmiddle - 1 - 2nd iterationmiddle - 2 - 3rd iteration", $this->display('test'), 'Ensuring assigning block vars array to template is working correctly'); } - /** - * @expectedException Twig_Error_Syntax - */ public function test_define_error() { + $this->expectException(\Twig\Error\SyntaxError::class); $this->run_template('define_error.html', array(), array(), array(), ''); } } diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index bcb6f4cde74..68a3a5985d7 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -1,4 +1,7 @@ <?php + +use phpbb\template\twig\twig; + /** * * This file is part of the phpBB Forum Software package. @@ -14,6 +17,7 @@ class phpbb_template_template_test_case extends phpbb_test_case { protected $lang; + /** @var twig */ protected $template; protected $template_path; protected $user; @@ -23,15 +27,14 @@ class phpbb_template_template_test_case extends phpbb_test_case // Keep the contents of the cache for debugging? const PRESERVE_CACHE = true; - static protected $language_reflection_lang; + protected static $language_reflection_lang; - static public function setUpBeforeClass() + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); $reflection = new ReflectionClass('\phpbb\language\language'); self::$language_reflection_lang = $reflection->getProperty('lang'); - self::$language_reflection_lang->setAccessible(true); } protected function display($handle) @@ -64,12 +67,11 @@ protected function config_defaults() { $defaults = array( 'load_tplcompile' => true, - 'tpl_allow_php' => false, ); return $defaults; } - protected function setup_engine(array $new_config = array()) + protected function setup_engine(array $new_config = array(), string $template_path = '') { global $phpbb_root_path, $phpEx; @@ -91,20 +93,22 @@ protected function setup_engine(array $new_config = array()) $phpEx ); - $this->template_path = $this->test_path . '/templates'; + $this->template_path = $template_path ?: $this->test_path . '/templates'; - $container = new phpbb_mock_container_builder(); $cache_path = $phpbb_root_path . 'cache/twig'; $context = new \phpbb\template\context(); $loader = new \phpbb\template\twig\loader(''); + $log = new \phpbb\log\dummy(); + $assets_bag = new \phpbb\template\assets_bag(); $twig = new \phpbb\template\twig\environment( + $assets_bag, $config, $filesystem, $path_helper, $cache_path, null, $loader, - new \phpbb\event\dispatcher($container), + new \phpbb\event\dispatcher(), array( 'cache' => false, 'debug' => false, @@ -112,31 +116,21 @@ protected function setup_engine(array $new_config = array()) 'autoescape' => false, ) ); - $this->template = new phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user))); + $this->template = new phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $lang))); $twig->setLexer(new \phpbb\template\twig\lexer($twig)); $this->template->set_custom_style('tests', $this->template_path); } - protected function setUp() + protected function setUp(): void { // Test the engine can be used $this->setup_engine(); - $this->template->clear_cache(); - global $phpbb_filesystem; $phpbb_filesystem = new \phpbb\filesystem\filesystem(); } - protected function tearDown() - { - if ($this->template) - { - $this->template->clear_cache(); - } - } - protected function run_template($file, array $vars, array $block_vars, array $destroy, $expected, $lang_vars = array()) { $this->template->set_filenames(array('test' => $file)); diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php index aa71bf6ed6d..8f200a40251 100644 --- a/tests/template/template_test_case_with_tree.php +++ b/tests/template/template_test_case_with_tree.php @@ -11,11 +11,17 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_template_test_case_with_tree extends phpbb_template_template_test_case { - protected function setup_engine(array $new_config = array()) + /** @var \phpbb\path_helper */ + protected $phpbb_path_helper; + + /** @var string */ + protected $parent_template_path; + + protected function setup_engine(array $new_config = [], string $template_path = '') { global $phpbb_root_path, $phpEx, $user; @@ -36,18 +42,20 @@ protected function setup_engine(array $new_config = array()) $this->template_path = $this->test_path . '/templates'; $this->parent_template_path = $this->test_path . '/parent_templates'; - $container = new phpbb_mock_container_builder(); $cache_path = $phpbb_root_path . 'cache/twig'; $context = new \phpbb\template\context(); $loader = new \phpbb\template\twig\loader(''); + $log = new \phpbb\log\dummy(); + $assets_bag = new \phpbb\template\assets_bag(); $twig = new \phpbb\template\twig\environment( + $assets_bag, $config, $filesystem, $this->phpbb_path_helper, $cache_path, null, $loader, - new \phpbb\event\dispatcher($container), + new \phpbb\event\dispatcher(), array( 'cache' => false, 'debug' => false, @@ -55,7 +63,7 @@ protected function setup_engine(array $new_config = array()) 'autoescape' => false, ) ); - $this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user))); + $this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user))); $twig->setLexer(new \phpbb\template\twig\lexer($twig)); $this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path)); } diff --git a/tests/template/templates/avatar_group.html b/tests/template/templates/avatar_group.html new file mode 100644 index 00000000000..d7f114fb948 --- /dev/null +++ b/tests/template/templates/avatar_group.html @@ -0,0 +1 @@ +{{ avatar(row) }} diff --git a/tests/template/templates/avatar_user.html b/tests/template/templates/avatar_user.html new file mode 100644 index 00000000000..d7f114fb948 --- /dev/null +++ b/tests/template/templates/avatar_user.html @@ -0,0 +1 @@ +{{ avatar(row) }} diff --git a/tests/template/templates/expressions.html b/tests/template/templates/expressions.html index e1283f165fd..17a5b8d265b 100644 --- a/tests/template/templates/expressions.html +++ b/tests/template/templates/expressions.html @@ -3,7 +3,7 @@ <!-- IF not 390 is even -->fail<!-- ELSE -->pass<!-- ENDIF --> <!-- IF 9 is odd -->pass<!-- ELSE -->fail<!-- ENDIF --> <!-- IF 32 is odd -->fail<!-- ELSE -->pass<!-- ENDIF --> -<!-- IF 32 is div by 16 -->pass<!-- ELSE -->fail<!-- ENDIF --> +<!-- IF 32 is divisible by(16) -->pass<!-- ELSE -->fail<!-- ENDIF --> <!-- IF 10 is not even -->fail<!-- ELSE -->pass<!-- ENDIF --> <!-- IF 24 == 24 -->pass<!-- ELSE -->fail<!-- ENDIF --> <!-- IF 24 eq 24 -->pass<!-- ELSE -->fail<!-- ENDIF --> diff --git a/tests/template/templates/extension_config_test.html b/tests/template/templates/extension_config_test.html new file mode 100644 index 00000000000..0f12ab26722 --- /dev/null +++ b/tests/template/templates/extension_config_test.html @@ -0,0 +1 @@ +{{ config(config_name) }} diff --git a/tests/template/templates/extension_icon_test.html b/tests/template/templates/extension_icon_test.html new file mode 100644 index 00000000000..8ed3bee92dc --- /dev/null +++ b/tests/template/templates/extension_icon_test.html @@ -0,0 +1 @@ +{{ Icon(type, icon, lang(title), hidden, classes, attributes) }} diff --git a/tests/template/templates/extension_username_test.html b/tests/template/templates/extension_username_test.html new file mode 100644 index 00000000000..a78bf0df62c --- /dev/null +++ b/tests/template/templates/extension_username_test.html @@ -0,0 +1 @@ +{{ username(mode, user_id, username, user_colour, guest_username, custom_profile_url) }} diff --git a/tests/template/templates/includecss_twig.html b/tests/template/templates/includecss_twig.html new file mode 100644 index 00000000000..935633d573f --- /dev/null +++ b/tests/template/templates/includecss_twig.html @@ -0,0 +1,10 @@ +{% if TEST === 1 %} + {% INCLUDECSS('child_only.css') %} +{% elseif TEST === 2 %} + {% INCLUDECSS('parent_only.css') %} +{% elseif TEST === 3 %} + {% INCLUDECSS('@include_css/test.css') %} +{% elseif TEST === 4 %} + {% INCLUDECSS('@include_css/child_only.css') %} +{% endif %} +{$STYLESHEETS} diff --git a/tests/template/templates/includejs_twig.html b/tests/template/templates/includejs_twig.html new file mode 100644 index 00000000000..dcf29bf0d16 --- /dev/null +++ b/tests/template/templates/includejs_twig.html @@ -0,0 +1,36 @@ +{% if TEST === 1 %} + {% INCLUDEJS('parent_and_child.js') %} +{% elseif TEST === 2 %} + {% INCLUDEJS('parent_and_child.js?assets_version=0') %} +{% elseif TEST === 3 %} + {% INCLUDEJS('parent_and_child.js?test=1&assets_version=0') %} +{% elseif TEST === 4 %} + {% INCLUDEJS('parent_and_child.js?test=1&assets_version=0') %} +{% elseif TEST === 6 %} + {% INCLUDEJS(PARENT) %} +{% elseif TEST === 7 %} + {% set test_var = 'child_only.js' %} + {% INCLUDEJS(test_var) %} +{% elseif TEST === 8 %} + {% INCLUDEJS('subdir/' ~ PARENT) %} +{% elseif TEST === 9 %} + {% INCLUDEJS(SUBDIR ~ '/subsubdir/' ~ PARENT) %} +{% elseif TEST === 10 %} + {% INCLUDEJS(SUBDIR ~ '/parent_only.' ~ EXT) %} +{% elseif TEST === 11 %} + {% set test_var = 'child_only.js?test1=1&test2=2#test3' %} + {% INCLUDEJS(test_var) %} +{% elseif TEST === 12 %} + {% INCLUDEJS('parent_only.js?test1=1&test2=2#test3') %} +{% elseif TEST === 14 %} + {% INCLUDEJS('parent_only.js?test1="#test3') %} +{% elseif TEST === 15 %} + {% INCLUDEJS('http://phpbb.com/b.js?c=d#f') %} +{% elseif TEST === 16 %} + {% INCLUDEJS('http://phpbb.com/b.js?c=d&assets_version=2#f') %} +{% elseif TEST === 17 %} + {% INCLUDEJS('//phpbb.com/b.js') %} +{% elseif TEST === 18 %} + {% INCLUDEJS('parent_and_child.js?test=1&test2=0') %} +{% endif %} +{$SCRIPTS} diff --git a/tests/template/templates/includephp_relative.html b/tests/template/templates/includephp_relative.html deleted file mode 100644 index 297c9efcb0c..00000000000 --- a/tests/template/templates/includephp_relative.html +++ /dev/null @@ -1,2 +0,0 @@ -Path is relative to board root. -<!-- INCLUDEPHP ../tests/template/templates/_dummy_include.php.inc --> diff --git a/tests/template/templates/includephp_variables.html b/tests/template/templates/includephp_variables.html deleted file mode 100644 index 6106efc86a3..00000000000 --- a/tests/template/templates/includephp_variables.html +++ /dev/null @@ -1,2 +0,0 @@ -Path includes variables. -<!-- INCLUDEPHP ../tests/template/{TEMPLATES}/_dummy_include.php.inc --> diff --git a/tests/template/templates/lang_twig.html b/tests/template/templates/lang_twig.html new file mode 100644 index 00000000000..a331c7f5063 --- /dev/null +++ b/tests/template/templates/lang_twig.html @@ -0,0 +1,9 @@ +{{ lang('VARIABLE') }} +{{ lang('1_VARIABLE') }} + +{{ lang_js('VARIABLE') }} +{{ lang_js('1_VARIABLE') }} + +{{ lang_raw('VARIABLE') }} +{{ lang_raw('1_VARIABLE') }} +{{ lang_raw('ARY_VARIABLE')|join('|') }} diff --git a/tests/template/templates/loop_expressions.html b/tests/template/templates/loop_expressions.html index ddb9fd52fa8..e983c0cc429 100644 --- a/tests/template/templates/loop_expressions.html +++ b/tests/template/templates/loop_expressions.html @@ -1,11 +1,11 @@ -<!-- BEGIN loop --> +<!-- BEGIN loop1 --> -<!-- IF loop.S_ROW_NUM is divisible by(4) -->yes<!-- ELSE -->no<!-- ENDIF --> +<!-- IF loop1.S_ROW_NUM is divisible by(4) -->yes<!-- ELSE -->no<!-- ENDIF --> -<!-- END loop --> +<!-- END loop1 --> -<!-- BEGIN loop --> +<!-- BEGIN loop1 --> -<!-- IF loop.S_ROW_NUM is divisible by(3) -->yes<!-- ELSE -->no<!-- ENDIF --> +<!-- IF loop1.S_ROW_NUM is divisible by(3) -->yes<!-- ELSE -->no<!-- ENDIF --> -<!-- END loop --> +<!-- END loop1 --> diff --git a/tests/template/templates/php.html b/tests/template/templates/php.html deleted file mode 100644 index 07a260cdb3b..00000000000 --- a/tests/template/templates/php.html +++ /dev/null @@ -1 +0,0 @@ -<!-- PHP -->echo "test";<!-- ENDPHP --> diff --git a/tests/template/templates/svg/dirty.svg b/tests/template/templates/svg/dirty.svg new file mode 100644 index 00000000000..29c1500ffe6 --- /dev/null +++ b/tests/template/templates/svg/dirty.svg @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg viewBox="0 0 728 242" xmlns="http://www.w3.org/2000/svg" class="c-hero-logo t-hero-logo" aria-labelledby="site_title"> + <title id="site_title">phpBB + + diff --git a/tests/template/templates/svg/pencil.svg b/tests/template/templates/svg/pencil.svg new file mode 100644 index 00000000000..c9c021d8111 --- /dev/null +++ b/tests/template/templates/svg/pencil.svg @@ -0,0 +1 @@ +My fake title! diff --git a/tests/template/templates/svg/phone.svg b/tests/template/templates/svg/phone.svg new file mode 100644 index 00000000000..5fbfe196baf --- /dev/null +++ b/tests/template/templates/svg/phone.svg @@ -0,0 +1 @@ + diff --git a/tests/template/twig_test.php b/tests/template/twig_test.php new file mode 100644 index 00000000000..23a14b4b4f6 --- /dev/null +++ b/tests/template/twig_test.php @@ -0,0 +1,148 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\tests\template; + +use phpbb\filesystem\helper as filesystem_helper; +use phpbb\template\twig\twig; + +class twig_test extends \phpbb_test_case +{ + /** @var twig */ + public $twig; + /** + * @var string + */ + private $template_path; + /** + * @var twig + */ + private $template; + /** + * @var \phpbb\user + */ + private $user; + /** + * @var \phpbb\language\language + */ + private $lang; + + protected function setUp(): void + { + global $phpbb_root_path, $phpEx; + + $config = new \phpbb\config\config([]); + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $this->lang = $lang = new \phpbb\language\language($lang_loader); + $user = new \phpbb\user($lang, '\phpbb\datetime'); + $this->user = $user; + + $filesystem = new \phpbb\filesystem\filesystem(); + + $path_helper = new \phpbb\path_helper( + new \phpbb\symfony_request( + new \phpbb_mock_request() + ), + $this->createMock('\phpbb\request\request'), + $phpbb_root_path, + $phpEx + ); + + $this->template_path = 'tests/template/templates'; + + $cache_path = $phpbb_root_path . 'cache/twig'; + $context = new \phpbb\template\context(); + $loader = new \phpbb\template\twig\loader(''); + $log = new \phpbb\log\dummy(); + $assets_bag = new \phpbb\template\assets_bag(); + $twig = new \phpbb\template\twig\environment( + $assets_bag, + $config, + $filesystem, + $path_helper, + $cache_path, + null, + $loader, + new \phpbb\event\dispatcher(), + [ + 'cache' => false, + 'debug' => false, + 'auto_reload' => true, + 'autoescape' => false, + ] + ); + $this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user))); + $twig->setLexer(new \phpbb\template\twig\lexer($twig)); + } + + public function test_get_user_style_invalid_user() + { + // Add closure to override user method + $set_user_closure = function ($user) { + $this->user = $user; + }; + + $run_set_user_closure = $set_user_closure->bindTo($this->template, get_class($this->template)); + $run_set_user_closure(null); + + $this->expectException('\phpbb\template\exception\user_object_not_available'); + $this->template->get_user_style(); + $run_set_user_closure($this->user); + } + + public static function data_get_user_style(): array + { + return [ + [['style_path' => 'prosilver', 'style_parent_id' => 0], ['prosilver']], + [['style_path' => 'prosilver_se', 'style_parent_id' => 5, 'style_parent_tree' => 'prosilver'], ['prosilver_se', 'prosilver']], + ]; + } + + /** + * @dataProvider data_get_user_style + */ + public function test_get_user_style($user_style, $expected) + { + $this->user->style = $user_style; + $this->assertEquals($expected, $this->template->get_user_style()); + } + + public function test_set_style() + { + global $phpbb_root_path; + + // User style is left empty on purpose to see template as valid directory + $tests_template_relative_path = '../tests/template'; + $test_template_absolute_path = filesystem_helper::realpath($phpbb_root_path . trim($tests_template_relative_path, '/')); + + // Get loader instance + $template_reflection = new \ReflectionObject($this->template); + $loader_reflection = $template_reflection->getProperty('loader'); + /** @var \phpbb\template\twig\loader $loader */ + $loader = $loader_reflection->getValue($this->template); + + // set_style() not called yet + $this->assertEmpty($loader->getSafeDirectories()); + + // set_style() to add default elements + $this->user->style = ['style_path' => '', 'style_parent_id' => 0]; + $this->template->set_style(); + $safe_directories = $loader->getSafeDirectories(); + $this->assertFalse(in_array($test_template_absolute_path, $safe_directories)); + $this->assertFalse(empty($safe_directories)); + + // set_style() with tests template folder + $this->template->set_style([$tests_template_relative_path]); + $this->assertTrue(in_array($test_template_absolute_path, $loader->getSafeDirectories())); + } +} diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index abfdf399409..0df91f9e83b 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -11,9 +11,12 @@ * */ -abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_TestCase +use PHPUnit\DbUnit\TestCase; +use Symfony\Component\Yaml\Yaml; + +abstract class phpbb_database_test_case extends TestCase { - static private $already_connected; + private static $already_connected; private $db_connections; @@ -21,44 +24,32 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test protected $fixture_xml_data; - static protected $schema_file; + protected static $schema_file; - static protected $phpbb_schema_copy; + protected static $phpbb_schema_copy; - static protected $install_schema_file; + protected static $install_schema_file; - public function __construct($name = NULL, array $data = array(), $dataName = '') - { - parent::__construct($name, $data, $dataName); - $this->backupStaticAttributesBlacklist += array( - 'PHP_CodeCoverage' => array('instance'), - 'PHP_CodeCoverage_Filter' => array('instance'), - 'PHP_CodeCoverage_Util' => array('ignoredLines', 'templateMethods'), - 'PHP_Timer' => array('startTimes',), - 'PHP_Token_Stream' => array('customTokens'), - 'PHP_Token_Stream_CachingFactory' => array('cache'), - - 'phpbb_database_test_case' => array('already_connected'), - ); - - $this->db_connections = array(); - } + /** + * @var \Doctrine\DBAL\Connection[] + */ + private $db_connections_doctrine; /** * @return array List of extensions that should be set up */ - static protected function setup_extensions() + protected static function setup_extensions() { return array(); } - static public function setUpBeforeClass() + public static function setUpBeforeClass(): void { global $phpbb_root_path, $phpEx; $setup_extensions = static::setup_extensions(); - $finder = new \phpbb\finder($phpbb_root_path, null, $phpEx); + $finder = new \phpbb\finder\finder(null, false, $phpbb_root_path, $phpEx); $finder->core_path('phpbb/db/migration/data/'); if (!empty($setup_extensions)) { @@ -73,14 +64,23 @@ static public function setUpBeforeClass() if (!file_exists(self::$schema_file)) { - global $table_prefix; $db = new \phpbb\db\driver\sqlite3(); + // Some local setups may not configure a DB driver. If the configured + // 'dbms' is null, skip this test instead of failing with a TypeError in + // the connection factory which expects a non-null driver name. + $mock_config = new phpbb_mock_config_php_file(); + if ($mock_config->get('dbms') === null) + { + self::markTestSkipped('Skipping schema generator tests: dbms is not configured (null) in local environment.'); + } + $doctrine = \phpbb\db\doctrine\connection_factory::get_connection($mock_config); $factory = new \phpbb\db\tools\factory(); - $db_tools = $factory->get($db, true); + $db_tools = $factory->get($doctrine, true); + $db_tools->set_table_prefix($table_prefix); - $schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix); + $schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix, self::get_core_tables()); file_put_contents(self::$schema_file, json_encode($schema_generator->get_schema())); } @@ -89,7 +89,7 @@ static public function setUpBeforeClass() parent::setUpBeforeClass(); } - static public function tearDownAfterClass() + public static function tearDownAfterClass(): void { if (file_exists(self::$install_schema_file)) { @@ -99,7 +99,7 @@ static public function tearDownAfterClass() parent::tearDownAfterClass(); } - protected function tearDown() + protected function tearDown(): void { parent::tearDown(); @@ -111,12 +111,34 @@ protected function tearDown() $db->sql_close(); } } + + if (!empty($this->db_connections_doctrine)) + { + foreach ($this->db_connections_doctrine as $db) + { + $db->close(); + } + } } - protected function setUp() + protected function setUp(): void { parent::setUp(); + $this->setBackupStaticPropertiesExcludeList([ + 'SebastianBergmann\CodeCoverage\CodeCoverage' => ['instance'], + 'SebastianBergmann\CodeCoverage\Filter' => ['instance'], + 'SebastianBergmann\CodeCoverage\Util' => ['ignoredLines', 'templateMethods'], + 'SebastianBergmann\Timer\Timer' => ['startTimes'], + 'PHP_Token_Stream' => ['customTokens'], + 'PHP_Token_Stream_CachingFactory' => ['cache'], + + 'phpbb_database_test_case' => ['already_connected'], + ]); + + $this->db_connections = []; + $this->db_connections_doctrine = []; + // Resynchronise tables if a fixture was loaded if (isset($this->fixture_xml_data)) { @@ -146,7 +168,7 @@ protected function database_synchronisation($table_column_map) * Create xml data set for insertion into database * * @param string $path Path to fixture XML - * @return PHPUnit_Extensions_Database_DataSet_DefaultDataSet|PHPUnit_Extensions_Database_DataSet_XmlDataSet + * @return PHPUnit\DbUnit\DataSet\DefaultDataSet|PHPUnit\DbUnit\DataSet\XmlDataSet */ public function createXMLDataSet($path) { @@ -155,11 +177,11 @@ public function createXMLDataSet($path) // Extend XML data set on MSSQL if (strpos($this->get_database_config()['dbms'], 'mssql') !== false) { - $newXmlData = new PHPUnit_Extensions_Database_DataSet_DefaultDataSet(); + $newXmlData = new PHPUnit\DbUnit\DataSet\DefaultDataSet([]); $db = $this->new_dbal(); foreach ($this->fixture_xml_data as $key => $value) { - /** @var \PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData $tableMetaData */ + /** @var PHPUnit\DbUnit\DataSet\DefaultTableMetaData $tableMetaData */ $tableMetaData = $value->getTableMetaData(); $columns = $tableMetaData->getColumns(); $primaryKeys = $tableMetaData->getPrimaryKeys(); @@ -201,8 +223,8 @@ public function createXMLDataSet($path) $columns[] = 'mssqlindex'; } - $newMetaData = new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData($key, $columns, $primaryKeys); - $newTable = new PHPUnit_Extensions_Database_DataSet_DefaultTable($newMetaData); + $newMetaData = new PHPUnit\DbUnit\DataSet\DefaultTableMetaData($key, $columns, $primaryKeys); + $newTable = new PHPUnit\DbUnit\DataSet\DefaultTable($newMetaData); for ($i = 0; $i < $value->getRowCount(); $i++) { $dataRow = $value->getRow($i); @@ -262,17 +284,18 @@ public function getConnection() if (!self::$already_connected) { - $manager->load_schema($this->new_dbal()); + $manager->load_schema($this->new_dbal(), $this->new_doctrine_dbal()); self::$already_connected = true; } return $this->createDefaultDBConnection($manager->get_pdo(), 'testdb'); } - public function new_dbal() + public function new_dbal() : \phpbb\db\driver\driver_interface { $config = $this->get_database_config(); + /** @var \phpbb\db\driver\driver_interface $db */ $db = new $config['dbms'](); $db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']); @@ -281,6 +304,16 @@ public function new_dbal() return $db; } + public function new_doctrine_dbal(): \Doctrine\DBAL\Connection + { + $config = $this->get_database_config(); + + $db = \phpbb\db\doctrine\connection_factory::get_connection_from_params($config['dbms'], $config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']); + $this->db_connections_doctrine[] = $db; + + return $db; + } + public function assertSqlResultEquals($expected, $sql, $message = '') { $db = $this->new_dbal(); @@ -302,11 +335,45 @@ protected function create_connection_manager($config) return new phpbb_database_test_connection_manager($config); } + /** array_diff() does not corretly compare multidimensionsl arrays + * This solution used for that https://www.codeproject.com/Questions/780780/PHP-Finding-differences-in-two-multidimensional-ar + */ + function array_diff_assoc_recursive($array1, $array2) + { + $difference = array(); + foreach ($array1 as $key => $value) + { + if (is_array($value)) + { + if (!isset($array2[$key])) + { + $difference[$key] = $value; + } + else if (!is_array($array2[$key])) + { + $difference[$key] = $value; + } + else + { + $new_diff = $this->array_diff_assoc_recursive($value, $array2[$key]); + if (!empty($new_diff)) + { + $difference[$key] = $new_diff; + } + } + } + else if (!isset($array2[$key]) || $array2[$key] != $value) + { + $difference[$key] = $value; + } + } + return $difference; + } + public function assert_array_content_equals($one, $two) { - // http://stackoverflow.com/questions/3838288/phpunit-assert-two-arrays-are-equal-but-order-of-elements-not-important - // but one array_diff is not enough! - if (count(array_diff($one, $two)) || count(array_diff($two, $one))) + // one-way comparison is not enough! + if (count($this->array_diff_assoc_recursive($one, $two)) || count($this->array_diff_assoc_recursive($two, $one))) { // get a nice error message $this->assertEquals($one, $two); @@ -317,4 +384,23 @@ public function assert_array_content_equals($one, $two) $this->assertTrue(true); } } + + public static function get_core_tables() : array + { + global $phpbb_root_path, $table_prefix; + + static $core_tables = []; + + if (empty($core_tables)) + { + $tables_yml_data = Yaml::parseFile($phpbb_root_path . '/config/default/container/tables.yml', Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE); + + foreach ($tables_yml_data['parameters'] as $parameter => $table) + { + $core_tables[str_replace('tables.', '', $parameter)] = str_replace('%core.table_prefix%', $table_prefix, $table); + } + } + + return $core_tables; + } } diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php index f7ba3ba21b9..8759a1f8c04 100644 --- a/tests/test_framework/phpbb_database_test_connection_manager.php +++ b/tests/test_framework/phpbb_database_test_connection_manager.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/phpbb_database_connection_odbc_pdo_wrapper.php'; +require_once __DIR__ . '/phpbb_database_connection_odbc_pdo_wrapper.php'; class phpbb_database_test_connection_manager { @@ -150,7 +150,6 @@ public function connect($use_db = true) switch ($this->config['dbms']) { - case 'phpbb\db\driver\mysql': case 'phpbb\db\driver\mysqli': $this->pdo->exec('SET NAMES utf8'); @@ -174,12 +173,12 @@ public function connect($use_db = true) /** * Load the phpBB database schema into the database */ - public function load_schema($db) + public function load_schema($db, \Doctrine\DBAL\Connection $doctrine_dbal) { $this->ensure_connected(__METHOD__); - $directory = dirname(__FILE__) . '/../../phpBB/install/schemas/'; - $this->load_schema_from_file($directory, $db); + $directory = __DIR__ . '/../../phpBB/install/schemas/'; + $this->load_schema_from_file($directory, $db, $doctrine_dbal); } /** @@ -270,7 +269,6 @@ public function get_tables() switch ($this->config['dbms']) { - case 'phpbb\db\driver\mysql': case 'phpbb\db\driver\mysqli': $sql = 'SHOW TABLES'; break; @@ -327,8 +325,10 @@ protected function ensure_connected($method_name) * Compile the correct schema filename (as per create_schema_files) and * load it into the database. */ - protected function load_schema_from_file($directory, \phpbb\db\driver\driver_interface $db) + protected function load_schema_from_file($directory, \phpbb\db\driver\driver_interface $db, \Doctrine\DBAL\Connection $doctrine) { + global $table_prefix; + $schema = $this->dbms['SCHEMA']; if ($this->config['dbms'] == 'phpbb\db\driver\mysql') @@ -336,14 +336,7 @@ protected function load_schema_from_file($directory, \phpbb\db\driver\driver_int $sth = $this->pdo->query('SELECT VERSION() AS version'); $row = $sth->fetch(PDO::FETCH_ASSOC); - if (version_compare($row['version'], '4.1.3', '>=')) - { - $schema .= '_41'; - } - else - { - $schema .= '_40'; - } + $schema .= '_41'; } $filename = $directory . $schema . '_schema.sql'; @@ -372,44 +365,32 @@ protected function load_schema_from_file($directory, \phpbb\db\driver\driver_int } else { - global $phpbb_root_path, $phpEx, $table_prefix; + global $phpbb_root_path, $phpEx; - $finder = new \phpbb\finder($phpbb_root_path, null, $phpEx); + $finder = new \phpbb\finder\finder(null, false, $phpbb_root_path, $phpEx); $classes = $finder->core_path('phpbb/db/migration/data/') ->get_classes(); $db = new \phpbb\db\driver\sqlite3(); + $doctrine = \phpbb\db\doctrine\connection_factory::get_connection(new phpbb_mock_config_php_file()); $factory = new \phpbb\db\tools\factory(); - $db_tools = $factory->get($db, true); + $db_tools = $factory->get($doctrine, true); + $db_tools->set_table_prefix($table_prefix); + $tables = phpbb_database_test_case::get_core_tables(); - $schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix); + $schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix, $tables); $db_table_schema = $schema_generator->get_schema(); } $factory = new \phpbb\db\tools\factory(); - $db_tools = $factory->get($db, true); + $db_tools = $factory->get($doctrine); + $db_tools->set_table_prefix($table_prefix); foreach ($db_table_schema as $table_name => $table_data) { - $queries = $db_tools->sql_create_table( + $db_tools->sql_create_table( $table_name, $table_data ); - - foreach ($queries as $query) - { - if ($query === 'begin') - { - $this->pdo->beginTransaction(); - } - else if ($query === 'commit') - { - $this->pdo->commit(); - } - else - { - $this->pdo->exec($query); - } - } } } @@ -424,11 +405,6 @@ protected function get_dbms_data($dbms) 'DELIM' => ';', 'PDO' => 'mysql', ), - 'phpbb\db\driver\mysql' => array( - 'SCHEMA' => 'mysql', - 'DELIM' => ';', - 'PDO' => 'mysql', - ), 'phpbb\db\driver\mssql' => array( 'SCHEMA' => 'mssql', 'DELIM' => 'GO', @@ -548,7 +524,7 @@ public function database_synchronisation($table_column_map) $queries = array(); // Get escaped versions of the table names to synchronise - $table_names = array_map(array($this->pdo, 'PDO::quote'), array_keys($table_column_map)); + $table_names = array_map([$this->pdo, 'quote'], array_keys($table_column_map)); switch ($this->config['dbms']) { diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index f068ab8c199..6ed579ad2c0 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -11,43 +11,69 @@ * */ use Symfony\Component\BrowserKit\CookieJar; +use Symfony\Component\BrowserKit\HttpBrowser; +use Symfony\Component\HttpClient\HttpClient; +use Symfony\Component\HttpClient\NativeHttpClient; +use Symfony\Contracts\HttpClient\HttpClientInterface; require_once __DIR__ . '/mock/phpbb_mock_null_installer_task.php'; class phpbb_functional_test_case extends phpbb_test_case { - /** @var \Goutte\Client */ - static protected $client; - static protected $cookieJar; - static protected $root_url; - static protected $install_success = false; + /** @var HttpClientInterface */ + protected static $http_client; + + /** @var HttpBrowser */ + protected static $client; + protected static $cookieJar; + protected static $root_url; + protected static $install_success = false; protected $cache = null; - protected $db = null; + protected $db_doctrine = null; protected $extension_manager = null; /** * Session ID for current test's session (each test makes its own) * @var string */ - protected $sid; + protected static $session_id; /** * Language array used by phpBB * @var array */ - protected $lang = array(); + protected static $lang_ary = []; + + protected static $config = array(); + protected static $already_installed = false; + protected static $db_connection = null; + + public function __get($property) + { + if ($property === 'sid') + { + return self::$session_id ??= null; + } + + if ($property === 'db') + { + return self::$db_connection ??= null; + } + + if ($property === 'lang') + { + return self::$lang_ary; + } - static protected $config = array(); - static protected $already_installed = false; - static protected $last_post_timestamp = 0; + return null; + } - static public function setUpBeforeClass() + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); self::$config = phpbb_test_case_helpers::get_test_config(); - self::$root_url = self::$config['phpbb_functional_url']; // Important: this is used both for installation and by // test cases for querying the tables. @@ -60,25 +86,41 @@ static public function setUpBeforeClass() self::markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.'); } + self::$root_url = self::$config['phpbb_functional_url']; + if (!self::$already_installed) { self::install_board(); self::$already_installed = true; } + + global $cache; + $cache = new phpbb_mock_null_cache; + self::get_db(); + + // Special flag for testing without possibility to run into lock scenario. + // Unset entry and add it back if lock behavior for posting should be tested. + // Unset ci_tests_no_lock_posting from config + $sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) VALUES ('ci_tests_no_lock_posting', '1')"; + self::$db_connection->sql_query($sql); } /** * @return array List of extensions that should be set up */ - static protected function setup_extensions() + protected static function setup_extensions() { return array(); } - public function setUp() + protected function setUp(): void { parent::setUp(); + $this->setBackupStaticPropertiesExcludeList([ + 'phpbb_functional_test_case' => ['config', 'already_installed'], + ]); + if (!self::$install_success) { $this->fail('Installing phpBB has failed.'); @@ -87,41 +129,54 @@ public function setUp() $this->bootstrap(); self::$cookieJar = new CookieJar; - self::$client = new Goutte\Client(array(), null, self::$cookieJar); + // Optimize HTTP client for Windows platform + if (strtolower(substr(PHP_OS, 0, 3)) === 'win') { + self::$http_client = new NativeHttpClient([ + 'timeout' => 30, + 'max_duration' => 60, + ]); + } else { + self::$http_client = HttpClient::create([ + 'timeout' => 60, + ]); + } + self::$client = new HttpBrowser(self::$http_client, null, self::$cookieJar); + + // Disable SSL verification for local development with self-signed certificates + if (isset(self::$config['path_to_ssl_cert'])) + { + $guzzle_client = new \GuzzleHttp\Client(['verify' => self::$config['path_to_ssl_cert']]); + self::$client->setClient($guzzle_client); + } // Clear the language array so that things // that were added in other tests are gone - $this->lang = array(); - $this->add_lang('common'); - - $db = $this->get_db(); + self::$lang_ary = []; + self::add_lang('common'); foreach (static::setup_extensions() as $extension) { - $this->purge_cache(); - - $sql = 'SELECT ext_active - FROM ' . EXT_TABLE . " - WHERE ext_name = '" . $db->sql_escape($extension). "'"; - $result = $db->sql_query($sql); - $status = (bool) $db->sql_fetchfield('ext_active'); - $db->sql_freeresult($result); - - if (!$status) - { - $this->install_ext($extension); - } + self::install_ext($extension); } } - protected function tearDown() + public static function tearDownAfterClass(): void { - parent::tearDown(); + parent::tearDownAfterClass(); + + global $cache; + $cache = new phpbb_mock_null_cache; - if ($this->db instanceof \phpbb\db\driver\driver_interface) + if (self::$db_connection instanceof \phpbb\db\driver\driver_interface) { + // Unset ci_tests_no_lock_posting from config + $sql = 'DELETE FROM ' . CONFIG_TABLE . " + WHERE config_name = 'ci_tests_no_lock_posting'"; + self::$db_connection->sql_query($sql); + // Close the database connections again this test - $this->db->sql_close(); + self::$db_connection->sql_close(); + self::$db_connection = null; } } @@ -134,7 +189,7 @@ protected function tearDown() * @param bool $assert_response_html Should we perform standard assertions for a normal html page * @return Symfony\Component\DomCrawler\Crawler */ - static public function request($method, $path, $form_data = array(), $assert_response_html = true) + public static function request($method, $path, $form_data = array(), $assert_response_html = true) { $crawler = self::$client->request($method, self::$root_url . $path, $form_data); @@ -154,8 +209,18 @@ static public function request($method, $path, $form_data = array(), $assert_res * @param bool $assert_response_html Should we perform standard assertions for a normal html page * @return Symfony\Component\DomCrawler\Crawler */ - static public function submit(Symfony\Component\DomCrawler\Form $form, array $values = array(), $assert_response_html = true) + public static function submit(Symfony\Component\DomCrawler\Form $form, array $values = array(), $assert_response_html = true) { + // Remove files from form if no file was submitted + // See: https://github.com/symfony/symfony/issues/49014 + foreach ($form->getFiles() as $field_name => $value) + { + if (!$value['name'] && !$value['tmp_name']) + { + $form->remove($field_name); + } + } + $crawler = self::$client->submit($form, $values); if ($assert_response_html) @@ -171,7 +236,7 @@ static public function submit(Symfony\Component\DomCrawler\Form $form, array $va * * @return string HTML page */ - static public function get_content() + public static function get_content() { return (string) self::$client->getResponse()->getContent(); } @@ -183,26 +248,31 @@ protected function bootstrap() { } - public function __construct($name = NULL, array $data = array(), $dataName = '') + /** + * @return \phpbb\db\driver\driver_interface + */ + protected static function get_db() { - parent::__construct($name, $data, $dataName); + global $phpbb_root_path, $phpEx; + // so we don't reopen an open connection + if (!(self::$db_connection instanceof \phpbb\db\driver\driver_interface)) + { + $dbms = self::$config['dbms']; + self::$db_connection = new $dbms(); + self::$db_connection->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport'], true); + } - $this->backupStaticAttributesBlacklist += array( - 'phpbb_functional_test_case' => array('config', 'already_installed'), - ); + return self::$db_connection; } - protected function get_db() + protected function get_db_doctrine() { - global $phpbb_root_path, $phpEx; // so we don't reopen an open connection - if (!($this->db instanceof \phpbb\db\driver\driver_interface)) + if (!($this->db_doctrine instanceof \Doctrine\DBAL\Connection)) { - $dbms = self::$config['dbms']; - $this->db = new $dbms(); - $this->db->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport']); + $this->db_doctrine = \phpbb\db\doctrine\connection_factory::get_connection_from_params(self::$config['dbms'], self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport']); } - return $this->db; + return $this->db_doctrine; } protected function get_cache_driver() @@ -234,41 +304,169 @@ protected function get_extension_manager() { global $phpbb_root_path, $phpEx; - $config = new \phpbb\config\config(array()); - $db = $this->get_db(); + $config = new \phpbb\config\config(array('version' => PHPBB_VERSION)); + $this->get_db(); + $db_doctrine = $this->get_db_doctrine(); $factory = new \phpbb\db\tools\factory(); - $db_tools = $factory->get($db); + $finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $phpEx); + $db_tools = $factory->get($db_doctrine); + $db_tools->set_table_prefix(self::$config['table_prefix']); $container = new phpbb_mock_container_builder(); $migrator = new \phpbb\db\migrator( $container, $config, - $db, + $this->db, $db_tools, self::$config['table_prefix'] . 'migrations', $phpbb_root_path, $phpEx, self::$config['table_prefix'], + phpbb_database_test_case::get_core_tables(), array(), new \phpbb\db\migration\helper() ); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $container->set('migrator', $migrator); - $container->set('dispatcher', new phpbb_mock_event_dispatcher()); + $container->set('event_dispatcher', $phpbb_dispatcher); + $cache = $this->getMockBuilder('\phpbb\cache\service') + ->setConstructorArgs([$this->get_cache_driver(), $config, $this->db, $phpbb_dispatcher, $phpbb_root_path, $phpEx]) + ->onlyMethods(['deferred_purge']) + ->getMock(); + $cache->method('deferred_purge') + ->willReturnCallback([$cache, 'purge']); $extension_manager = new \phpbb\extension\manager( $container, - $db, + $this->db, $config, + $finder_factory, self::$config['table_prefix'] . 'ext', - dirname(__FILE__) . '/', - $phpEx, - new \phpbb\cache\service($this->get_cache_driver(), $config, $this->db, $phpbb_root_path, $phpEx) + __DIR__ . '/', + $cache ); return $extension_manager; } - static protected function install_board() + protected static function get_messenger_method_email($container) + { + global $phpbb_root_path, $phpEx; + + $config = new \phpbb\config\config( + [ + 'version' => PHPBB_VERSION, + 'email_enable' => false, + 'email_package_size' => 0, + 'smtp_delivery' => 0, + 'default_lang' => 'en', + ] + ); + + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $lang = new \phpbb\language\language($lang_loader); + $user = new \phpbb\user($lang, '\phpbb\datetime'); + $container->set('user', $user); + $container->set('language', $lang); + + $assets_bag = new \phpbb\template\assets_bag(); + $container->set('assets.bag', $assets_bag); + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $container->set('dispatcher', $phpbb_dispatcher); + + $core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'; + $container->setParameter('core.cache_dir', $core_cache_dir); + + $core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx; + $container->setParameter('core.messenger_queue_file', $core_messenger_queue_file); + + $messenger_method_collection = new \phpbb\di\service_collection($container); + $messenger_method_collection->add('messenger.method.email'); + $container->set('messenger.method_collection', $messenger_method_collection); + + $messenger_queue = new \phpbb\messenger\queue($config, $phpbb_dispatcher, $messenger_method_collection, $core_messenger_queue_file); + $container->set('messenger.queue', $messenger_queue); + + $request = new phpbb_mock_request; + $container->set('request', $request); + + $symfony_request = new \phpbb\symfony_request( + $request + ); + + $phpbb_path_helper = new \phpbb\path_helper( + $symfony_request, + $request, + $phpbb_root_path, + $phpEx + ); + $container->set('path_helper', $phpbb_path_helper); + + $dbms = self::$config['dbms']; + $db = new $dbms(); + $db->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport']); + + $extension_manager = new phpbb_mock_extension_manager($phpbb_root_path, [], $container); + $container->set('ext.manager', $extension_manager); + + $context = new \phpbb\template\context(); + $cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; + $container->setParameter('core.template.cache_path', $cache_path); + $filesystem = new \phpbb\filesystem\filesystem(); + $container->set('filesystem', $filesystem); + + $twig = new \phpbb\template\twig\environment( + $assets_bag, + $config, + $filesystem, + $phpbb_path_helper, + $cache_path, + null, + new \phpbb\template\twig\loader(''), + $phpbb_dispatcher, + [ + 'cache' => false, + 'debug' => false, + 'auto_reload' => true, + 'autoescape' => false, + ] + ); + $twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang); + $container->set('template.twig.extensions.phpbb', $twig_extension); + + $twig_extensions_collection = new \phpbb\di\service_collection($container); + $twig_extensions_collection->add('template.twig.extensions.phpbb'); + $container->set('template.twig.extensions.collection', $twig_extensions_collection); + + $twig->addExtension($twig_extension); + $twig_lexer = new \phpbb\template\twig\lexer($twig); + $container->set('template.twig.lexer', $twig_lexer); + + $auth = new \phpbb\auth\auth(); + $log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $container->set('log', $log); + + $email_method = new \phpbb\messenger\method\email( + $assets_bag, + $config, + $phpbb_dispatcher, + $lang, + $messenger_queue, + $phpbb_path_helper, + $request, + $twig_extensions_collection, + $twig_lexer, + $user, + $phpbb_root_path, + $cache_path, + $extension_manager, + $log + ); + $container->set('messenger.method.email', $email_method); + } + + protected static function install_board() { global $phpbb_root_path, $phpEx; @@ -318,6 +516,7 @@ static protected function install_board() $container->set('installer.install_finish.notify_user', new phpbb_mock_null_installer_task()); $container->register('installer.install_finish.install_extensions')->setSynthetic(true); $container->set('installer.install_finish.install_extensions', new phpbb_mock_null_installer_task()); + self::get_messenger_method_email($container); $container->compile(); $language = $container->get('language'); @@ -362,13 +561,12 @@ static protected function install_board() $iohandler->set_input('email_enable', true); $iohandler->set_input('smtp_delivery', '1'); - $iohandler->set_input('smtp_host', 'nxdomain.phpbb.com'); - $iohandler->set_input('smtp_auth', 'PLAIN'); + $iohandler->set_input('smtp_host', ''); $iohandler->set_input('smtp_user', 'nxuser'); $iohandler->set_input('smtp_pass', 'nxpass'); $iohandler->set_input('submit_email', 'submit'); - $iohandler->set_input('cookie_secure', '0'); + $iohandler->set_input('cookie_secure', (strpos(self::$root_url, 'https://') === 0) ? '1' : '0'); $iohandler->set_input('server_protocol', '0'); $iohandler->set_input('force_server_vars', $parseURL['scheme'] . '://'); $iohandler->set_input('server_name', $parseURL['host']); @@ -376,7 +574,15 @@ static protected function install_board() $iohandler->set_input('script_path', $parseURL['path']); $iohandler->set_input('submit_server', 'submit'); - $installer->run(); + try + { + $installer->run(); + } + catch (\Throwable $e) + { + // Do nothing but catch the exception as PHPUnit here throws + // "PHPUnit\Event\Code\NoTestCaseObjectOnCallStackException: Cannot find TestCase object on call stack" + } copy($config_file, $config_file_test); @@ -394,7 +600,18 @@ static protected function install_board() } global $phpbb_container; - $phpbb_container->reset(); + if (!empty($phpbb_container)) + { + $phpbb_container->reset(); + } + + // Purge cache to remove cached files + $phpbb_container = new phpbb_mock_container_builder(); + $phpbb_container->setParameter('core.environment', PHPBB_ENVIRONMENT); + $phpbb_container->setParameter('core.cache_dir', $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'); + + $cache = new \phpbb\cache\driver\file; + $cache->purge(); $blacklist = ['phpbb_class_loader_mock', 'phpbb_class_loader_ext', 'phpbb_class_loader']; @@ -407,19 +624,105 @@ static protected function install_board() } } - public function install_ext($extension) + public static function install_ext($extension) + { + self::get_db(); + $sql = 'SELECT ext_active + FROM ' . EXT_TABLE . " + WHERE ext_name = '" . self::$db_connection->sql_escape($extension). "'"; + $result = self::$db_connection->sql_query($sql); + $status = (bool) self::$db_connection->sql_fetchfield('ext_active'); + self::$db_connection->sql_freeresult($result); + + if (!$status) + { + self::add_lang('acp/extensions'); + + if (self::get_logged_in_user()) + { + self::logout(); + } + self::login(); + self::admin_login(); + + $ext_path = str_replace('/', '%2F', $extension); + + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=' . $ext_path . '&sid=' . self::$session_id); + self::assertGreaterThan(1, $crawler->filter('div.main fieldset.submit-buttons input')->count()); + + $form = $crawler->selectButton(self::lang('EXTENSION_ENABLE'))->form(); + $crawler = self::submit($form); + + $meta_refresh = $crawler->filter('meta[http-equiv="refresh"]'); + + // Wait for extension to be fully enabled + while (count($meta_refresh)) + { + preg_match('#url=.+/(adm+.+)#', $meta_refresh->attr('content'), $match); + $url = $match[1]; + $crawler = self::request('POST', $url); + $meta_refresh = $crawler->filter('meta[http-equiv="refresh"]'); + } + + self::assertContainsLang('EXTENSION_ENABLE_SUCCESS', $crawler->filter('div.successbox')->text()); + + self::logout(); + } + } + + public static function disable_ext($extension) + { + self::add_lang('acp/extensions'); + + if (self::get_logged_in_user()) + { + self::logout(); + } + self::login(); + self::admin_login(); + + $ext_path = str_replace('/', '%2F', $extension); + + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=' . $ext_path . '&sid=' . self::$session_id); + self::assertGreaterThan(1, $crawler->filter('div.main fieldset.submit-buttons input')->count()); + + $form = $crawler->selectButton(self::lang('EXTENSION_DISABLE'))->form(); + $crawler = self::submit($form); + + $meta_refresh = $crawler->filter('meta[http-equiv="refresh"]'); + + // Wait for extension to be fully disabled + while (count($meta_refresh)) + { + preg_match('#url=.+/(adm+.+)#', $meta_refresh->attr('content'), $match); + $url = $match[1]; + $crawler = self::request('POST', $url); + $meta_refresh = $crawler->filter('meta[http-equiv="refresh"]'); + } + + self::assertContainsLang('EXTENSION_DISABLE_SUCCESS', $crawler->filter('div.successbox')->text()); + + self::logout(); + } + + public static function delete_ext_data($extension) { - $this->login(); - $this->admin_login(); + self::add_lang('acp/extensions'); + + if (self::get_logged_in_user()) + { + self::logout(); + } + self::login(); + self::admin_login(); $ext_path = str_replace('/', '%2F', $extension); - $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=' . $ext_path . '&sid=' . $this->sid); - $this->assertGreaterThan(0, $crawler->filter('.submit-buttons')->count()); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=delete_data_pre&ext_name=' . $ext_path . '&sid=' . self::$session_id); + self::assertGreaterThan(1, $crawler->filter('div.main fieldset.submit-buttons input')->count()); - $form = $crawler->selectButton('Enable')->form(); + $form = $crawler->selectButton(self::lang('EXTENSION_DELETE_DATA'))->form(); $crawler = self::submit($form); - $this->add_lang('acp/extensions'); $meta_refresh = $crawler->filter('meta[http-equiv="refresh"]'); @@ -432,12 +735,18 @@ public function install_ext($extension) $meta_refresh = $crawler->filter('meta[http-equiv="refresh"]'); } - $this->assertContainsLang('EXTENSION_ENABLE_SUCCESS', $crawler->filter('div.successbox')->text()); + self::assertContainsLang('EXTENSION_DELETE_DATA_SUCCESS', $crawler->filter('div.successbox')->text()); + + self::logout(); + } - $this->logout(); + public static function uninstall_ext($extension) + { + self::disable_ext($extension); + self::delete_ext_data($extension); } - static private function recreate_database($config) + private static function recreate_database($config) { $db_conn_mgr = new phpbb_database_test_connection_manager($config); $db_conn_mgr->recreate_db(); @@ -446,19 +755,19 @@ static private function recreate_database($config) /** * Creates a new style * - * @param string $style_id Style ID + * @param int $style_id Style ID * @param string $style_path Style directory - * @param string $parent_style_id Parent style id. Default = 1 + * @param int $parent_style_id Parent style id. Default = 1 * @param string $parent_style_path Parent style directory. Default = 'prosilver' */ protected function add_style($style_id, $style_path, $parent_style_id = 1, $parent_style_path = 'prosilver') { global $phpbb_root_path; - $db = $this->get_db(); + $this->get_db(); if (version_compare(PHPBB_VERSION, '3.1.0-dev', '<')) { - $sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $db->sql_build_array('INSERT', array( + $sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', array( 'style_id' => $style_id, 'style_name' => $style_path, 'style_copyright' => '', @@ -467,17 +776,17 @@ protected function add_style($style_id, $style_path, $parent_style_id = 1, $pare 'theme_id' => $style_id, 'imageset_id' => $style_id, )); - $db->sql_query($sql); + $this->db->sql_query($sql); - $sql = 'INSERT INTO ' . STYLES_IMAGESET_TABLE . ' ' . $db->sql_build_array('INSERT', array( + $sql = 'INSERT INTO ' . STYLES_IMAGESET_TABLE . ' ' . $this->db->sql_build_array('INSERT', array( 'imageset_id' => $style_id, 'imageset_name' => $style_path, 'imageset_copyright' => '', 'imageset_path' => $style_path, )); - $db->sql_query($sql); + $this->db->sql_query($sql); - $sql = 'INSERT INTO ' . STYLES_TEMPLATE_TABLE . ' ' . $db->sql_build_array('INSERT', array( + $sql = 'INSERT INTO ' . STYLES_TEMPLATE_TABLE . ' ' . $this->db->sql_build_array('INSERT', array( 'template_id' => $style_id, 'template_name' => $style_path, 'template_copyright' => '', @@ -486,9 +795,9 @@ protected function add_style($style_id, $style_path, $parent_style_id = 1, $pare 'template_inherits_id' => $parent_style_id, 'template_inherit_path' => $parent_style_path, )); - $db->sql_query($sql); + $this->db->sql_query($sql); - $sql = 'INSERT INTO ' . STYLES_THEME_TABLE . ' ' . $db->sql_build_array('INSERT', array( + $sql = 'INSERT INTO ' . STYLES_THEME_TABLE . ' ' . $this->db->sql_build_array('INSERT', array( 'theme_id' => $style_id, 'theme_name' => $style_path, 'theme_copyright' => '', @@ -497,7 +806,7 @@ protected function add_style($style_id, $style_path, $parent_style_id = 1, $pare 'theme_mtime' => 0, 'theme_data' => '', )); - $db->sql_query($sql); + $this->db->sql_query($sql); if ($style_path != 'prosilver') { @@ -507,7 +816,7 @@ protected function add_style($style_id, $style_path, $parent_style_id = 1, $pare } else { - $db->sql_multi_insert(STYLES_TABLE, array(array( + $this->db->sql_multi_insert(STYLES_TABLE, array(array( 'style_name' => $style_path, 'style_copyright' => '', 'style_active' => 1, @@ -522,20 +831,20 @@ protected function add_style($style_id, $style_path, $parent_style_id = 1, $pare /** * Remove temporary style created by add_style() * - * @param string $style_id Style ID + * @param int $style_id Style ID * @param string $style_path Style directory */ protected function delete_style($style_id, $style_path) { global $phpbb_root_path; - $db = $this->get_db(); - $db->sql_query('DELETE FROM ' . STYLES_TABLE . ' WHERE style_id = ' . $style_id); + $this->get_db(); + $this->db->sql_query('DELETE FROM ' . STYLES_TABLE . ' WHERE style_id = ' . $style_id); if (version_compare(PHPBB_VERSION, '3.1.0-dev', '<')) { - $db->sql_query('DELETE FROM ' . STYLES_IMAGESET_TABLE . ' WHERE imageset_id = ' . $style_id); - $db->sql_query('DELETE FROM ' . STYLES_TEMPLATE_TABLE . ' WHERE template_id = ' . $style_id); - $db->sql_query('DELETE FROM ' . STYLES_THEME_TABLE . ' WHERE theme_id = ' . $style_id); + $this->db->sql_query('DELETE FROM ' . STYLES_IMAGESET_TABLE . ' WHERE imageset_id = ' . $style_id); + $this->db->sql_query('DELETE FROM ' . STYLES_TEMPLATE_TABLE . ' WHERE template_id = ' . $style_id); + $this->db->sql_query('DELETE FROM ' . STYLES_THEME_TABLE . ' WHERE theme_id = ' . $style_id); if ($style_path != 'prosilver') { @@ -549,9 +858,10 @@ protected function delete_style($style_id, $style_path) * Creates a new user with limited permissions * * @param string $username Also doubles up as the user's password + * @param string $email User email (defaults to nobody@example.com) * @return int ID of created user */ - protected function create_user($username) + protected function create_user($username, $email = 'nobody@example.com') { // Required by unique_id global $config; @@ -603,7 +913,7 @@ protected function create_user($username) $user_row = array( 'username' => $username, 'group_id' => 2, - 'user_email' => 'nobody@example.com', + 'user_email' => $email, 'user_type' => 0, 'user_lang' => 'en', 'user_timezone' => 'UTC', @@ -613,19 +923,55 @@ protected function create_user($username) return user_add($user_row); } + /** + * Get group ID + * + * @param string $group_name Group name + * @return int Group id of specified group name + */ + protected function get_group_id($group_name) + { + $sql = 'SELECT group_id + FROM ' . GROUPS_TABLE . " + WHERE group_name = '" . $this->db->sql_escape($group_name) . "'"; + $result = $this->db->sql_query($sql); + $group_id = (int) $this->db->sql_fetchfield('group_id'); + $this->db->sql_freeresult($result); + + return $group_id; + } + + /** + * Get current board's search type + * + * @return string Current search type setting + */ + protected function get_search_type() + { + $sql = 'SELECT config_value as search_type + FROM ' . CONFIG_TABLE . " + WHERE config_name = '" . $this->db->sql_escape('search_type') . "'"; + $result = $this->db->sql_query($sql); + $search_type = $this->db->sql_fetchfield('search_type'); + $this->db->sql_freeresult($result); + + return $search_type; + } + protected function remove_user_group($group_name, $usernames) { - global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx; + global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $user, $phpbb_root_path, $phpEx; $config = new \phpbb\config\config(array()); $config['coppa_enable'] = 0; $db = $this->get_db(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + + $user = $this->createMock('\phpbb\user'); + $user->data['user_id'] = 2; // admin + $user->ip = ''; + $auth = $this->createMock('\phpbb\auth\auth'); $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); @@ -645,29 +991,25 @@ protected function remove_user_group($group_name, $usernames) require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); } - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name = '" . $db->sql_escape($group_name) . "'"; - $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id'); - $db->sql_freeresult($result); + $group_id = $this->get_group_id($group_name); return group_user_del($group_id, false, $usernames, $group_name); } protected function add_user_group($group_name, $usernames, $default = false, $leader = false) { - global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx; + global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $user, $phpbb_root_path, $phpEx; $config = new \phpbb\config\config(array()); $config['coppa_enable'] = 0; $db = $this->get_db(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + + $user = $this->createMock('\phpbb\user'); + $user->data['user_id'] = 2; // admin + $user->ip = ''; + $auth = $this->createMock('\phpbb\auth\auth'); $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); @@ -690,84 +1032,87 @@ protected function add_user_group($group_name, $usernames, $default = false, $le require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); } - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name = '" . $db->sql_escape($group_name) . "'"; - $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id'); - $db->sql_freeresult($result); + $group_id = $this->get_group_id($group_name); return group_user_add($group_id, false, $usernames, $group_name, $default, $leader); } - protected function login($username = 'admin') + protected static function login($username = 'admin', $autologin = false) { - $this->add_lang('ucp'); + self::add_lang('ucp'); - $crawler = self::request('GET', 'ucp.php'); - $this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text()); + $crawler = self::request('GET', 'ucp.php?mode=login'); + $button = $crawler->selectButton(self::lang('LOGIN')); + self::assertGreaterThan(0, $button->count(), 'No login button found'); - $form = $crawler->selectButton($this->lang('LOGIN'))->form(); + $form = $crawler->selectButton(self::lang('LOGIN'))->form(); + if ($autologin) + { + $form['autologin']->tick(); + } $crawler = self::submit($form, array('username' => $username, 'password' => $username . $username)); - $this->assertNotContains($this->lang('LOGIN'), $crawler->filter('.navbar')->text()); + self::assertStringNotContainsString(self::lang('LOGIN'), $crawler->filter('.navbar')->text()); $cookies = self::$cookieJar->all(); // The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie - foreach ($cookies as $cookie); + foreach ($cookies as $cookie) { if (substr($cookie->getName(), -4) == '_sid') { - $this->sid = $cookie->getValue(); + self::$session_id = $cookie->getValue(); } } } - protected function logout() + protected static function logout() { - $this->add_lang('ucp'); + self::add_lang('ucp'); - $crawler = self::request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout'); - $this->assertContains($this->lang('REGISTER'), $crawler->filter('.navbar')->text()); - unset($this->sid); + $crawler = self::request('GET', 'index.php'); + $logout_link = $crawler->filter('a[title="' . self::lang('LOGOUT') . '"]')->attr('href'); + self::request('GET', $logout_link); + $crawler = self::request('GET', $logout_link); + self::assertStringContainsString(self::lang('REGISTER'), $crawler->filter('.navbar')->text()); + self::$session_id = null; } /** * Login to the ACP * You must run login() before calling this. */ - protected function admin_login($username = 'admin') + protected static function admin_login($username = 'admin') { - $this->add_lang('acp/common'); + self::add_lang('acp/common'); // Requires login first! - if (empty($this->sid)) + if (empty(self::$session_id)) { - $this->fail('$this->sid is empty. Make sure you call login() before admin_login()'); + self::fail('$this->sid is empty. Make sure you call login() before admin_login()'); return; } - $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid); - $this->assertContains($this->lang('LOGIN_ADMIN_CONFIRM'), $crawler->filter('html')->text()); + $crawler = self::request('GET', 'adm/index.php?sid=' . self::$session_id); + self::assertStringContainsString(self::lang('LOGIN_ADMIN_CONFIRM'), $crawler->filter('html')->text()); - $form = $crawler->selectButton($this->lang('LOGIN'))->form(); + $form = $crawler->selectButton(self::lang('LOGIN'))->form(); foreach ($form->getValues() as $field => $value) { if (strpos($field, 'password_') === 0) { $crawler = self::submit($form, array('username' => $username, $field => $username . $username)); - $this->assertContains($this->lang('ADMIN_PANEL'), $crawler->filter('h1')->text()); + self::assertStringContainsString(self::lang('ADMIN_PANEL'), $crawler->filter('h1')->text()); $cookies = self::$cookieJar->all(); // The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie - foreach ($cookies as $cookie); + foreach ($cookies as $cookie) { if (substr($cookie->getName(), -4) == '_sid') { - $this->sid = $cookie->getValue(); + self::$session_id = $cookie->getValue(); } } @@ -776,35 +1121,37 @@ protected function admin_login($username = 'admin') } } - protected function add_lang($lang_file) + protected static function add_lang($lang_file) { if (is_array($lang_file)) { foreach ($lang_file as $file) { - $this->add_lang($file); + self::add_lang($file); } + + return; } $lang_path = __DIR__ . "/../../phpBB/language/en/$lang_file.php"; - $lang = array(); + $lang = []; if (file_exists($lang_path)) { include($lang_path); } - $this->lang = array_merge($this->lang, $lang); + self::$lang_ary = array_merge(self::$lang_ary, $lang); } - protected function add_lang_ext($ext_name, $lang_file) + protected static function add_lang_ext($ext_name, $lang_file) { if (is_array($lang_file)) { foreach ($lang_file as $file) { - $this->add_lang_ext($ext_name, $file); + self::add_lang_ext($ext_name, $file); } return; @@ -812,27 +1159,27 @@ protected function add_lang_ext($ext_name, $lang_file) $lang_path = __DIR__ . "/../../phpBB/ext/{$ext_name}/language/en/$lang_file.php"; - $lang = array(); + $lang = []; if (file_exists($lang_path)) { include($lang_path); } - $this->lang = array_merge($this->lang, $lang); + self::$lang_ary = array_merge(self::$lang_ary, $lang); } - protected function lang() + protected static function lang() { $args = func_get_args(); $key = $args[0]; - if (empty($this->lang[$key])) + if (empty(self::$lang_ary[$key])) { throw new RuntimeException('Language key "' . $key . '" could not be found.'); } - $args[0] = $this->lang[$key]; + $args[0] = self::$lang_ary[$key]; return call_user_func_array('sprintf', $args); } @@ -844,9 +1191,9 @@ protected function lang() * @param string $haystack Search this * @param string $message Optional failure message */ - public function assertContainsLang($needle, $haystack, $message = null) + public static function assertContainsLang($needle, $haystack, $message = '') { - $this->assertContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message); + self::assertStringContainsString(html_entity_decode(self::lang($needle), ENT_QUOTES), $haystack, $message); } /** @@ -856,9 +1203,9 @@ public function assertContainsLang($needle, $haystack, $message = null) * @param string $haystack Search this * @param string $message Optional failure message */ - public function assertNotContainsLang($needle, $haystack, $message = null) + public static function assertNotContainsLang($needle, $haystack, $message = '') { - $this->assertNotContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message); + self::assertStringNotContainsString(html_entity_decode(self::lang($needle), ENT_QUOTES), $haystack, $message); } /* @@ -869,12 +1216,12 @@ public function assertNotContainsLang($needle, $haystack, $message = null) * @param mixed $status_code Expected status code, false to disable check * @return null */ - static public function assert_response_html($status_code = 200) + public static function assert_response_html($status_code = 200) { // Any output before the doc type means there was an error $content = self::get_content(); - self::assertNotContains('[phpBB Debug]', $content); - self::assertStringStartsWith('getResponse()->getStatus() && - preg_match('/^5[0-9]{2}/', self::$client->getResponse()->getStatus())) + if ($status_code != self::$client->getResponse()->getStatusCode() && + preg_match('/^5[0-9]{2}/', self::$client->getResponse()->getStatusCode())) { self::fail("Encountered unexpected server error:\n" . self::$client->getResponse()->getContent()); } - self::assertEquals($status_code, self::$client->getResponse()->getStatus(), 'HTTP status code does not match'); + self::assertEquals($status_code, self::$client->getResponse()->getStatusCode(), 'HTTP status code does not match'); } public function assert_filter($crawler, $expr, $msg = null) @@ -946,12 +1293,11 @@ public function assert_filter($crawler, $expr, $msg = null) * @param string $name * @param string $message * - * @return null + * @return void */ public function assert_checkbox_is_checked($crawler, $name, $message = '') { - $this->assertSame( - 'checked', + $this->assertNotNull( $this->assert_find_one_checkbox($crawler, $name)->attr('checked'), $message ?: "Failed asserting that checkbox $name is checked." ); @@ -965,7 +1311,7 @@ public function assert_checkbox_is_checked($crawler, $name, $message = '') * @param string $name * @param string $message * - * @return null + * @return void */ public function assert_checkbox_is_unchecked($crawler, $name, $message = '') { @@ -1041,12 +1387,13 @@ public function create_topic($forum_id, $subject, $message, $additional_form_dat */ public function create_post($forum_id, $topic_id, $subject, $message, $additional_form_data = array(), $expected = '') { - $posting_url = "posting.php?mode=reply&f={$forum_id}&t={$topic_id}&sid={$this->sid}"; + $posting_url = "posting.php?mode=reply&t={$topic_id}&sid={$this->sid}"; $form_data = array_merge(array( 'subject' => $subject, 'message' => $message, 'post' => true, + 'topic_id' => $topic_id, ), $additional_form_data); return self::submit_post($posting_url, 'POST_REPLY', $form_data, $expected); @@ -1075,16 +1422,25 @@ protected function submit_post($posting_url, $posting_contains, $form_data, $exp } else { - $this->assertContains($expected, $crawler->filter('html')->text()); + $this->assertStringContainsString($expected, $crawler->filter('html')->text()); } return null; } - $url = $crawler->selectLink($form_data['subject'])->link()->getUri(); + $post_link = $crawler->filter('.postbody a[title="Post"]')->last()->attr('href'); + $topic_link = $crawler->filter('h2[class="topic-title"] > a')->attr('href'); + + $post_id = $this->get_parameter_from_link($post_link, 'p'); + $topic_id = $this->get_parameter_from_link($topic_link, 't'); + + if (!$topic_id) + { + $topic_id = $form_data['topic_id']; + } return array( - 'topic_id' => $this->get_parameter_from_link($url, 't'), - 'post_id' => $this->get_parameter_from_link($url, 'p'), + 'topic_id' => $topic_id, + 'post_id' => $post_id, ); } @@ -1118,7 +1474,7 @@ public function create_private_message($subject, $message, $to, $additional_form $crawler = self::submit_message($posting_url, 'POST_NEW_PM', $form_data); - $this->assertContains($this->lang('MESSAGE_STORED'), $crawler->filter('html')->text()); + $this->assertStringContainsString($this->lang('MESSAGE_STORED'), $crawler->filter('html')->text()); $url = $crawler->selectLink($this->lang('VIEW_PRIVATE_MESSAGE', '', ''))->link()->getUri(); return $this->get_parameter_from_link($url, 'p'); @@ -1134,15 +1490,8 @@ public function create_private_message($subject, $message, $to, $additional_form */ protected function submit_message($posting_url, $posting_contains, $form_data) { - if (time() == self::$last_post_timestamp) - { - // Travis is too fast, so we have to wait to not mix up the post/topic order - sleep(1); - } - self::$last_post_timestamp = time(); - $crawler = self::request('GET', $posting_url); - $this->assertContains($this->lang($posting_contains), $crawler->filter('html')->text()); + $this->assertStringContainsString($this->lang($posting_contains), $crawler->filter('html')->text()); if (!empty($form_data['upload_files'])) { @@ -1156,28 +1505,14 @@ protected function submit_message($posting_url, $posting_contains, $form_data) 'error' => UPLOAD_ERR_OK, ); - $crawler = self::$client->request('POST', $posting_url, array('add_file' => $this->lang('ADD_FILE')), array('fileupload' => $file)); - } - unset($form_data['upload_files']); - } - - $hidden_fields = array( - $crawler->filter('[type="hidden"]')->each(function ($node, $i) { - return array('name' => $node->attr('name'), 'value' => $node->attr('value')); - }), - ); + $file_form_data = array_merge(['add_file' => $this->lang('ADD_FILE')], $this->get_hidden_fields($crawler, $posting_url)); - foreach ($hidden_fields as $fields) - { - foreach($fields as $field) - { - $form_data[$field['name']] = $field['value']; + $crawler = self::$client->request('POST', $posting_url, $file_form_data, array('fileupload' => $file)); } + unset($form_data['upload_files']); } - // Bypass time restriction that said that if the lastclick time (i.e. time when the form was opened) - // is not at least 2 seconds before submission, cancel the form - $form_data['lastclick'] = 0; + $form_data = array_merge($form_data, $this->get_hidden_fields($crawler, $posting_url)); // I use a request because the form submission method does not allow you to send data that is not // contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs) @@ -1218,7 +1553,7 @@ public function delete_topic($topic_id) public function delete_post($forum_id, $post_id) { $this->add_lang('posting'); - $crawler = self::request('GET', "posting.php?mode=delete&f={$forum_id}&p={$post_id}&sid={$this->sid}"); + $crawler = self::request('GET', "posting.php?mode=delete&p={$post_id}&sid={$this->sid}"); $this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text()); $form = $crawler->selectButton('Yes')->form(); @@ -1306,6 +1641,124 @@ public function get_quickmod_page($topic_id, $action, $crawler = false) } $link = $crawler->filter('#quickmod')->selectLink($this->lang($action))->link()->getUri(); - return self::request('GET', substr($link, strpos($link, 'mcp.'))); + return self::request('GET', substr($link, strpos($link, 'mcp.')) . "&sid={$this->sid}"); + } + + /** + * Get hidden fields for URL + * + * @param Symfony\Component\DomCrawler\Crawler|null $crawler Crawler instance or null + * @param string $url Request URL + * + * @return array Hidden form fields array + */ + protected function get_hidden_fields($crawler, $url) + { + if (!$crawler) + { + $crawler = self::$client->request('GET', $url); + } + $hidden_fields = [ + $crawler->filter('[type="hidden"]')->each(function ($node, $i) { + return ['name' => $node->attr('name'), 'value' => $node->attr('value')]; + }), + ]; + + $file_form_data = []; + + foreach ($hidden_fields as $fields) + { + foreach($fields as $field) + { + $file_form_data[$field['name']] = $field['value']; + } + } + + return $file_form_data; + } + + /** + * Get username of currently logged in user + * + * @return string|bool username if logged in, false otherwise + */ + protected static function get_logged_in_user() + { + $username_logged_in = false; + $crawler = self::request('GET', 'index.php'); + $is_logged_in = strpos($crawler->filter('div[class="navbar"]')->text(), 'Login') === false; + if ($is_logged_in) + { + $username_logged_in = $crawler->filter('li[id="username_logged_in"] > div > a > span:not(.avatar)')->text(); + } + return $username_logged_in; + } + + /** + * Posting flood control + */ + protected function set_flood_interval($flood_interval) + { + $relogin_back = false; + $logged_in_username = $this->get_logged_in_user(); + if ($logged_in_username && $logged_in_username !== 'admin') + { + $this->logout(); + $relogin_back = true; + } + + if (!$logged_in_username || $relogin_back) + { + $this->login(); + $this->admin_login(); + } + + $this->add_lang('acp/common'); + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=post&sid=' . $this->sid); + $form = $crawler->selectButton('submit')->form([ + 'config[flood_interval]' => $flood_interval, + ]); + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->text()); + + // Get logged out back or get logged in in user back if needed + if (!$logged_in_username) + { + $this->logout(); + } + + if ($relogin_back) + { + $this->logout(); + $this->login($logged_in_username); + } + } + + /** + * Check if a user exists by username or user_id + * + * @param string $username The username to check or empty if user_id is used + * @param int $user_id The user id to check or empty if username is used + * + * @return array Returns user_id => username array or empty array if user does not exist + */ + protected function user_exists($username = '', $user_id = '') + { + global $db; + + $db = $this->get_db(); + + if (!function_exists('utf_clean_string')) + { + require_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php'); + } + if (!function_exists('user_get_id_name')) + { + require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); + } + + user_get_id_name($user_id, $username, false, true); + + return $username; } } diff --git a/tests/test_framework/phpbb_search_test_case.php b/tests/test_framework/phpbb_search_test_case.php index b37ed1d039b..ea0d6e88451 100644 --- a/tests/test_framework/phpbb_search_test_case.php +++ b/tests/test_framework/phpbb_search_test_case.php @@ -13,7 +13,7 @@ abstract class phpbb_search_test_case extends phpbb_database_test_case { - static protected function get_search_wrapper($class) + protected static function get_search_wrapper($class) { $wrapped = str_replace('\\', '_', $class) . '_wrapper'; if (!class_exists($wrapped)) diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index 207659b3bd5..79ac2d9c48e 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../session/testable_factory.php'; -require_once dirname(__FILE__) . '/../session/testable_facade.php'; +require_once __DIR__ . '/../session/testable_factory.php'; +require_once __DIR__ . '/../session/testable_facade.php'; abstract class phpbb_session_test_case extends phpbb_database_test_case { @@ -25,11 +25,11 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case /** @var \phpbb\db\driver\driver_interface */ protected $db; - function setUp() + protected function setUp(): void { parent::setUp(); - global $symfony_request, $phpbb_path_helper, $request, $phpbb_root_path, $phpEx; + global $symfony_request, $phpbb_path_helper, $phpbb_root_path, $phpEx; $symfony_request = new \phpbb\symfony_request( new phpbb_mock_request() ); @@ -46,11 +46,33 @@ function setUp() new phpbb_session_testable_facade($this->db, $this->session_factory); } + protected function check_user_session_data($expected_session_data, $message) + { + $sql= 'SELECT username_clean, user_lastvisit, user_lastpage + FROM ' . USERS_TABLE . ' + ORDER BY user_id'; + + $this->assertSqlResultEquals($expected_session_data, $sql, $message); + } + + protected function check_expired_sessions_recent($expected_sessions, $message) + { + global $config; + $time_now = time(); + $sql = 'SELECT session_user_id, MAX(session_time) AS recent_time + FROM ' . SESSIONS_TABLE . ' + WHERE session_time < ' . ($time_now - (int) $config['session_length']) . ' + AND session_user_id <> ' . ANONYMOUS . ' + GROUP BY session_user_id ORDER BY session_user_id ASC'; + + $this->assertSqlResultEquals($expected_sessions, $sql, $message); + } + protected function check_sessions_equals($expected_sessions, $message) { $sql = 'SELECT session_id, session_user_id FROM phpbb_sessions - ORDER BY session_user_id'; + ORDER BY session_user_id, session_id'; $this->assertSqlResultEquals($expected_sessions, $sql, $message); } diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php index 01d26fb67d5..8c4bf5c1d75 100644 --- a/tests/test_framework/phpbb_test_case.php +++ b/tests/test_framework/phpbb_test_case.php @@ -11,23 +11,24 @@ * */ -class phpbb_test_case extends PHPUnit_Framework_TestCase +use PHPUnit\Framework\TestCase; + +class phpbb_test_case extends TestCase { protected $test_case_helpers; - public function __construct($name = NULL, array $data = array(), $dataName = '') + protected function setUp(): void { - parent::__construct($name, $data, $dataName); - $this->backupStaticAttributesBlacklist += array( - 'PHP_CodeCoverage' => array('instance'), - 'PHP_CodeCoverage_Filter' => array('instance'), - 'PHP_CodeCoverage_Util' => array('ignoredLines', 'templateMethods'), - 'PHP_Timer' => array('startTimes',), - 'PHP_Token_Stream' => array('customTokens'), - 'PHP_Token_Stream_CachingFactory' => array('cache'), + $this->setBackupStaticPropertiesExcludeList([ + 'SebastianBergmann\CodeCoverage\CodeCoverage' => ['instance'], + 'SebastianBergmann\CodeCoverage\Filter' => ['instance'], + 'SebastianBergmann\CodeCoverage\Util' => ['ignoredLines', 'templateMethods'], + 'SebastianBergmann\Timer\Timer' => ['startTimes'], + 'PHP_Token_Stream' => ['customTokens'], + 'PHP_Token_Stream_CachingFactory' => ['cache'], - 'phpbb_database_test_case' => array('already_connected', 'last_post_timestamp'), - ); + 'phpbb_database_test_case' => ['already_connected', 'last_post_timestamp'], + ]); } public function get_test_case_helpers() diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 367b5f14d26..634b3be2ddf 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -37,8 +37,19 @@ public function copy_ext_fixtures($fixtures_dir, $fixtures) // First, move any extensions setup on the board to a temp directory $this->copy_dir($phpbb_root_path . 'ext/', $phpbb_root_path . 'store/temp_ext/'); + // Back up vendor-ext directory + $this->copy_dir($phpbb_root_path . 'vendor-ext/', $phpbb_root_path . 'store/temp_vendor-ext/'); + + // Back up composer-ext.* files + copy($phpbb_root_path . 'composer-ext.json', $phpbb_root_path . 'store/temp_composer-ext.json'); + copy($phpbb_root_path . 'composer-ext.lock', $phpbb_root_path . 'store/temp_composer-ext.lock'); + // Then empty the ext/ directory on the board (for accurate test cases) $this->empty_dir($phpbb_root_path . 'ext/'); + + // Then empty the vendor-ext/ directory and add back .git-keep + $this->empty_dir($phpbb_root_path . 'vendor-ext/'); + file_put_contents($phpbb_root_path . 'vendor-ext/.git-keep', ''); } // Copy our ext/ files from the test case to the board @@ -68,34 +79,44 @@ public function restore_original_ext_dir() $this->empty_dir($phpbb_root_path . 'store/temp_ext/'); } + if (file_exists($phpbb_root_path . 'store/temp_vendor-ext/')) + { + $this->empty_dir($phpbb_root_path . 'vendor-ext/'); + + $this->copy_dir($phpbb_root_path . 'store/temp_vendor-ext/', $phpbb_root_path . 'vendor-ext/'); + + $this->empty_dir($phpbb_root_path . 'store/temp_vendor-ext/'); + } + + if (file_exists($phpbb_root_path . 'store/temp_composer-ext.json')) + { + copy($phpbb_root_path . 'store/temp_composer-ext.json', $phpbb_root_path . 'composer-ext.json'); + } + + if (file_exists($phpbb_root_path . 'store/temp_composer-ext.lock')) + { + copy($phpbb_root_path . 'store/temp_composer-ext.lock', $phpbb_root_path . 'composer-ext.lock'); + } + if (file_exists($phpbb_root_path . 'store/temp_ext/')) { $this->empty_dir($phpbb_root_path . 'store/temp_ext/'); } } - public function setExpectedTriggerError($errno, $message = '') + public function setExpectedTriggerError($errno, $message = ''): void { - $exceptionName = ''; - switch ($errno) - { - case E_NOTICE: - case E_STRICT: - PHPUnit_Framework_Error_Notice::$enabled = true; - $exceptionName = 'PHPUnit_Framework_Error_Notice'; - break; - - case E_WARNING: - PHPUnit_Framework_Error_Warning::$enabled = true; - $exceptionName = 'PHPUnit_Framework_Error_Warning'; - break; + set_error_handler( + static function ($errno, $errstr) + { + restore_error_handler(); + throw new Exception($errstr, $errno); + }, + E_ALL ^ E_DEPRECATED + ); - default: - $exceptionName = 'PHPUnit_Framework_Error'; - break; - } $this->expectedTriggerError = true; - $this->test_case->expectException($exceptionName); + $this->test_case->expectException(Exception::class); $this->test_case->expectExceptionCode($errno); if ($message) { @@ -115,12 +136,11 @@ static public function get_test_config() { $config = array(); - if (extension_loaded('sqlite3')) { $config = array_merge($config, array( 'dbms' => 'phpbb\db\driver\sqlite3', - 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite3', // filename + 'dbhost' => __DIR__ . '/../phpbb_unit_tests.sqlite3', // filename 'dbport' => '', 'dbname' => '', 'dbuser' => '', @@ -135,7 +155,7 @@ static public function get_test_config() } else { - $test_config = dirname(__FILE__) . '/../test_config.php'; + $test_config = __DIR__ . '/../test_config.php'; } $config_php_file = new \phpbb\config_php_file('', ''); @@ -146,7 +166,7 @@ static public function get_test_config() extract($config_php_file->get_all()); $config = array_merge($config, array( - 'dbms' => $config_php_file->convert_30_dbms_to_31($dbms), + 'dbms' => \phpbb\config_php_file::convert_30_dbms_to_31($dbms), 'dbhost' => $dbhost, 'dbport' => $dbport, 'dbname' => $dbname, @@ -160,6 +180,11 @@ static public function get_test_config() $config['phpbb_functional_url'] = $phpbb_functional_url; } + if (isset($path_to_ssl_cert)) + { + $config['path_to_ssl_cert'] = $path_to_ssl_cert; + } + if (isset($phpbb_redis_host)) { $config['redis_host'] = $phpbb_redis_host; @@ -173,12 +198,22 @@ static public function get_test_config() { $config['fulltext_sphinx_id'] = $fulltext_sphinx_id; } + + if (isset($phpbb_memcached_host)) + { + $config['memcached_host'] = $phpbb_memcached_host; + } + + if (isset($phpbb_memcached_port)) + { + $config['memcached_port'] = $phpbb_memcached_port; + } } if (isset($_SERVER['PHPBB_TEST_DBMS'])) { $config = array_merge($config, array( - 'dbms' => isset($_SERVER['PHPBB_TEST_DBMS']) ? $config_php_file->convert_30_dbms_to_31($_SERVER['PHPBB_TEST_DBMS']) : '', + 'dbms' => isset($_SERVER['PHPBB_TEST_DBMS']) ? \phpbb\config_php_file::convert_30_dbms_to_31($_SERVER['PHPBB_TEST_DBMS']) : '', 'dbhost' => isset($_SERVER['PHPBB_TEST_DBHOST']) ? $_SERVER['PHPBB_TEST_DBHOST'] : '', 'dbport' => isset($_SERVER['PHPBB_TEST_DBPORT']) ? $_SERVER['PHPBB_TEST_DBPORT'] : '', 'dbname' => isset($_SERVER['PHPBB_TEST_DBNAME']) ? $_SERVER['PHPBB_TEST_DBNAME'] : '', @@ -205,6 +240,21 @@ static public function get_test_config() $config['redis_port'] = $_SERVER['PHPBB_TEST_REDIS_PORT']; } + if (isset($_SERVER['PHPBB_TEST_MEMCACHED_HOST'])) + { + $config['memcached_host'] = $_SERVER['PHPBB_TEST_MEMCACHED_HOST']; + } + + if (isset($_SERVER['PHPBB_TEST_MEMCACHED_PORT'])) + { + $config['memcached_port'] = $_SERVER['PHPBB_TEST_MEMCACHED_PORT']; + } + + if (isset($_SERVER['PHPBB_TEST_SSL_CERT_PATH'])) + { + $config['path_to_ssl_cert'] = $_SERVER['PHPBB_TEST_SSL_CERT_PATH']; + } + return $config; } @@ -306,7 +356,7 @@ public function empty_dir($path) * @param string $styles_path Path to the styles dir * @return ContainerInterface */ - public function set_s9e_services(ContainerInterface $container = null, $fixture = null, $styles_path = null) + public function set_s9e_services(ContainerInterface|null $container = null, $fixture = null, $styles_path = null) { static $first_run; global $config, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $request, $user; @@ -382,7 +432,7 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture $tables['phpbb_styles'][] = array( 'style_id' => 1, 'style_path' => 'prosilver', - 'bbcode_bitfield' => 'kNg=' + 'bbcode_bitfield' => '//g=' ); } @@ -394,7 +444,7 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture ->disallowMockingUnknownTypes() ->getMock(); $mb = $this->test_case->getMockBuilder('phpbb\\textformatter\\data_access'); - $mb->setMethods(array('get_bbcodes', 'get_censored_words', 'get_smilies', 'get_styles')); + $mb->onlyMethods(array('get_bbcodes', 'get_censored_words', 'get_smilies', 'get_styles')); $mb->setConstructorArgs(array( $db_driver, 'phpbb_bbcodes', @@ -422,12 +472,23 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture // Cache the parser and renderer with a key based on this method's arguments $cache = new \phpbb\cache\driver\file($cache_dir); - $prefix = '_s9e_' . md5(serialize(func_get_args())); + + // Don't serialize unserializable resource/object arguments + // See https://www.php.net/manual/en/function.serialize.php#refsect1-function.serialize-notes + $args = func_get_args(); + foreach ($args as $key => $arg) + { + if (is_resource($arg) || (is_object($arg) && (!is_a($arg, 'Serializable') && !method_exists($arg, '__serialize')))) + { + unset($args[$key]); + } + } + $prefix = '_s9e_' . md5(serialize($args)); $cache_key_parser = $prefix . '_parser'; $cache_key_renderer = $prefix . '_renderer'; $container->set('cache.driver', $cache); - if (!$container->isFrozen()) + if (!$container->isCompiled()) { $container->setParameter('cache.dir', $cache_dir); } @@ -437,7 +498,7 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture { $path_helper = $this->test_case->getMockBuilder('phpbb\\path_helper') ->disableOriginalConstructor() - ->setMethods(array('get_web_root_path')) + ->onlyMethods(array('get_web_root_path')) ->getMock(); $path_helper->expects($this->test_case->any()) ->method('get_web_root_path') @@ -451,9 +512,9 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture } // Create an event dispatcher - if ($container->has('dispatcher')) + if ($container->has('event_dispatcher')) { - $dispatcher = $container->get('dispatcher'); + $dispatcher = $container->get('event_dispatcher'); } else if (isset($phpbb_dispatcher)) { @@ -511,6 +572,14 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture if ($container->has('user')) { $user = $container->get('user'); + + // Set default required user data if not set + $user->data['is_bot'] = $user->data['is_bot'] ?? false; + $user->data['is_registered'] = $user->data['is_registered'] ?? false; + $user->data['style_id'] = $user->data['style_id'] ?? 1; + $user->data['user_id'] = $user->data['user_id'] ?? ANONYMOUS; + $user->data['user_options'] = $user->data['user_options'] ?? 230271; + $user->style['style_id'] = $user->style['style_id'] ?? 1; } else { @@ -519,15 +588,22 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture $user = $this->test_case->getMockBuilder('\phpbb\user') ->setConstructorArgs(array($lang, '\phpbb\datetime')) - ->setMethods(array('format_date')) + ->onlyMethods(array('format_date')) ->getMock(); $user->expects($this->test_case->any()) ->method('format_date') ->will($this->test_case->returnCallback(__CLASS__ . '::format_date')); + // Set default required user data + $user->data['is_bot'] = false; + $user->data['is_registered'] = false; + $user->data['style_id'] = 1; + $user->data['user_id'] = ANONYMOUS; + $user->data['user_options'] = 230271; + $user->style['style_id'] = 1; + $user->date_format = 'Y-m-d H:i:s'; $user->optionset('viewcensors', true); - $user->optionset('viewflash', true); $user->optionset('viewimg', true); $user->optionset('viewsmilies', true); $user->timezone = new \DateTimeZone('UTC'); @@ -535,10 +611,8 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture } $user->add_lang('common'); - if (!isset($user->style)) - { - $user->style = array('style_id' => 1); - } + // Get an auth interface + $auth = ($container->has('auth')) ? $container->get('auth') : new \phpbb\auth\auth; // Create and register a quote_helper $quote_helper = new \phpbb\textformatter\s9e\quote_helper( @@ -548,6 +622,16 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture ); $container->set('text_formatter.s9e.quote_helper', $quote_helper); + // Create and register a mention_helper + $mention_helper = new \phpbb\textformatter\s9e\mention_helper( + ($container->has('dbal.conn')) ? $container->get('dbal.conn') : $db_driver, + $auth, + $container->get('user'), + $phpbb_root_path, + $phpEx + ); + $container->set('text_formatter.s9e.mention_helper', $mention_helper); + // Create and register the text_formatter.s9e.parser service and its alias $parser = new \phpbb\textformatter\s9e\parser( $cache, @@ -568,8 +652,8 @@ public function set_s9e_services(ContainerInterface $container = null, $fixture ); // Calls configured in services.yml - $auth = ($container->has('auth')) ? $container->get('auth') : new \phpbb\auth\auth; $renderer->configure_quote_helper($quote_helper); + $renderer->configure_mention_helper($mention_helper); $renderer->configure_smilies_path($config, $path_helper); $renderer->configure_user($user, $config, $auth); diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php deleted file mode 100644 index f8a35c75a53..00000000000 --- a/tests/test_framework/phpbb_ui_test_case.php +++ /dev/null @@ -1,592 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -use Facebook\WebDriver\WebDriverBy; -use Facebook\WebDriver\Exception\WebDriverCurlException; -use Facebook\WebDriver\Remote\RemoteWebDriver; -use Facebook\WebDriver\Remote\DesiredCapabilities; - -require_once __DIR__ . '/mock/phpbb_mock_null_installer_task.php'; - -class phpbb_ui_test_case extends phpbb_test_case -{ - static protected $host = '127.0.0.1'; - static protected $port = 8910; - - /** - * @var RemoteWebDriver - */ - static protected $webDriver; - - static protected $config; - static protected $root_url; - static protected $already_installed = false; - static protected $install_success = false; - protected $cache = null; - protected $db = null; - protected $extension_manager = null; - - /** - * Session ID for current test's session (each test makes its own) - * @var string - */ - protected $sid; - - /** - * Language array used by phpBB - * @var array - */ - protected $lang = array(); - - static public function setUpBeforeClass() - { - parent::setUpBeforeClass(); - - if (version_compare(PHP_VERSION, '5.3.19', '<')) - { - self::markTestSkipped('UI test case requires at least PHP 5.3.19.'); - } - else if (!class_exists('\Facebook\WebDriver\Remote\RemoteWebDriver')) - { - self::markTestSkipped( - 'Could not find RemoteWebDriver class. ' . - 'Run "php ../composer.phar install" from the tests folder.' - ); - } - - self::$config = phpbb_test_case_helpers::get_test_config(); - self::$root_url = self::$config['phpbb_functional_url']; - - // Important: this is used both for installation and by - // test cases for querying the tables. - // Therefore table prefix must be set before a board is - // installed, and also before each test case is run. - self::$config['table_prefix'] = 'phpbb_'; - - if (!isset(self::$config['phpbb_functional_url'])) - { - self::markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.'); - } - - try { - $capabilities = DesiredCapabilities::firefox(); - self::$webDriver = RemoteWebDriver::create(self::$host . ':' . self::$port, $capabilities); - } catch (WebDriverCurlException $e) { - self::markTestSkipped('PhantomJS webserver is not running.'); - } - - if (!self::$already_installed) - { - self::install_board(); - self::$already_installed = true; - } - } - - /** - * @return array List of extensions that should be set up - */ - static protected function setup_extensions() - { - return array(); - } - - public function setUp() - { - if (!self::$install_success) - { - $this->fail('Installing phpBB has failed.'); - } - - // Clear the language array so that things - // that were added in other tests are gone - $this->lang = array(); - $this->add_lang('common'); - - $db = $this->get_db(); - - foreach (static::setup_extensions() as $extension) - { - $this->purge_cache(); - - $sql = 'SELECT ext_active - FROM ' . EXT_TABLE . " - WHERE ext_name = '" . $db->sql_escape($extension). "'"; - $result = $db->sql_query($sql); - $status = (bool) $db->sql_fetchfield('ext_active'); - $db->sql_freeresult($result); - - if (!$status) - { - $this->install_ext($extension); - } - } - } - - protected function tearDown() - { - parent::tearDown(); - - if ($this->db instanceof \phpbb\db\driver\driver_interface) - { - // Close the database connections again this test - $this->db->sql_close(); - } - } - - public function getDriver() - { - return self::$webDriver; - } - - public function visit($path) - { - $this->getDriver()->get(self::$root_url . $path); - } - - static protected function recreate_database($config) - { - $db_conn_mgr = new phpbb_database_test_connection_manager($config); - $db_conn_mgr->recreate_db(); - } - - public function find_element($type, $value) - { - return $this->getDriver()->findElement(WebDriverBy::$type($value)); - } - - public function submit($type = 'id', $value = 'submit') - { - $element = $this->find_element($type, $value); - $element->click(); - } - - static protected function install_board() - { - global $phpbb_root_path, $phpEx, $db; - - self::recreate_database(self::$config); - - $config_file = $phpbb_root_path . "config.$phpEx"; - $config_file_dev = $phpbb_root_path . "config_dev.$phpEx"; - $config_file_test = $phpbb_root_path . "config_test.$phpEx"; - - if (file_exists($config_file)) - { - if (!file_exists($config_file_dev)) - { - rename($config_file, $config_file_dev); - } - else - { - unlink($config_file); - } - } - - $container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx); - $container = $container_builder - ->with_environment('installer') - ->without_extensions() - ->without_cache() - ->with_custom_parameters([ - 'core.disable_super_globals' => false, - 'installer.create_config_file.options' => [ - 'debug' => true, - 'environment' => 'test', - ], - 'cache.driver.class' => 'phpbb\cache\driver\file' - ]) - ->without_compiled_container() - ->get_container(); - - $container->register('installer.install_finish.notify_user')->setSynthetic(true); - $container->set('installer.install_finish.notify_user', new phpbb_mock_null_installer_task()); - $container->compile(); - - $language = $container->get('language'); - $language->add_lang(array('common', 'acp/common', 'acp/board', 'install', 'posting')); - - $iohandler_factory = $container->get('installer.helper.iohandler_factory'); - $iohandler_factory->set_environment('cli'); - $iohandler = $iohandler_factory->get(); - - $parseURL = parse_url(self::$config['phpbb_functional_url']); - - $output = new \Symfony\Component\Console\Output\NullOutput(); - $style = new \Symfony\Component\Console\Style\SymfonyStyle( - new \Symfony\Component\Console\Input\ArrayInput(array()), - $output - ); - $iohandler->set_style($style, $output); - - $installer = $container->get('installer.installer.install'); - $installer->set_iohandler($iohandler); - - // Set data - $iohandler->set_input('admin_name', 'admin'); - $iohandler->set_input('admin_pass1', 'adminadmin'); - $iohandler->set_input('admin_pass2', 'adminadmin'); - $iohandler->set_input('board_email', 'nobody@example.com'); - $iohandler->set_input('submit_admin', 'submit'); - - $iohandler->set_input('default_lang', 'en'); - $iohandler->set_input('board_name', 'yourdomain.com'); - $iohandler->set_input('board_description', 'A short text to describe your forum'); - $iohandler->set_input('submit_board', 'submit'); - - $iohandler->set_input('dbms', str_replace('phpbb\db\driver\\', '', self::$config['dbms'])); - $iohandler->set_input('dbhost', self::$config['dbhost']); - $iohandler->set_input('dbport', self::$config['dbport']); - $iohandler->set_input('dbuser', self::$config['dbuser']); - $iohandler->set_input('dbpasswd', self::$config['dbpasswd']); - $iohandler->set_input('dbname', self::$config['dbname']); - $iohandler->set_input('table_prefix', self::$config['table_prefix']); - $iohandler->set_input('submit_database', 'submit'); - - $iohandler->set_input('email_enable', true); - $iohandler->set_input('smtp_delivery', '1'); - $iohandler->set_input('smtp_host', 'nxdomain.phpbb.com'); - $iohandler->set_input('smtp_auth', 'PLAIN'); - $iohandler->set_input('smtp_user', 'nxuser'); - $iohandler->set_input('smtp_pass', 'nxpass'); - $iohandler->set_input('submit_email', 'submit'); - - $iohandler->set_input('cookie_secure', '0'); - $iohandler->set_input('server_protocol', '0'); - $iohandler->set_input('force_server_vars', $parseURL['scheme'] . '://'); - $iohandler->set_input('server_name', $parseURL['host']); - $iohandler->set_input('server_port', isset($parseURL['port']) ? (int) $parseURL['port'] : 80); - $iohandler->set_input('script_path', $parseURL['path']); - $iohandler->set_input('submit_server', 'submit'); - - $installer->run(); - - copy($config_file, $config_file_test); - - self::$install_success = true; - - if (file_exists($phpbb_root_path . 'store/install_config.php')) - { - self::$install_success = false; - @unlink($phpbb_root_path . 'store/install_config.php'); - } - - if (file_exists($phpbb_root_path . 'cache/install_lock')) - { - @unlink($phpbb_root_path . 'cache/install_lock'); - } - - global $phpbb_container; - $phpbb_container->reset(); - - $blacklist = ['phpbb_class_loader_mock', 'phpbb_class_loader_ext', 'phpbb_class_loader']; - - foreach (array_keys($GLOBALS) as $key) - { - if (is_object($GLOBALS[$key]) && !in_array($key, $blacklist, true)) - { - unset($GLOBALS[$key]); - } - } - } - - public function install_ext($extension) - { - $this->login(); - $this->admin_login(); - - $ext_path = str_replace('/', '%2F', $extension); - - $this->visit('adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=' . $ext_path . '&sid=' . $this->sid); - $this->assertNotEmpty(count($this->find_element('cssSelector', '.submit-buttons'))); - - $this->find_element('cssSelector', "input[value='Enable']")->submit(); - $this->add_lang('acp/extensions'); - - try - { - $meta_refresh = $this->find_element('cssSelector', 'meta[http-equiv="refresh"]'); - - // Wait for extension to be fully enabled - while (count($meta_refresh)) - { - preg_match('#url=.+/(adm+.+)#', $meta_refresh->getAttribute('content'), $match); - $this->getDriver()->execute(array('method' => 'post', 'url' => $match[1])); - $meta_refresh = $this->find_element('cssSelector', 'meta[http-equiv="refresh"]'); - } - } - catch (\Facebook\WebDriver\Exception\NoSuchElementException $e) - { - // Probably no refresh triggered - } - - $this->assertContainsLang('EXTENSION_ENABLE_SUCCESS', $this->find_element('cssSelector', 'div.successbox')->getText()); - - $this->logout(); - } - - protected function get_cache_driver() - { - if (!$this->cache) - { - $this->cache = new \phpbb\cache\driver\file; - } - - return $this->cache; - } - - protected function purge_cache() - { - $cache = $this->get_cache_driver(); - - $cache->purge(); - $cache->unload(); - $cache->load(); - } - - protected function get_extension_manager() - { - global $phpbb_root_path, $phpEx; - - $config = new \phpbb\config\config(array()); - $db = $this->get_db(); - $db_tools = new \phpbb\db\tools($db); - - $container = new phpbb_mock_container_builder(); - $migrator = new \phpbb\db\migrator( - $container, - $config, - $db, - $db_tools, - self::$config['table_prefix'] . 'migrations', - $phpbb_root_path, - $phpEx, - self::$config['table_prefix'], - array(), - new \phpbb\db\migration\helper() - ); - $container->set('migrator', $migrator); - $container->set('dispatcher', new phpbb_mock_event_dispatcher()); - $user = new \phpbb\user('\phpbb\datetime'); - - $extension_manager = new \phpbb\extension\manager( - $container, - $db, - $config, - $user, - self::$config['table_prefix'] . 'ext', - dirname(__FILE__) . '/', - $phpEx, - $this->get_cache_driver() - ); - - return $extension_manager; - } - - protected function get_db() - { - // so we don't reopen an open connection - if (!($this->db instanceof \phpbb\db\driver\driver_interface)) - { - $dbms = self::$config['dbms']; - /** @var \phpbb\db\driver\driver_interface $db */ - $db = new $dbms(); - $db->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport']); - $this->db = $db; - } - return $this->db; - } - - protected function logout() - { - $this->add_lang('ucp'); - - if (empty($this->sid)) - { - return; - } - - $this->visit('ucp.php?sid=' . $this->sid . '&mode=logout'); - $this->assertContains($this->lang('REGISTER'), $this->getDriver()->getPageSource()); - unset($this->sid); - - } - - /** - * Login to the ACP - * You must run login() before calling this. - */ - protected function admin_login($username = 'admin') - { - $this->add_lang('acp/common'); - - // Requires login first! - if (empty($this->sid)) - { - $this->fail('$this->sid is empty. Make sure you call login() before admin_login()'); - return; - } - - $this->getDriver()->manage()->deleteAllCookies(); - - $this->visit('adm/index.php?sid=' . $this->sid); - $this->assertContains($this->lang('LOGIN_ADMIN_CONFIRM'), $this->getDriver()->getPageSource()); - - $this->find_element('cssSelector', 'input[name=username]')->clear()->sendKeys($username); - $this->find_element('cssSelector', 'input[type=password]')->sendKeys($username . $username); - $this->find_element('cssSelector', 'input[name=login]')->click(); - $this->assertContains($this->lang('ADMIN_PANEL'), $this->find_element('cssSelector', 'h1')->getText()); - - $cookies = $this->getDriver()->manage()->getCookies(); - - // The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie - foreach ($cookies as $cookie) - { - if (substr($cookie['name'], -4) == '_sid') - { - $this->sid = $cookie['value']; - - break; - } - } - - $this->assertNotEmpty($this->sid); - } - - protected function add_lang($lang_file) - { - if (is_array($lang_file)) - { - foreach ($lang_file as $file) - { - $this->add_lang($file); - } - } - - $lang_path = __DIR__ . "/../../phpBB/language/en/$lang_file.php"; - - $lang = array(); - - if (file_exists($lang_path)) - { - include($lang_path); - } - - $this->lang = array_merge($this->lang, $lang); - } - - protected function add_lang_ext($ext_name, $lang_file) - { - if (is_array($lang_file)) - { - foreach ($lang_file as $file) - { - $this->add_lang_ext($ext_name, $file); - } - - return; - } - - $lang_path = __DIR__ . "/../../phpBB/ext/{$ext_name}/language/en/$lang_file.php"; - - $lang = array(); - - if (file_exists($lang_path)) - { - include($lang_path); - } - - $this->lang = array_merge($this->lang, $lang); - } - - protected function lang() - { - $args = func_get_args(); - $key = $args[0]; - - if (empty($this->lang[$key])) - { - throw new RuntimeException('Language key "' . $key . '" could not be found.'); - } - - $args[0] = $this->lang[$key]; - - return call_user_func_array('sprintf', $args); - } - - /** - * assertContains for language strings - * - * @param string $needle Search string - * @param string $haystack Search this - * @param string $message Optional failure message - */ - public function assertContainsLang($needle, $haystack, $message = null) - { - $this->assertContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message); - } - - /** - * assertNotContains for language strings - * - * @param string $needle Search string - * @param string $haystack Search this - * @param string $message Optional failure message - */ - public function assertNotContainsLang($needle, $haystack, $message = null) - { - $this->assertNotContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message); - } - - protected function login($username = 'admin') - { - $this->add_lang('ucp'); - - $this->getDriver()->manage()->deleteAllCookies(); - - $this->visit('ucp.php'); - $this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $this->getDriver()->getPageSource()); - - $this->getDriver()->manage()->deleteAllCookies(); - - $this->find_element('cssSelector', 'input[name=username]')->sendKeys($username); - $this->find_element('cssSelector', 'input[name=password]')->sendKeys($username . $username); - $this->find_element('cssSelector', 'input[name=login]')->click(); - $this->assertNotContains($this->lang('LOGIN'), $this->find_element('className', 'navbar')->getText()); - - $cookies = $this->getDriver()->manage()->getCookies(); - - // The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie - foreach ($cookies as $cookie) - { - if (substr($cookie['name'], -4) == '_sid') - { - $this->sid = $cookie['value']; - } - } - - $this->assertNotEmpty($this->sid); - } - - /** - * Take screenshot. Can be used for debug purposes. - * - * @throws Exception When screenshot can't be created - */ - public function take_screenshot() - { - // Change the Path to your own settings - $screenshot = time() . ".png"; - - $this->getDriver()->takeScreenshot($screenshot); - } -} diff --git a/tests/text_formatter/s9e/acp_utils_test.php b/tests/text_formatter/s9e/acp_utils_test.php new file mode 100644 index 00000000000..597dde0f909 --- /dev/null +++ b/tests/text_formatter/s9e/acp_utils_test.php @@ -0,0 +1,79 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +class phpbb_textformatter_s9e_acp_utils_test extends phpbb_test_case +{ + /** + * @dataProvider get_analyse_bbcode_tests + */ + public function test_analyse_bbcode($definition, $template, $expected) + { + $container = $this->get_test_case_helpers()->set_s9e_services(); + $factory = $container->get('text_formatter.s9e.factory'); + $acp_utils = new \phpbb\textformatter\s9e\acp_utils($factory); + $actual = $acp_utils->analyse_bbcode($definition, $template); + + $this->assertEquals($expected, $actual); + } + + public static function get_analyse_bbcode_tests() + { + return [ + [ + '[x]{TEXT}[/x]', + '{TEXT}', + [ + 'status' => 'safe', + 'name' => 'X' + ] + ], + [ + '[hr]', + '
      ', + [ + 'status' => 'safe', + 'name' => 'HR' + ] + ], + [ + '[x]{TEXT}[/x]', + '', + [ + 'status' => 'unsafe', + 'name' => 'X', + 'error_text' => 'Cannot allow unfiltered data in this context', + 'error_html' => '<script> + <xsl:apply-templates/> +</script>' + ] + ], + [ + '???', + '
      ', + [ + 'status' => 'invalid_definition', + 'error_text' => 'Cannot interpret the BBCode definition' + ] + ], + [ + '[x]{TEXT}[/x]', + ' 'invalid_template', + 'name' => 'X', + 'error_text' => "Invalid XSL: Couldn't find end of Start Tag invalid line 1\n" + ] + ], + ]; + } +} diff --git a/tests/text_formatter/s9e/bbcode_merger_test.php b/tests/text_formatter/s9e/bbcode_merger_test.php index 815539056b6..55f9bd6f132 100644 --- a/tests/text_formatter/s9e/bbcode_merger_test.php +++ b/tests/text_formatter/s9e/bbcode_merger_test.php @@ -34,7 +34,7 @@ public function test_merge_bbcodes($usage_without, $template_without, $usage_wit $this->assertSame($expected_template, $merged['template']); } - public function get_merge_bbcodes_tests() + public static function get_merge_bbcodes_tests() { return [ [ @@ -275,6 +275,22 @@ public function get_merge_bbcodes_tests()

       

      ' ], + [ + // https://www.phpbb.com/community/viewtopic.php?f=438&t=2530451 + '[issue]{NUMBER}[/issue]', + ' Issue #{NUMBER}', + + '[issue={SIMPLETEXT}]{NUMBER}[/issue]', + ' Issue #{NUMBER} ({SIMPLETEXT})', + + '[issue={SIMPLETEXT?}]{NUMBER}[/issue]', + ' + + //issues/ Issue # () + /default/issues/ Issue # + + ' + ], ]; } } diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php index 8887b9daeee..76b22a78454 100644 --- a/tests/text_formatter/s9e/default_formatting_test.php +++ b/tests/text_formatter/s9e/default_formatting_test.php @@ -45,12 +45,12 @@ public function test_default_formatting($original, $expected, $setup = null) $this->assertSame($expected, $renderer->render($parsed_text)); } - public function get_default_formatting_tests() + public static function get_default_formatting_tests() { return array( array( '[b]bold[/b]', - 'bold' + 'bold' ), array( '[u]underlined[/u]', @@ -58,7 +58,7 @@ public function get_default_formatting_tests() ), array( '[i]italic[/i]', - 'italic' + 'italic' ), array( '[color=#FF0000]colored[/color]', @@ -70,7 +70,7 @@ public function get_default_formatting_tests() ), array( '[size=75]smaller[/size]', - 'smaller' + 'smaller' ), array( '[quote]quoted[/quote]', @@ -82,7 +82,7 @@ public function get_default_formatting_tests() ), array( '[code]unparsed code[/code]', - '

      CODE: Select all

      unparsed code
      ' + '

      Code: Select all

      unparsed code
      ' ), array( '[list]no item[/list]', @@ -132,6 +132,10 @@ public function get_default_formatting_tests() '[img]https://area51.phpbb.com/images/area51.png[/img]', 'Image' ), + array( + '[img]foo://area51.phpbb.com/images/area51.png[/img]', + '[img]foo://area51.phpbb.com/images/area51.png[/img]' + ), array( '[url]https://area51.phpbb.com/[/url]', 'https://area51.phpbb.com/' @@ -180,40 +184,40 @@ public function get_default_formatting_tests() array( // Allow textual bbcodes in textual bbcodes '[b]bold [i]bold + italic[/i][/b]', - 'bold bold + italic' + 'bold bold + italic' ), array( // Allow textual bbcodes in url with description '[url=https://area51.phpbb.com/]Area51 [i]italic[/i][/url]', - 'Area51 italic' + 'Area51 italic' ), array( // Allow url with description in textual bbcodes '[i]italic [url=https://area51.phpbb.com/]Area51[/url][/i]', - 'italic Area51' + 'italic Area51' ), array( // Do not parse textual bbcodes in code '[code]unparsed code [b]bold [i]bold + italic[/i][/b][/code]', - '

      CODE: Select all

      unparsed code [b]bold [i]bold + italic[/i][/b]
      ' + '

      Code: Select all

      unparsed code [b]bold [i]bold + italic[/i][/b]
      ' ), array( // Do not parse quote bbcodes in code '[code]unparsed code [quote="username"]quoted[/quote][/code]', - '

      CODE: Select all

      unparsed code [quote="username"]quoted[/quote]
      ' + '

      Code: Select all

      unparsed code [quote="username"]quoted[/quote]
      ' ), array( // Textual bbcode nesting into textual bbcode '[b]bold [i]bold + italic[/b] italic[/i]', - 'bold bold + italic italic' + 'bold bold + italic italic' ), array( "[code]\tline1\n line2[/code]", - '

      CODE: Select all

      ' . "\tline1\n  line2
      " + '

      Code: Select all

      ' . "\tline1\n  line2
      " ), array( "[code]\n\tline1\n line2[/code]", - '

      CODE: Select all

      ' . "\tline1\n  line2
      " + '

      Code: Select all

      ' . "\tline1\n  line2
      " ), array( '... http://example.org ...', @@ -253,6 +257,14 @@ public function get_default_formatting_tests() '[url=http://example.org/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx[/url]', 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ), + array( + '[url=http://example.org/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]http://example.org/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx[/url]', + 'http://example.org/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' + ), + array( + '[url]//localhost/phpbb/viewforum.php?f=1[/url]', + 'viewforum.php?f=1' + ), array( '[quote="[url=http://example.org]xxx[/url]"]...[/quote]', '
      xxx wrote:...
      ' @@ -271,7 +283,7 @@ public function get_default_formatting_tests() ), array( '[quote=Username post_id=123]...[/quote]', - '
      Username wrote: ↑...
      ' + '
      Username wrote: ...
      ' ), array( // Users are not allowed to submit their own URL for the post @@ -280,7 +292,7 @@ public function get_default_formatting_tests() ), array( '[quote=Username time=58705871]...[/quote]', - '
      Username wrote:
      1971-11-11 11:11:11
      ...
      ' + '
      Username wrote:1971-11-11 11:11:11...
      ' ), array( '[quote=Username user_id=123]...[/quote]', @@ -298,11 +310,11 @@ public function get_default_formatting_tests() ), array( "Emoji: \xF0\x9F\x98\x80", - 'Emoji: ' . ' + "Emoji: \xF0\x9F\x98\x80", ), array( "Emoji: \xF0\x9F\x98\x80", - "Emoji: \xF0\x9F\x98\x80", + "Emoji: \xF0\x9F\x98\x80", function ($container) { $container->get('text_formatter.renderer')->set_viewsmilies(false); diff --git a/tests/text_formatter/s9e/factory_test.php b/tests/text_formatter/s9e/factory_test.php index 1505609684e..b62a21106e9 100644 --- a/tests/text_formatter/s9e/factory_test.php +++ b/tests/text_formatter/s9e/factory_test.php @@ -15,7 +15,17 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case { - public function setUp() + /** + * @var phpbb_mock_cache + */ + private $cache; + + /** + * @var phpbb_mock_event_dispatcher + */ + private $dispatcher; + + protected function setUp(): void { $this->cache = new phpbb_mock_cache; $this->dispatcher = new phpbb_mock_event_dispatcher; @@ -87,7 +97,6 @@ public function run_configurator_assertions($configurator) $this->assertTrue(isset($configurator->BBCodes['CODE'])); $this->assertTrue(isset($configurator->BBCodes['COLOR'])); $this->assertTrue(isset($configurator->BBCodes['EMAIL'])); - $this->assertTrue(isset($configurator->BBCodes['FLASH'])); $this->assertTrue(isset($configurator->BBCodes['I'])); $this->assertTrue(isset($configurator->BBCodes['IMG'])); $this->assertTrue(isset($configurator->BBCodes['LIST'])); @@ -147,7 +156,7 @@ public function test_tidy() $factory->tidy(); $this->assertFileExists($new_file, 'The current renderer has been deleted'); - $this->assertFileNotExists($old_file, 'The old renderer has not been deleted'); + $this->assertFileDoesNotExist($old_file, 'The old renderer has not been deleted'); unlink($new_file); } @@ -272,7 +281,7 @@ public function test_malformed_bbcodes() $log = $this->getMockBuilder('phpbb\\log\\log_interface')->getMock(); $log->expects($this->once()) ->method('add') - ->with('critical', null, null, 'LOG_BBCODE_CONFIGURATION_ERROR', false, ['[x !x]{TEXT}[/x]', 'Cannot interpret the BBCode definition']); + ->with('critical', ANONYMOUS, '', 'LOG_BBCODE_CONFIGURATION_ERROR', false, ['[x !x]{TEXT}[/x]', 'Cannot interpret the BBCode definition']); $container = new phpbb_mock_container_builder; $container->set('log', $log); @@ -287,23 +296,19 @@ public function test_malformed_bbcodes() public function test_configure_events() { $this->dispatcher = $this->createMock('phpbb\\event\\dispatcher_interface'); + $matcher = $this->exactly(2); $this->dispatcher - ->expects($this->at(0)) + ->expects($matcher) ->method('trigger_event') - ->with( - 'core.text_formatter_s9e_configure_before', - $this->callback(array($this, 'configure_event_callback')) - ) - ->will($this->returnArgument(1)); - $this->dispatcher - ->expects($this->at(1)) - ->method('trigger_event') - ->with( - 'core.text_formatter_s9e_configure_after', - $this->callback(array($this, 'configure_event_callback')) - ) - ->will($this->returnArgument(1)); - + ->willReturnCallback(function($event, $vars) use ($matcher) { + $callNr = $matcher->numberOfInvocations(); + match($callNr) { + 1 => $this->assertEquals('core.text_formatter_s9e_configure_before', $event), + 2 => $this->assertEquals('core.text_formatter_s9e_configure_after', $event), + }; + $this->assertTrue($this->configure_event_callback($vars)); + return $vars; + }); $this->get_factory()->get_configurator(); } diff --git a/tests/text_formatter/s9e/fixtures/default_formatting.xml b/tests/text_formatter/s9e/fixtures/default_formatting.xml index 2b7236fb304..54ac66db324 100644 --- a/tests/text_formatter/s9e/fixtures/default_formatting.xml +++ b/tests/text_formatter/s9e/fixtures/default_formatting.xml @@ -446,7 +446,7 @@ &copy; phpBB Group 1 prosilver - kNg= + //g= 0 diff --git a/tests/text_formatter/s9e/fixtures/factory.xml b/tests/text_formatter/s9e/fixtures/factory.xml index 9ae52e97476..728ef3a3709 100644 --- a/tests/text_formatter/s9e/fixtures/factory.xml +++ b/tests/text_formatter/s9e/fixtures/factory.xml @@ -95,7 +95,7 @@ &copy; phpBB Group 1 prosilver - kNg= + //g= 0 diff --git a/tests/text_formatter/s9e/fixtures/mention.xml b/tests/text_formatter/s9e/fixtures/mention.xml new file mode 100644 index 00000000000..13553b10810 --- /dev/null +++ b/tests/text_formatter/s9e/fixtures/mention.xml @@ -0,0 +1,116 @@ + + + + group_id + group_name + group_type + group_colour + group_desc + + 1 + Normal group + 0 + + + + + 2 + Hidden group + 2 + + + + + 3 + Hidden group we are a member of + 2 + + + +
      + + user_id + username + username_clean + user_type + user_lastvisit + user_colour + user_permissions + user_sig + + 2 + myself + myself + 0 + 0 + + + + + + 3 + test + test + 0 + 0 + + + + + + 4 + group_member_normal + group_member_normal + 0 + 0 + + + + + + 5 + group_member_hidden + group_member_hidden + 0 + 0 + + + + + + 6 + group_member_visible + group_member_visible + 0 + 0 + + + + +
      + + user_id + group_id + user_pending + + 2 + 3 + 0 + + + 4 + 1 + 0 + + + 5 + 2 + 0 + + + 6 + 3 + 0 + +
      +       diff --git a/tests/text_formatter/s9e/fixtures/styles/bar/template/bbcode.html b/tests/text_formatter/s9e/fixtures/styles/bar/template/bbcode.html index 76a35542be6..a3c8bff6132 100644 --- a/tests/text_formatter/s9e/fixtures/styles/bar/template/bbcode.html +++ b/tests/text_formatter/s9e/fixtures/styles/bar/template/bbcode.html @@ -36,5 +36,3 @@ {DESCRIPTION} {DESCRIPTION} - - diff --git a/tests/text_formatter/s9e/fixtures/styles/barplus/template/bbcode.html b/tests/text_formatter/s9e/fixtures/styles/barplus/template/bbcode.html index fad8d828fd1..4bc2ed1054f 100644 --- a/tests/text_formatter/s9e/fixtures/styles/barplus/template/bbcode.html +++ b/tests/text_formatter/s9e/fixtures/styles/barplus/template/bbcode.html @@ -36,5 +36,3 @@ {DESCRIPTION} {DESCRIPTION} - - diff --git a/tests/text_formatter/s9e/fixtures/styles/foo/template/bbcode.html b/tests/text_formatter/s9e/fixtures/styles/foo/template/bbcode.html index 3e38d13a329..011230155d6 100644 --- a/tests/text_formatter/s9e/fixtures/styles/foo/template/bbcode.html +++ b/tests/text_formatter/s9e/fixtures/styles/foo/template/bbcode.html @@ -36,5 +36,3 @@ {DESCRIPTION} {DESCRIPTION} - - diff --git a/tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html b/tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html index 22be395499b..9c3d55f5986 100644 --- a/tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html +++ b/tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html @@ -13,6 +13,9 @@ {% for quote_close in loops.quote_close %}
    {% endfor %} {% for quote_extended in loops.quote_extended %}
    + + + uncited @@ -38,7 +41,7 @@ ↑ -
    +     @@ -71,5 +74,3 @@ {% for url in loops.url %}{{ DESCRIPTION }}{% endfor %} {% for email in loops.email %}{{ DESCRIPTION }}{% endfor %} - -{% for flash in loops.flash %}{% endfor %} diff --git a/tests/text_formatter/s9e/fixtures/styles/unsafe/template/bbcode.html b/tests/text_formatter/s9e/fixtures/styles/unsafe/template/bbcode.html index f3932f9b78e..c99dba3e656 100644 --- a/tests/text_formatter/s9e/fixtures/styles/unsafe/template/bbcode.html +++ b/tests/text_formatter/s9e/fixtures/styles/unsafe/template/bbcode.html @@ -36,5 +36,3 @@ {DESCRIPTION} {DESCRIPTION} - - diff --git a/tests/text_formatter/s9e/link_helper_test.php b/tests/text_formatter/s9e/link_helper_test.php new file mode 100644 index 00000000000..762d67f8838 --- /dev/null +++ b/tests/text_formatter/s9e/link_helper_test.php @@ -0,0 +1,35 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +class phpbb_textformatter_s9e_link_helper_test extends phpbb_test_case +{ + public function test_does_not_override_autoimage() + { + $container = $this->get_test_case_helpers()->set_s9e_services(); + $configurator = $container->get('text_formatter.s9e.factory')->get_configurator(); + + $configurator->Autoimage; + extract($configurator->finalize()); + + $original = 'http://localhost/path_to_long_image_filename_0123456789.png'; + $expected = ' + + + http://localhost/path_to_long_image_filename_0123456789.png + + + '; + + $this->assertXmlStringEqualsXmlString($expected, $parser->parse($original)); + } +} diff --git a/tests/text_formatter/s9e/mention_helper_test.php b/tests/text_formatter/s9e/mention_helper_test.php new file mode 100644 index 00000000000..bebfd2c4aa9 --- /dev/null +++ b/tests/text_formatter/s9e/mention_helper_test.php @@ -0,0 +1,120 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use Symfony\Component\DependencyInjection\ContainerBuilder; + +class mention_helper_test extends phpbb_database_test_case +{ + protected $db, $container, $user, $auth; + + /** + * @var \phpbb\textformatter\s9e\mention_helper + */ + protected $mention_helper; + + public function getDataSet() + { + return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/mention.xml'); + } + + public function setUp(): void + { + parent::setUp(); + + global $auth, $db, $cache, $phpbb_container, $phpEx, $phpbb_root_path; + + // Disable caching for this test class + $cache = null; + + // Database + $this->db = $this->new_dbal(); + $db = $this->db; + + // Auth + $auth = $this->createMock('\phpbb\auth\auth'); + $auth->expects($this->any()) + ->method('acl_gets') + ->with('a_group', 'a_groupadd', 'a_groupdel') + ->willReturn(false) + ; + + // Language + $lang = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + + // User + $user = $this->createMock('\phpbb\user'); + $user->ip = ''; + $user->data = array( + 'user_id' => 2, + 'username' => 'myself', + 'is_registered' => true, + 'user_colour' => '', + ); + + // Container + $phpbb_container = new phpbb_mock_container_builder(); + + $phpbb_container->set('dbal.conn', $db); + $phpbb_container->set('auth', $auth); + $phpbb_container->set('user', $user); + + $this->get_test_case_helpers()->set_s9e_services($phpbb_container); + + $this->mention_helper = $phpbb_container->get('text_formatter.s9e.mention_helper'); + } + + public static function inject_metadata_data() + { + return [ + [ + '[mention=u:3]test[/mention]', + 'mode=viewprofile&u=3', + ], + [ + '[mention=g:3]test[/mention]', + 'mode=group&g=3', + ], + ]; + } + + /** + * @dataProvider inject_metadata_data + */ + public function test_inject_metadata($incoming_xml, $expected_profile_substring) + { + $result = $this->mention_helper->inject_metadata($incoming_xml); + $this->assertStringContainsString($expected_profile_substring, $result); + } + + public static function get_mentioned_user_ids_data() + { + return [ + [ + '[mention=u:3]test[/mention][mention=u:4]test[/mention][mention=u:5]test[/mention]', + [3, 4, 5], + ], + [ + '[mention=g:1]test[/mention][mention=g:2]test[/mention][mention=g:3]test[/mention]', + [4, 2, 6], + ], + ]; + } + + /** + * @dataProvider get_mentioned_user_ids_data + */ + public function test_get_mentioned_user_ids($incoming_xml, $expected_result) + { + $this->assertEqualsCanonicalizing($expected_result, $this->mention_helper->get_mentioned_user_ids($incoming_xml)); + } +} diff --git a/tests/text_formatter/s9e/parser_test.php b/tests/text_formatter/s9e/parser_test.php index e10ebd29ee9..61c4f340e26 100644 --- a/tests/text_formatter/s9e/parser_test.php +++ b/tests/text_formatter/s9e/parser_test.php @@ -101,16 +101,19 @@ public function test_regenerate_on_cache_miss() public function test_options($adapter_method, $adapter_arg, $concrete_method, $concrete_arg) { $mock = $this->getMockBuilder('s9e\\TextFormatter\\Parser') - ->setMethods(array($concrete_method)) + ->onlyMethods([$concrete_method]) ->disableOriginalConstructor() ->getMock(); - foreach ((array) $concrete_arg as $i => $concrete_arg) - { - $mock->expects($this->at($i)) - ->method($concrete_method) - ->with($concrete_arg); - } + $concrete_args = (array) $concrete_arg; + $matcher = $this->exactly(count($concrete_args)); + $mock->expects($matcher) + ->method($concrete_method) + ->willReturnCallback(function ($arg) use ($concrete_args, $matcher) { + $callNr = $matcher->numberOfInvocations(); + $this->assertEquals($arg, $concrete_args[$callNr - 1]); + }); + $cache = new phpbb_mock_cache; $cache->put('_foo_parser', $mock); @@ -128,7 +131,7 @@ public function test_options($adapter_method, $adapter_arg, $concrete_method, $c call_user_func_array(array($parser, $adapter_method), (array) $adapter_arg); } - public function get_options_tests() + public static function get_options_tests() { return array( array( @@ -141,11 +144,11 @@ public function get_options_tests() ), array( 'disable_magic_url', null, - 'disablePlugin', array('Autoemail', 'Autolink') + 'disablePlugin', ['Autoemail', 'Autolink'] ), array( 'disable_smilies', null, - 'disablePlugin', 'Emoticons' + 'disablePlugin', ['Emoticons', 'Emoji'] ), array( 'enable_bbcode', 'url', @@ -157,11 +160,11 @@ public function get_options_tests() ), array( 'enable_magic_url', null, - 'enablePlugin', array('Autoemail', 'Autolink') + 'enablePlugin', ['Autoemail', 'Autolink'] ), array( 'enable_smilies', null, - 'enablePlugin', 'Emoticons' + 'enablePlugin', ['Emoticons', 'Emoji'] ) ); } @@ -207,22 +210,6 @@ public function test_parse_event() ->expects($this->any()) ->method('trigger_event') ->will($this->returnArgument(1)); - $dispatcher - ->expects($this->at(1)) - ->method('trigger_event') - ->with( - 'core.text_formatter_s9e_parse_before', - $this->callback(array($this, 'parse_before_event_callback')) - ) - ->will($this->returnArgument(1)); - $dispatcher - ->expects($this->at(2)) - ->method('trigger_event') - ->with( - 'core.text_formatter_s9e_parse_after', - $this->callback(array($this, 'parse_after_event_callback')) - ) - ->will($this->returnArgument(1)); $parser = new \phpbb\textformatter\s9e\parser( $container->get('cache.driver'), @@ -230,6 +217,23 @@ public function test_parse_event() $container->get('text_formatter.s9e.factory'), $dispatcher ); + + $matcher = $this->exactly(2); + $dispatcher + ->expects($matcher) + ->method('trigger_event') + ->willReturnCallback(function($event, $vars) use ($matcher) { + $callNr = $matcher->numberOfInvocations(); + match($callNr) { + 1 => $this->assertEquals('core.text_formatter_s9e_parse_before', $event), + 2 => $this->assertEquals('core.text_formatter_s9e_parse_after', $event), + }; + match($callNr) { + 1 => $this->assertTrue($this->parse_before_event_callback($vars)), + 2 => $this->assertTrue($this->parse_after_event_callback($vars)), + }; + return $vars; + }); $parser->parse('...'); } diff --git a/tests/text_formatter/s9e/renderer_test.php b/tests/text_formatter/s9e/renderer_test.php index 672069590a0..b39a620931f 100644 --- a/tests/text_formatter/s9e/renderer_test.php +++ b/tests/text_formatter/s9e/renderer_test.php @@ -61,7 +61,10 @@ public function test_regenerate_on_cache_miss() ->getMock(); $factory->expects($this->once()) ->method('regenerate') - ->will($this->returnValue(array('parser' => $mock))); + ->will($this->returnValue([ + 'parser' => $mock, + 'renderer' => $mock, + ])); $renderer = new \phpbb\textformatter\s9e\renderer( $cache, @@ -90,7 +93,7 @@ public function test_options($original, $expected, $calls) $this->assertSame($expected, $renderer->render($original)); } - public function get_options_cases() + public static function get_options_cases() { return array( array( @@ -103,11 +106,6 @@ public function get_options_cases() 'apple', array('set_viewcensors' => false) ), - array( - '[flash=123,456]http://example.org/foo.swf[/flash]', - '', - array('set_viewflash' => true) - ), array( '[img]http://example.org/foo.png[/img]', 'Image', @@ -143,7 +141,7 @@ public function test_default_options($original, $expected, $setup = null) $this->assertSame($expected, $container->get('text_formatter.renderer')->render($original)); } - public function get_default_options_cases() + public static function get_default_options_cases() { return array( array( @@ -160,6 +158,7 @@ function ($phpbb_container) $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); + $user->data['user_options'] = 230271; $user->optionset('viewcensors', false); $phpbb_container->set('user', $user); @@ -175,6 +174,7 @@ function ($phpbb_container) $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); + $user->data['user_options'] = 230271; $user->optionset('viewcensors', false); $config = new \phpbb\config\config(array('allow_nocensors' => true)); @@ -193,6 +193,7 @@ function ($phpbb_container, $test) $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); + $user->data['user_options'] = 230271; $user->optionset('viewcensors', false); $config = new \phpbb\config\config(array('allow_nocensors' => true)); @@ -208,25 +209,6 @@ function ($phpbb_container, $test) $phpbb_container->set('auth', $auth); } ), - array( - '[flash=123,456]http://localhost/foo.swf[/flash]', - '' - ), - array( - '[flash=123,456]http://localhost/foo.swf[/flash]', - 'http://localhost/foo.swf', - function ($phpbb_container) - { - global $phpbb_root_path, $phpEx; - - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->optionset('viewflash', false); - - $phpbb_container->set('user', $user); - } - ), array( '[img]http://localhost/mrgreen.gif[/img]', 'Image' @@ -241,6 +223,7 @@ function ($phpbb_container) $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); + $user->data['user_options'] = 230271; $user->optionset('viewimg', false); $phpbb_container->set('user', $user); @@ -260,7 +243,8 @@ function ($phpbb_container) $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->optionset('smilies', false); + $user->data['user_options'] = 230271; + $user->optionset('viewsmilies', false); $phpbb_container->set('user', $user); } @@ -294,11 +278,10 @@ public function test_get_option($option_name) $this->assertTrue($renderer->{'get_' . $option_name}()); } - public function get_option_names() + public static function get_option_names() { return array( array('viewcensors'), - array('viewflash'), array('viewimg'), array('viewsmilies') ); @@ -429,22 +412,6 @@ public function test_render_event() ->expects($this->any()) ->method('trigger_event') ->will($this->returnArgument(1)); - $dispatcher - ->expects($this->at(1)) - ->method('trigger_event') - ->with( - 'core.text_formatter_s9e_render_before', - $this->callback(array($this, 'render_before_event_callback')) - ) - ->will($this->returnArgument(1)); - $dispatcher - ->expects($this->at(2)) - ->method('trigger_event') - ->with( - 'core.text_formatter_s9e_render_after', - $this->callback(array($this, 'render_after_event_callback')) - ) - ->will($this->returnArgument(1)); $renderer = new \phpbb\textformatter\s9e\renderer( $container->get('cache.driver'), @@ -453,6 +420,23 @@ public function test_render_event() $container->get('text_formatter.s9e.factory'), $dispatcher ); + + $matcher = $this->exactly(2); + $dispatcher + ->expects($matcher) + ->method('trigger_event') + ->willReturnCallback(function($event, $vars) use ($matcher) { + $callNr = $matcher->numberOfInvocations(); + match($callNr) { + 1 => $this->assertEquals('core.text_formatter_s9e_render_before', $event), + 2 => $this->assertEquals('core.text_formatter_s9e_render_after', $event), + }; + match($callNr) { + 1 => $this->assertTrue($this->render_before_event_callback($vars)), + 2 => $this->assertTrue($this->render_after_event_callback($vars)), + }; + return $vars; + }); $renderer->render('...'); } @@ -460,8 +444,8 @@ public function render_before_event_callback($vars) { return isset($vars['renderer']) && $vars['renderer'] instanceof \phpbb\textformatter\s9e\renderer - && isset($vars['xml']) - && $vars['xml'] === '...'; + && isset($vars['text']) + && $vars['text'] === '...'; } public function render_after_event_callback($vars) diff --git a/tests/text_formatter/s9e/utils_test.php b/tests/text_formatter/s9e/utils_test.php index 719d3cda882..ecda57d8686 100644 --- a/tests/text_formatter/s9e/utils_test.php +++ b/tests/text_formatter/s9e/utils_test.php @@ -24,7 +24,7 @@ public function test_unparse($original, $expected) $this->assertSame($expected, $utils->unparse($original)); } - public function get_unparse_tests() + public static function get_unparse_tests() { return array( array( @@ -53,20 +53,24 @@ public function test_clean_formatting($original, $expected) $this->assertSame($expected, $utils->clean_formatting($original)); } - public function get_clean_formatting_tests() + public static function get_clean_formatting_tests() { return array( array( 'Plain text', 'Plain text' ), + array( + 'Plain & boring', + 'Plain & boring' + ), array( "Multi
    \nline    ", "Multi\nline" ), array( - '[b]bold[/b]', - ' bold ' + '[b]bold[/b] & [i]italic[/i]', + ' bold & italic ' ) ); } @@ -83,7 +87,7 @@ public function test_get_outermost_quote_authors($original, $expected) $this->assertSame($expected, $utils->get_outermost_quote_authors($parser->parse($original))); } - public function get_outermost_quote_authors_tests() + public static function get_outermost_quote_authors_tests() { return array( array( @@ -120,7 +124,7 @@ public function test_generate_quote($text, $params, $expected) $this->assertSame($expected, $utils->generate_quote($text, $params)); } - public function get_generate_quote_tests() + public static function get_generate_quote_tests() { return array( array( @@ -244,7 +248,7 @@ public function test_remove_bbcode($original, $name, $depth, $expected) $this->assertSame($expected, $actual); } - public function get_remove_bbcode_tests() + public static function get_remove_bbcode_tests() { return array( array( diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php index eda2bbb1b32..9398c42e6ab 100644 --- a/tests/text_processing/censor_text_test.php +++ b/tests/text_processing/censor_text_test.php @@ -13,7 +13,7 @@ class phpbb_text_processing_censor_text_test extends phpbb_test_case { - public function censor_text_data() + public static function censor_text_data() { global $cache, $user; $cache = new phpbb_mock_cache; diff --git a/tests/text_processing/decode_message_test.php b/tests/text_processing/decode_message_test.php index e2402e721aa..d948dd61483 100644 --- a/tests/text_processing/decode_message_test.php +++ b/tests/text_processing/decode_message_test.php @@ -13,7 +13,7 @@ class phpbb_text_processing_decode_message_test extends phpbb_test_case { - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -33,7 +33,7 @@ public function test_legacy($original, $expected, $bbcode_uid = '') $this->assertSame($expected, $actual); } - public function get_legacy_tests() + public static function get_legacy_tests() { return array( array( @@ -86,7 +86,7 @@ public function test_text_formatter($original, $expected) $this->assertSame($expected, $actual); } - public function get_text_formatter_tests() + public static function get_text_formatter_tests() { return array( array( diff --git a/tests/text_processing/generate_text_for_display_test.php b/tests/text_processing/generate_text_for_display_test.php index 22d6d26c75c..45162ce9c36 100644 --- a/tests/text_processing/generate_text_for_display_test.php +++ b/tests/text_processing/generate_text_for_display_test.php @@ -13,7 +13,7 @@ class phpbb_text_processing_generate_text_for_display_test extends phpbb_test_case { - public function setUp() + protected function setUp(): void { global $cache, $user, $phpbb_dispatcher; @@ -21,7 +21,6 @@ public function setUp() $phpbb_dispatcher = new phpbb_mock_event_dispatcher; $config = new \phpbb\config\config(array()); - set_config(null, null, null, $config); } /** @@ -37,8 +36,8 @@ public function test_legacy($original, $expected, $uid = '', $bitfield = '', $fl $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); + $user->data['user_options'] = 230271; $user->optionset('viewcensors', true); - $user->optionset('viewflash', true); $user->optionset('viewimg', true); $user->optionset('viewsmilies', true); @@ -47,7 +46,7 @@ public function test_legacy($original, $expected, $uid = '', $bitfield = '', $fl $this->assertSame($expected, $actual); } - public function get_legacy_tests() + public static function get_legacy_tests() { return array( array( @@ -72,6 +71,7 @@ public function test_censor_is_restored() $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); + $user->data['user_options'] = 230271; // Do not ignore word censoring by user (switch censoring on in UCP) $user->optionset('viewcensors', true); @@ -132,7 +132,7 @@ public function test_text_formatter($original, $expected, $censor_text = true, $ $this->assertSame($expected, generate_text_for_display($original, '', '', 0, $censor_text)); } - public function get_text_formatter_tests() + public static function get_text_formatter_tests() { return array( array( @@ -157,26 +157,6 @@ public function get_text_formatter_tests() 'apple', false ), - array( - '[flash=123,456]http://localhost/foo.swf[/flash]', - '' - ), - array( - '[flash=123,456]http://localhost/foo.swf[/flash]', - 'http://localhost/foo.swf', - true, - function ($phpbb_container) - { - global $phpbb_root_path, $phpEx; - - $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->optionset('viewflash', false); - - $phpbb_container->set('user', $user); - } - ), array( '[img]http://localhost/mrgreen.gif[/img]', 'Image' @@ -192,6 +172,7 @@ function ($phpbb_container) $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); + $user->data['user_options'] = 230271; $user->optionset('viewimg', false); $phpbb_container->set('user', $user); @@ -212,7 +193,8 @@ function ($phpbb_container) $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $user = new \phpbb\user($lang, '\phpbb\datetime'); - $user->optionset('smilies', false); + $user->data['user_options'] = 230271; + $user->optionset('viewsmilies', false); $phpbb_container->set('user', $user); } diff --git a/tests/text_processing/generate_text_for_edit_test.php b/tests/text_processing/generate_text_for_edit_test.php index 8258a196f5f..a6d08fe364c 100644 --- a/tests/text_processing/generate_text_for_edit_test.php +++ b/tests/text_processing/generate_text_for_edit_test.php @@ -31,7 +31,7 @@ public function test_legacy($original, $expected, $uid = '', $flags = 0) $this->assertSame($expected, $return['text']); } - public function get_legacy_tests() + public static function get_legacy_tests() { return array( array( @@ -69,7 +69,7 @@ public function test_text_formatter($original, $expected) $this->assertSame($expected, $return['text']); } - public function get_text_formatter_tests() + public static function get_text_formatter_tests() { return array( array( diff --git a/tests/text_processing/generate_text_for_storage_test.php b/tests/text_processing/generate_text_for_storage_test.php index f0588fec4fc..c2aa7d2db6b 100644 --- a/tests/text_processing/generate_text_for_storage_test.php +++ b/tests/text_processing/generate_text_for_storage_test.php @@ -13,14 +13,13 @@ class phpbb_text_processing_generate_text_for_storage_test extends phpbb_test_case { - public function setUp() + protected function setUp(): void { global $config, $phpbb_container, $phpbb_dispatcher; parent::setUp(); $config = new \phpbb\config\config(array()); - set_config(null, null, null, $config); $phpbb_container = new phpbb_mock_container_builder; $phpbb_container->set('config', $config); @@ -32,7 +31,7 @@ public function setUp() /** * @dataProvider get_text_formatter_tests */ - public function test_text_formatter($original, $expected, $allow_bbcode, $allow_urls, $allow_smilies, $allow_img_bbcode, $allow_flash_bbcode, $allow_quote_bbcode, $allow_url_bbcode, $setup = null) + public function test_text_formatter($original, $expected, $allow_bbcode, $allow_urls, $allow_smilies, $allow_img_bbcode, $allow_quote_bbcode, $allow_url_bbcode, $setup = null) { $actual = $original; $uid = ''; @@ -44,12 +43,12 @@ public function test_text_formatter($original, $expected, $allow_bbcode, $allow_ $setup(); } - generate_text_for_storage($actual, $uid, $bitfield, $flags, $allow_bbcode, $allow_urls, $allow_smilies, $allow_img_bbcode, $allow_flash_bbcode, $allow_quote_bbcode, $allow_url_bbcode); + generate_text_for_storage($actual, $uid, $bitfield, $flags, $allow_bbcode, $allow_urls, $allow_smilies, $allow_img_bbcode, $allow_quote_bbcode, $allow_url_bbcode); $this->assertSame($expected, $actual); } - public function get_text_formatter_tests() + public static function get_text_formatter_tests() { return array( array( @@ -61,7 +60,6 @@ public function get_text_formatter_tests() true, true, true, - true, ), array( 'Hello [url=http://example.org]world[/url] :)', @@ -72,7 +70,6 @@ public function get_text_formatter_tests() true, true, true, - true, ), array( '&<>"\'', @@ -83,7 +80,6 @@ public function get_text_formatter_tests() true, true, true, - true, ), array( '[b]..[/b] http://example.org :) [img]http://example.org/img.png[/img] [flash=123,123]http://example.org/flash.swf[/flash] [quote]...[/quote] [url]http://example.org[/url]', @@ -94,7 +90,6 @@ public function get_text_formatter_tests() false, false, false, - false, ), array( '[b]..[/b] http://example.org :) [img]http://example.org/img.png[/img] [flash=123,123]http://example.org/flash.swf[/flash] [quote]...[/quote] [url]http://example.org[/url]', @@ -105,7 +100,6 @@ public function get_text_formatter_tests() false, false, false, - false, ), array( '[b]..[/b] http://example.org :) [img]http://example.org/img.png[/img] [flash=123,123]http://example.org/flash.swf[/flash] [quote]...[/quote] [url]http://example.org[/url]', @@ -115,7 +109,6 @@ public function get_text_formatter_tests() false, false, false, - false, true, ), array( @@ -127,7 +120,6 @@ public function get_text_formatter_tests() false, false, false, - false, ), array( '[b]..[/b] http://example.org :) [img]http://example.org/img.png[/img] [flash=123,123]http://example.org/flash.swf[/flash] [quote]...[/quote] [url]http://example.org[/url]', @@ -138,16 +130,14 @@ public function get_text_formatter_tests() true, false, false, - false, ), array( '[b]..[/b] http://example.org :) [img]http://example.org/img.png[/img] [flash=123,123]http://example.org/flash.swf[/flash] [quote]...[/quote] [url]http://example.org[/url]', - '[b]..[/b] http://example.org :) [img]http://example.org/img.png[/img] [flash=123,123]http://example.org/flash.swf[/flash] [quote]...[/quote] [url]http://example.org[/url]', + '[b]..[/b] http://example.org :) [img]http://example.org/img.png[/img] [flash=123,123]http://example.org/flash.swf[/flash] [quote]...[/quote] [url]http://example.org[/url]', true, false, false, false, - true, false, false, ), @@ -158,7 +148,6 @@ public function get_text_formatter_tests() false, false, false, - false, true, false, ), @@ -170,7 +159,6 @@ public function get_text_formatter_tests() false, false, false, - false, true, ), ); diff --git a/tests/text_processing/make_clickable_test.php b/tests/text_processing/make_clickable_test.php index 3c8539c6121..e09d98bfdba 100644 --- a/tests/text_processing/make_clickable_test.php +++ b/tests/text_processing/make_clickable_test.php @@ -13,7 +13,7 @@ class phpbb_text_processing_make_clickable_test extends phpbb_test_case { - public function make_clickable_data() + public static function make_clickable_data() { // value => whether it should work $prefix_texts = array( @@ -101,7 +101,7 @@ public function test_make_clickable($input, $expected) $this->assertEquals($expected, $result, $label); } - public function make_clickable_mixed_serverurl_data() + public static function make_clickable_mixed_serverurl_data() { $urls = array( 'http://thisdomain.org' => array('tag' => 'm', 'url' => false, 'text' => false), diff --git a/tests/text_processing/message_parser_test.php b/tests/text_processing/message_parser_test.php index a3dbf644f6b..35dcb4b5666 100644 --- a/tests/text_processing/message_parser_test.php +++ b/tests/text_processing/message_parser_test.php @@ -16,7 +16,7 @@ class phpbb_text_processing_message_parser_test extends phpbb_test_case { - public static function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); @@ -25,7 +25,7 @@ public static function setUpBeforeClass() stream_wrapper_register('http', __CLASS__ . '_proxy'); } - public static function tearDownAfterClass() + static public function tearDownAfterClass(): void { parent::tearDownAfterClass(); stream_wrapper_restore('http'); @@ -38,15 +38,10 @@ protected function prepare_s9e_services($setup = null) $config = new \phpbb\config\config(array('max_poll_options' => 999)); $map = array( - array('MAX_FLASH_HEIGHT_EXCEEDED', 123, 'Your flash files may only be up to 123 pixels high.'), - array('MAX_FLASH_WIDTH_EXCEEDED', 456, 'Your flash files may only be up to 456 pixels wide.'), array('MAX_FONT_SIZE_EXCEEDED', 120, 'You may only use fonts up to size 120.'), array('MAX_FONT_SIZE_EXCEEDED', 200, 'You may only use fonts up to size 200.'), - array('MAX_IMG_HEIGHT_EXCEEDED', 12, 'Your images may only be up to 12 pixels high.'), - array('MAX_IMG_WIDTH_EXCEEDED', 34, 'Your images may only be up to 34 pixels wide.'), array('TOO_MANY_SMILIES', 3, 'Your message contains too many smilies. The maximum number of smilies allowed is 3.'), array('TOO_MANY_URLS', 2, 'Your message contains too many URLs. The maximum number of URLs allowed is 2.'), - array('UNAUTHORISED_BBCODE', '[flash]', 'You cannot use certain BBCodes: [flash].'), array('UNAUTHORISED_BBCODE', '[img]', 'You cannot use certain BBCodes: [img].'), array('UNAUTHORISED_BBCODE', '[quote]', 'You cannot use certain BBCodes: [quote].'), array('UNAUTHORISED_BBCODE', '[url]', 'You cannot use certain BBCodes: [url].'), @@ -65,14 +60,15 @@ protected function prepare_s9e_services($setup = null) ); $user->style = array('style_id' => 1); - $user->lang = array( - 'NO_POLL_TITLE' => 'You have to enter a poll title.', - 'POLL_TITLE_TOO_LONG' => 'The poll title must contain fewer than 100 characters.', - 'POLL_TITLE_COMP_TOO_LONG' => 'The parsed size of your poll title is too large, consider removing BBCodes or smilies.', - 'TOO_FEW_POLL_OPTIONS' => 'You must enter at least two poll options.', - 'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options.', - 'TOO_MANY_USER_OPTIONS' => 'You cannot specify more options per user than existing poll options.', - ); + $user->expects($this->any()) + ->method('__get')->with('lang')->willReturn([ + 'NO_POLL_TITLE' => 'You have to enter a poll title.', + 'POLL_TITLE_TOO_LONG' => 'The poll title must contain fewer than 100 characters.', + 'POLL_TITLE_COMP_TOO_LONG' => 'The parsed size of your poll title is too large, consider removing BBCodes or smilies.', + 'TOO_FEW_POLL_OPTIONS' => 'You must enter at least two poll options.', + 'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options.', + 'TOO_MANY_USER_OPTIONS' => 'You cannot specify more options per user than existing poll options.', + ]); $phpbb_container = new phpbb_mock_container_builder; $phpbb_container->set('user', $user); @@ -112,13 +108,13 @@ public function test_parse_poll($poll, $expected, $warn_msg = array()) $this->assertSame( 'Me[i]s[/i]sage', - $message_parser->parse(true, true, true, true, true, true, true, false) + $message_parser->parse(true, true, true, true, true, true, false) ); $this->assertSame($warn_msg, $message_parser->warn_msg); } - public function get_test_polls() + public static function get_test_polls() { return array( array( @@ -155,23 +151,6 @@ public function get_test_polls() ), array('You cannot use certain BBCodes: [quote].') ), - array( - array( - 'poll_title' => 'xxx', - 'poll_option_text' => "[flash=12,34]http://example.org/x.swf[/flash]\n:)", - 'poll_max_options' => 2, - 'poll_options_size' => 2 - ), - array( - 'poll_title' => 'xxx', - 'poll_option_text' => "[flash=12,34]http://example.org/x.swf[/flash]\n:)", - 'poll_options' => array( - '[flash=12,34]http://example.org/x.swf[/flash]', - ':)' - ) - ), - array('You cannot use certain BBCodes: [flash].') - ), array( array( 'poll_title' => 'xxx', @@ -205,91 +184,84 @@ public function test_options($original, $expected, array $args, $setup = null, $ $this->assertSame($warn_msg, $message_parser->warn_msg); } - public function get_test_cases() + public static function get_test_cases() { return array( array( '[b]bold[/b]', '[b]bold[/b]', - array(true, true, true, true, true, true, true) + array(true, true, true, true, true, true) ), array( '[b]bold[/b]', '[b]bold[/b]', - array(false, true, true, true, true, true, true) + array(false, true, true, true, true, true) ), array( 'http://example.org', 'http://example.org', - array(true, true, true, true, true, true, true) + array(true, true, true, true, true, true) ), array( 'http://example.org', 'http://example.org', - array(true, false, true, true, true, true, true) + array(true, false, true, true, true, true) ), array( ':)', ':)', - array(true, true, true, true, true, true, true) + array(true, true, true, true, true, true) ), array( ':)', ':)', - array(true, true, false, true, true, true, true) + array(true, true, false, true, true, true) ), array( '[url=http://example.org][img]http://example.org/img.png[/img][/url]', '[url=http://example.org][img]http://example.org/img.png[/img][/url]', - array(true, true, true, true, true, true, true) + array(true, true, true, true, true, true) ), array( '[url=http://example.org][img]http://example.org/img.png[/img][/url]', '[url=http://example.org][img]http://example.org/img.png[/img][/url]', - array(true, true, true, false, true, true, true), + array(true, true, true, false, true, true), null, array('You cannot use certain BBCodes: [img].') ), - array( - '[flash=12,34]http://example.org/foo.swf[/flash]', - '[flash=12,34]http://example.org/foo.swf[/flash]', - array(true, true, true, true, true, true, true) - ), array( '[flash=12,34]http://example.org/foo.swf[/flash]', '[flash=12,34]http://example.org/foo.swf[/flash]', - array(true, true, true, true, false, true, true), - null, - array('You cannot use certain BBCodes: [flash].') + array(true, true, true, true, true, true) ), array( '[quote="foo"]bar :)[/quote]', '[quote="foo"]bar :)[/quote]', - array(true, true, true, true, true, true, true) + array(true, true, true, true, true, true) ), array( '[quote="foo"]bar :)[/quote]', '[quote="foo"]bar :)[/quote]', - array(true, true, true, true, true, false, true), + array(true, true, true, true, false, true), null, array('You cannot use certain BBCodes: [quote].') ), array( '[url=http://example.org][img]http://example.org/img.png[/img][/url]', '[url=http://example.org][img]http://example.org/img.png[/img][/url]', - array(true, true, true, true, true, true, true) + array(true, true, true, true, true, true) ), array( '[url=http://example.org][img]http://example.org/img.png[/img][/url]', '[url=http://example.org][img]http://example.org/img.png[/img][/url]', - array(true, true, true, true, true, true, false), + array(true, true, true, true, true, false), null, array('You cannot use certain BBCodes: [url].') ), array( '[size=200]200[/size]', '[size=200]200[/size]', - array(true, true, true, true, true, true, true), + array(true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_post_font_size', 200); @@ -298,7 +270,7 @@ function ($phpbb_container) array( '[size=200]200[/size]', '[size=200]200[/size]', - array(true, true, true, true, true, true, true), + array(true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_post_font_size', 0); @@ -307,7 +279,7 @@ function ($phpbb_container) array( '[size=2000]2000[/size]', '[size=2000]2000[/size]', - array(true, true, true, true, true, true, true), + array(true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_post_font_size', 200); @@ -317,7 +289,7 @@ function ($phpbb_container) array( '[size=0]0[/size]', '[size=0]0[/size]', - array(true, true, true, true, true, true, true), + array(true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_post_font_size', 200); @@ -326,7 +298,7 @@ function ($phpbb_container) array( '[size=200]200[/size]', '[size=200]200[/size]', - array(true, true, true, true, true, true, true), + array(true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_sig_font_size', 200); @@ -335,97 +307,27 @@ function ($phpbb_container) array( '[size=200]200[/size]', '[size=200]200[/size]', - array(true, true, true, true, true, true, true, true, 'sig'), + array(true, true, true, true, true, true, true, 'sig'), function ($phpbb_container) { $phpbb_container->get('config')->set('max_sig_font_size', 120); }, array('You may only use fonts up to size 120.') ), - array( - '[img]http://example.org/100x100.png[/img]', - '[img]http://example.org/100x100.png[/img]', - array(true, true, true, true, true, true, true), - function ($phpbb_container) - { - $phpbb_container->get('config')->set('max_post_img_height', 12); - }, - array('Your images may only be up to 12 pixels high.') - ), - array( - '[img]http://example.org/100x100.png[/img]', - '[img]http://example.org/100x100.png[/img]', - array(true, true, true, true, true, true, true), - function ($phpbb_container) - { - $phpbb_container->get('config')->set('max_post_img_width', 34); - }, - array('Your images may only be up to 34 pixels wide.') - ), - array( - '[img]http://example.org/100x100.png[/img]', - '[img]http://example.org/100x100.png[/img]', - array(true, true, true, true, true, true, true), - function ($phpbb_container) - { - $phpbb_container->get('config')->set('max_post_img_height', 0); - $phpbb_container->get('config')->set('max_post_img_width', 0); - } - ), - array( - '[img]http://example.org/100x100.png[/img]', - '[img]http://example.org/100x100.png[/img]', - array(true, true, true, true, true, true, true), - function ($phpbb_container) - { - $phpbb_container->get('config')->set('max_post_img_height', 100); - $phpbb_container->get('config')->set('max_post_img_width', 100); - } - ), array( '[img]http://example.org/100x100.png[/img]', '[img]http://example.org/100x100.png[/img]', - array(true, true, true, true, true, true, true), + array(true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_sig_img_height', 12); $phpbb_container->get('config')->set('max_sig_img_width', 34); } ), - array( - '[img]http://example.org/404.png[/img]', - '[img]http://example.org/404.png[/img]', - array(true, true, true, true, true, true, true), - function ($phpbb_container) - { - $phpbb_container->get('config')->set('max_post_img_height', 12); - }, - array('It was not possible to determine the dimensions of the image.') - ), - array( - '[flash=999,999]http://example.org/foo.swf[/flash]', - '[flash=999,999]http://example.org/foo.swf[/flash]', - array(true, true, true, true, true, true, true), - function ($phpbb_container) - { - $phpbb_container->get('config')->set('max_post_img_height', 123); - }, - array('Your flash files may only be up to 123 pixels high.') - ), - array( - '[flash=999,999]http://example.org/foo.swf[/flash]', - '[flash=999,999]http://example.org/foo.swf[/flash]', - array(true, true, true, true, true, true, true), - function ($phpbb_container) - { - $phpbb_container->get('config')->set('max_post_img_width', 456); - }, - array('Your flash files may only be up to 456 pixels wide.') - ), array( ':) :) :)', ':) :) :)', - array(true, true, true, true, true, true, true, true), + array(true, true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_post_smilies', 3); @@ -434,7 +336,7 @@ function ($phpbb_container) array( ':) :) :) :)', ':) :) :) :)', - array(true, true, true, true, true, true, true, true), + array(true, true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_post_smilies', 3); @@ -444,7 +346,7 @@ function ($phpbb_container) array( ':) :) :) :)', ':) :) :) :)', - array(true, true, true, true, true, true, true, true), + array(true, true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_post_smilies', 0); @@ -453,7 +355,7 @@ function ($phpbb_container) array( ':) :) :) :)', ':) :) :) :)', - array(true, true, true, true, true, true, true, true), + array(true, true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_sig_smilies', 3); @@ -462,7 +364,7 @@ function ($phpbb_container) array( ':) :) :) :)', ':) :) :) :)', - array(true, true, true, true, true, true, true, true, 'sig'), + array(true, true, true, true, true, true, true, 'sig'), function ($phpbb_container) { $phpbb_container->get('config')->set('max_sig_smilies', 3); @@ -472,7 +374,7 @@ function ($phpbb_container) array( 'http://example.org http://example.org http://example.org', 'http://example.org http://example.org http://example.org', - array(true, true, true, true, true, true, true, true), + array(true, true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_post_urls', 2); @@ -482,7 +384,7 @@ function ($phpbb_container) array( 'http://example.org http://example.org http://example.org', 'http://example.org http://example.org http://example.org', - array(true, true, true, true, true, true, true, true), + array(true, true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_post_urls', 0); @@ -491,7 +393,7 @@ function ($phpbb_container) array( 'http://example.org http://example.org http://example.org', 'http://example.org http://example.org http://example.org', - array(true, true, true, true, true, true, true, true), + array(true, true, true, true, true, true, true), function ($phpbb_container) { $phpbb_container->get('config')->set('max_sig_urls', 2); diff --git a/tests/text_processing/smilies_test.php b/tests/text_processing/smilies_test.php index 3778e5f58ca..180d4c296e3 100644 --- a/tests/text_processing/smilies_test.php +++ b/tests/text_processing/smilies_test.php @@ -25,7 +25,7 @@ public function test_text_formatter($original, $expected) $this->assertSame($expected, $renderer->render($parser->parse($original))); } - public function get_text_formatter_tests() + public static function get_text_formatter_tests() { return array( array( diff --git a/tests/text_processing/strip_bbcode_test.php b/tests/text_processing/strip_bbcode_test.php index 9acedc28722..2fdae3b5f02 100644 --- a/tests/text_processing/strip_bbcode_test.php +++ b/tests/text_processing/strip_bbcode_test.php @@ -13,27 +13,26 @@ class phpbb_text_processing_strip_bbcode_test extends phpbb_test_case { - public function test_legacy() - { - $original = '[b:20m4ill1]bold[/b:20m4ill1]'; - $expected = ' bold '; - - $actual = $original; - strip_bbcode($actual); - $this->assertSame($expected, $actual, '20m4ill1'); + public static function data_strip_bbcode() + { + return [ + ['[b:20m4ill1]bold[/b:20m4ill1]', ' bold '], + ['[b]bold[/b]', ' bold '], + ['[b:20m4ill1]bo & ld[/b:20m4ill1]', ' bo & ld '], + ['[b]bo & ld[/b]', ' bo & ld '] + ]; } - public function test_s9e() + /** + * @dataProvider data_strip_bbcode + */ + public function test_strip_bbcode($input, $expected) { $phpbb_container = $this->get_test_case_helpers()->set_s9e_services(); - $original = '[b]bold[/b]'; - $expected = ' bold '; - - $actual = $original; - strip_bbcode($actual); + strip_bbcode($input); - $this->assertSame($expected, $actual); + $this->assertSame($expected, $input); } } diff --git a/tests/text_processing/tickets_data/PHPBB3-10268.html b/tests/text_processing/tickets_data/PHPBB3-10268.html index 13b71b48237..3fa1c8cc4e6 100644 --- a/tests/text_processing/tickets_data/PHPBB3-10268.html +++ b/tests/text_processing/tickets_data/PHPBB3-10268.html @@ -1,4 +1,4 @@
    -http://phpbb.com
    - http://phpbb.com
    +http://phpbb.com
    + http://phpbb.com
    diff --git a/tests/text_processing/tickets_data/PHPBB3-10922.html b/tests/text_processing/tickets_data/PHPBB3-10922.html index 3ff117f1712..1e5d1960a45 100644 --- a/tests/text_processing/tickets_data/PHPBB3-10922.html +++ b/tests/text_processing/tickets_data/PHPBB3-10922.html @@ -7,3 +7,4 @@ user@example.org
    user@example.org
    ...
    +user@example.org
    diff --git a/tests/text_processing/tickets_data/PHPBB3-10922.txt b/tests/text_processing/tickets_data/PHPBB3-10922.txt index e533ce6ed50..76a34235fb7 100644 --- a/tests/text_processing/tickets_data/PHPBB3-10922.txt +++ b/tests/text_processing/tickets_data/PHPBB3-10922.txt @@ -7,3 +7,4 @@ [email subject="Hello" body="Sent from phpBB"]user@example.org[/email] [email body="Sent from phpBB" subject="Hello"]user@example.org[/email] [email body="Sent from phpBB" subject="Hello" email="user@example.org"]...[/email] +[email subject="hi&attach=foo"]user@example.org[/email] diff --git a/tests/text_processing/tickets_data/PHPBB3-11742.html b/tests/text_processing/tickets_data/PHPBB3-11742.html index e7890eef194..5ce263f4f97 100644 --- a/tests/text_processing/tickets_data/PHPBB3-11742.html +++ b/tests/text_processing/tickets_data/PHPBB3-11742.html @@ -1 +1 @@ -

    CODE: Select all

    	tab
    \ No newline at end of file +

    Code: Select all

    	tab
    \ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-13921.html b/tests/text_processing/tickets_data/PHPBB3-13921.html index 690668ef28e..9dc726d40f8 100644 --- a/tests/text_processing/tickets_data/PHPBB3-13921.html +++ b/tests/text_processing/tickets_data/PHPBB3-13921.html @@ -1 +1 @@ -
    xxx
    \ No newline at end of file +
    xxx
    \ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-15348.html b/tests/text_processing/tickets_data/PHPBB3-15348.html index 5d44c078994..564e6fda595 100644 --- a/tests/text_processing/tickets_data/PHPBB3-15348.html +++ b/tests/text_processing/tickets_data/PHPBB3-15348.html @@ -1 +1 @@ -:o k: :ok: \ No newline at end of file +:o k: :ok: \ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16053.html b/tests/text_processing/tickets_data/PHPBB3-16053.html new file mode 100644 index 00000000000..af70ddf7eb4 --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16053.html @@ -0,0 +1 @@ +Test \ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16053.txt b/tests/text_processing/tickets_data/PHPBB3-16053.txt new file mode 100644 index 00000000000..c786665eb90 --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16053.txt @@ -0,0 +1 @@ +[test=http://ea117.com]Test[/test] \ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16053.xml b/tests/text_processing/tickets_data/PHPBB3-16053.xml new file mode 100644 index 00000000000..25f7c9e34e5 --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16053.xml @@ -0,0 +1,28 @@ + + + + bbcode_id + bbcode_tag + bbcode_helpline + display_on_posting + bbcode_match + bbcode_tpl + first_pass_match + first_pass_replace + second_pass_match + second_pass_replace + + + 13 + test + + 1 + [test={URL}]{TEXT}[/test] + {TEXT}]]> + ((?!)) + + ((?!)) + + +
    +     diff --git a/tests/text_processing/tickets_data/PHPBB3-16074.html b/tests/text_processing/tickets_data/PHPBB3-16074.html new file mode 100644 index 00000000000..04d72697b8b --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16074.html @@ -0,0 +1 @@ +:man_judge: 👨‍⚖️ \ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16074.txt b/tests/text_processing/tickets_data/PHPBB3-16074.txt new file mode 100644 index 00000000000..f067a7294da --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16074.txt @@ -0,0 +1 @@ +:man_judge: 👨‍⚖️ \ No newline at end of file diff --git a/phpBB/phpbb/db/tools.php b/tests/text_processing/tickets_data/PHPBB3-16252.after.php similarity index 65% rename from phpBB/phpbb/db/tools.php rename to tests/text_processing/tickets_data/PHPBB3-16252.after.php index 4d1b91f7b4a..c2f57c171ed 100644 --- a/phpBB/phpbb/db/tools.php +++ b/tests/text_processing/tickets_data/PHPBB3-16252.after.php @@ -11,11 +11,8 @@ * */ -namespace phpbb\db; - -/** - * @deprecated 3.2.0-dev (To be removed 3.3.0) use \phpbb\db\tools\tools instead - */ -class tools extends \phpbb\db\tools\tools +function after_assert_phpbb3_16252($vars) { + extract($vars); + $test->assertEmpty($parser->get_errors()); } diff --git a/tests/text_processing/tickets_data/PHPBB3-16252.before.php b/tests/text_processing/tickets_data/PHPBB3-16252.before.php new file mode 100644 index 00000000000..94c59d96027 --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16252.before.php @@ -0,0 +1,17 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +function before_assert_phpbb3_16252($vars) +{ + $vars['parser']->disable_bbcode('url'); +} diff --git a/tests/text_processing/tickets_data/PHPBB3-16252.html b/tests/text_processing/tickets_data/PHPBB3-16252.html new file mode 100644 index 00000000000..5b14ab0e7a7 --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16252.html @@ -0,0 +1 @@ +http://localhost/ \ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16252.txt b/tests/text_processing/tickets_data/PHPBB3-16252.txt new file mode 100644 index 00000000000..5b14ab0e7a7 --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16252.txt @@ -0,0 +1 @@ +http://localhost/ \ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16309.html b/tests/text_processing/tickets_data/PHPBB3-16309.html new file mode 100644 index 00000000000..d8ac3bfed2a --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16309.html @@ -0,0 +1 @@ +[lol] \ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16309.txt b/tests/text_processing/tickets_data/PHPBB3-16309.txt new file mode 100644 index 00000000000..c10a809ea07 --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16309.txt @@ -0,0 +1 @@ +[lol] \ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16309.xml b/tests/text_processing/tickets_data/PHPBB3-16309.xml new file mode 100644 index 00000000000..a988e9df4ac --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16309.xml @@ -0,0 +1,23 @@ + + + + smiley_id + code + emotion + smiley_url + smiley_width + smiley_height + smiley_order + display_on_posting + + 41 + [lol] + lol + lol.png + 17 + 17 + 41 + 1 + +
    +     diff --git a/tests/text_processing/tickets_test.php b/tests/text_processing/tickets_test.php index 6230191a699..36eec93b7e8 100644 --- a/tests/text_processing/tickets_test.php +++ b/tests/text_processing/tickets_test.php @@ -44,7 +44,7 @@ public function test_tickets($ticket_id, $original, $expected, $fixture, $before } } - public function get_tickets_data() + public static function get_tickets_data() { $tests = array(); diff --git a/tests/text_reparser/base_test.php b/tests/text_reparser/base_test.php index 2c6844b0637..edf39e7f10b 100644 --- a/tests/text_reparser/base_test.php +++ b/tests/text_reparser/base_test.php @@ -17,7 +17,7 @@ class phpbb_textreparser_base_test extends phpbb_database_test_case { protected $db; - public function setUp() + protected function setUp(): void { global $config; if (!isset($config)) diff --git a/tests/text_reparser/manager_test.php b/tests/text_reparser/manager_test.php index df6adacb66a..98882385a20 100644 --- a/tests/text_reparser/manager_test.php +++ b/tests/text_reparser/manager_test.php @@ -27,10 +27,10 @@ class phpbb_text_reparser_manager_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config_text.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/config_text.xml'); } - public function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/text_reparser/plugins/contact_admin_info_test.php b/tests/text_reparser/plugins/contact_admin_info_test.php index 757b02be399..f8a925ccea8 100644 --- a/tests/text_reparser/plugins/contact_admin_info_test.php +++ b/tests/text_reparser/plugins/contact_admin_info_test.php @@ -39,7 +39,7 @@ protected function get_rows() return $rows; } - public function setUp() + protected function setUp(): void { global $config; if (!isset($config)) diff --git a/tests/text_reparser/plugins/poll_option_test.php b/tests/text_reparser/plugins/poll_option_test.php index 177faac51d8..6c7fd98431b 100644 --- a/tests/text_reparser/plugins/poll_option_test.php +++ b/tests/text_reparser/plugins/poll_option_test.php @@ -24,7 +24,7 @@ public function getDataSet() protected function get_reparser() { - return new \phpbb\textreparser\plugins\poll_option($this->db); + return new \phpbb\textreparser\plugins\poll_option($this->db, POLL_OPTIONS_TABLE); } protected function get_rows() @@ -39,7 +39,7 @@ protected function get_rows() return $rows; } - public function setUp() + protected function setUp(): void { global $config; if (!isset($config)) diff --git a/tests/text_reparser/plugins/post_text_test.php b/tests/text_reparser/plugins/post_text_test.php index 8ea71e65f50..0333afd95b1 100644 --- a/tests/text_reparser/plugins/post_text_test.php +++ b/tests/text_reparser/plugins/post_text_test.php @@ -23,4 +23,66 @@ protected function get_reparser() { return new \phpbb\textreparser\plugins\post_text($this->db, POSTS_TABLE); } + + public static function data_reparse_url(): array + { + return [ + [ // Reparse the same + 'https://www.example.com and some more text test included', + 'https://www.example.com and some more text test included', + ], + [ // Reparse without magic URL, shouldn't change + 'https://www.example.com and some more text test included', + 'https://www.example.com and some more text test included', + ], + [ // Reparse new format without magic URL, shouldn't change + 'https://www.example.com and some more text test included', + 'https://www.example.com and some more text test included', + ], + [ // Reparse with magic URL, should update to text formatter format + 'Foo is https://symfony.com/doc/current/service_container.html good', + 'Foo is https://symfony.com/doc/current/service_container.html good', + ], + [ // Reparse new format with magic URL, shouldn't change + 'Foo is https://symfony.com/doc/current/service_container.html good', + 'Foo is https://symfony.com/doc/current/service_container.html good', + ] + ]; + } + + /** + * @dataProvider data_reparse_url + */ + public function test_reparse_url(string $input_text, string $expected_text) + { + foreach ([true, false] as $enable_magic_url) + { + $record = [ + 'enable_bbcode' => true, + 'enable_smilies' => true, + 'enable_magic_url' => $enable_magic_url, + 'post_text' => $input_text, + 'bbcode_uid' => '', + ]; + + $sql = 'INSERT INTO ' . POSTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', $record); + $this->db->sql_query($sql); + + $record['id'] = $this->db->sql_last_inserted_id(); + $record['text'] = $record['post_text']; + + // Call reparse_record via reflection + $reparser = $this->get_reparser(); + $reparser_reflection = new \ReflectionMethod($reparser, 'reparse_record'); + $reparser_reflection->invoke($reparser, $record); + + // Retrieve reparsed post text and compare with expectec + $sql = 'SELECT post_id, post_text FROM ' . POSTS_TABLE . ' WHERE post_id = ' . (int) $record['id']; + $result = $this->db->sql_query($sql); + $actual_text = $this->db->sql_fetchfield('post_text'); + $this->db->sql_freeresult($result); + + $this->assertSame($expected_text, $actual_text); + } + } } diff --git a/tests/text_reparser/plugins/test_row_based_plugin.php b/tests/text_reparser/plugins/test_row_based_plugin.php index 3e9ff094482..425054f4c12 100644 --- a/tests/text_reparser/plugins/test_row_based_plugin.php +++ b/tests/text_reparser/plugins/test_row_based_plugin.php @@ -15,6 +15,7 @@ abstract class phpbb_textreparser_test_row_based_plugin extends phpbb_database_test_case { + /** @var \phpbb\db\driver\driver_interface */ protected $db; abstract protected function get_reparser(); @@ -26,7 +27,6 @@ protected function get_rows(array $ids) $reflection_reparser = new ReflectionClass(get_class($reparser)); $table_property = $reflection_reparser->getProperty('table'); - $table_property->setAccessible(true); $sql = 'SELECT ' . $columns['id'] . ' AS id, ' . $columns['text'] . ' AS text FROM ' . $table_property->getValue($reparser) . ' @@ -39,7 +39,7 @@ protected function get_rows(array $ids) return $rows; } - public function setUp() + protected function setUp(): void { global $config; if (!isset($config)) @@ -84,7 +84,7 @@ public function test_reparse($min_id, $max_id, $expected) $this->assertEquals($expected, $this->get_rows($ids)); } - public function get_reparse_tests() + public static function get_reparse_tests() { return array( array( @@ -117,20 +117,6 @@ public function get_reparse_tests() ), ) ), - array( - 6, - 7, - array( - array( - 'id' => '6', - 'text' => '[flash=123,345]http://example.org/flash.swf[/flash]', - ), - array( - 'id' => '7', - 'text' => '[flash=123,345]http://example.org/flash.swf[/flash]', - ), - ) - ), array( 8, 9, diff --git a/tests/tree/nestedset_forum_insert_delete_test.php b/tests/tree/nestedset_forum_add_remove_test.php similarity index 93% rename from tests/tree/nestedset_forum_insert_delete_test.php rename to tests/tree/nestedset_forum_add_remove_test.php index 63937520108..863ff8e9969 100644 --- a/tests/tree/nestedset_forum_insert_delete_test.php +++ b/tests/tree/nestedset_forum_add_remove_test.php @@ -11,11 +11,11 @@ * */ -require_once dirname(__FILE__) . '/nestedset_forum_base.php'; +require_once __DIR__ . '/nestedset_forum_base.php'; class phpbb_tests_tree_nestedset_forum_add_remove_test extends phpbb_tests_tree_nestedset_forum_base { - public function delete_data() + public static function delete_data() { return array( array(1, array(1, 2, 3), array( @@ -56,7 +56,7 @@ public function test_delete($forum_id, $expected_deleted, $expected) $this->assertEquals($expected, $this->db->sql_fetchrowset($result)); } - public function delete_throws_data() + public static function delete_throws_data() { return array( array('Not an item', 0), @@ -66,16 +66,15 @@ public function delete_throws_data() /** * @dataProvider delete_throws_data - * - * @expectedException OutOfBoundsException - * @expectedExceptionMessage FORUM_NESTEDSET_INVALID_ITEM */ public function test_delete_throws($explain, $forum_id) { + $this->expectException('OutOfBoundsException'); + $this->expectExceptionMessage('FORUM_NESTEDSET_INVALID_ITEM'); $this->set->delete($forum_id); } - public function insert_data() + public static function insert_data() { return array( array(array( diff --git a/tests/tree/nestedset_forum_base.php b/tests/tree/nestedset_forum_base.php index 498c6a69a2b..c1fd5955b1c 100644 --- a/tests/tree/nestedset_forum_base.php +++ b/tests/tree/nestedset_forum_base.php @@ -15,7 +15,7 @@ class phpbb_tests_tree_nestedset_forum_base extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/phpbb_forums.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/phpbb_forums.xml'); } protected $forum_data = array( @@ -48,7 +48,7 @@ public function getDataSet() $lock, $db; - public function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/tree/nestedset_forum_get_data_test.php b/tests/tree/nestedset_forum_get_data_test.php index 48fbabdb8cf..c8872317547 100644 --- a/tests/tree/nestedset_forum_get_data_test.php +++ b/tests/tree/nestedset_forum_get_data_test.php @@ -11,11 +11,11 @@ * */ -require_once dirname(__FILE__) . '/nestedset_forum_base.php'; +require_once __DIR__ . '/nestedset_forum_base.php'; class phpbb_tests_tree_nestedset_forum_get_data_test extends phpbb_tests_tree_nestedset_forum_base { - public function get_path_and_subtree_data_data() + public static function get_path_and_subtree_data_data() { return array( array(1, true, true, array(1, 2, 3)), @@ -43,7 +43,7 @@ public function test_get_path_and_subtree_data($forum_id, $order_asc, $include_i $this->assertEquals($expected, array_keys($this->set->get_path_and_subtree_data($forum_id, $order_asc, $include_item))); } - public function get_path_data_data() + public static function get_path_data_data() { return array( array(1, true, true, array(1)), @@ -71,7 +71,7 @@ public function test_get_path_data($forum_id, $order_asc, $include_item, $expect $this->assertEquals($expected, array_keys($this->set->get_path_data($forum_id, $order_asc, $include_item))); } - public function get_subtree_data_data() + public static function get_subtree_data_data() { return array( array(1, true, true, array(1, 2, 3)), @@ -99,7 +99,7 @@ public function test_get_subtree_data($forum_id, $order_asc, $include_item, $exp $this->assertEquals($expected, array_keys($this->set->get_subtree_data($forum_id, $order_asc, $include_item))); } - public function get_path_basic_data_data() + public static function get_path_basic_data_data() { return array( array(1, '', array()), @@ -121,7 +121,7 @@ public function test_get_path_basic_data($forum_id, $forum_parents, $expected) $this->assertEquals($expected, array_keys($this->set->get_path_basic_data($forum_data))); } - public function get_all_tree_data_data() + public static function get_all_tree_data_data() { return array( array(true, array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)), diff --git a/tests/tree/nestedset_forum_move_test.php b/tests/tree/nestedset_forum_move_test.php index 108faf5b711..e841daf8431 100644 --- a/tests/tree/nestedset_forum_move_test.php +++ b/tests/tree/nestedset_forum_move_test.php @@ -11,11 +11,11 @@ * */ -require_once dirname(__FILE__) . '/nestedset_forum_base.php'; +require_once __DIR__ . '/nestedset_forum_base.php'; class phpbb_tests_tree_nestedset_forum_move_test extends phpbb_tests_tree_nestedset_forum_base { - public function move_data() + public static function move_data() { return array( array('Move first item up', @@ -132,7 +132,7 @@ public function test_move($explain, $forum_id, $delta, $expected_moved, $expecte $this->assertEquals($expected, $this->db->sql_fetchrowset($result)); } - public function move_down_data() + public static function move_down_data() { return array( array('Move last item down', @@ -179,7 +179,7 @@ public function test_move_down($explain, $forum_id, $expected_moved, $expected) $this->assertEquals($expected, $this->db->sql_fetchrowset($result)); } - public function move_up_data() + public static function move_up_data() { return array( array('Move first item up', @@ -226,7 +226,7 @@ public function test_move_up($explain, $forum_id, $expected_moved, $expected) $this->assertEquals($expected, $this->db->sql_fetchrowset($result)); } - public function move_children_data() + public static function move_children_data() { return array( array('Item has no children', @@ -376,7 +376,7 @@ public function test_move_children($explain, $forum_id, $target_id, $expected_mo $this->assertEquals($expected, $this->db->sql_fetchrowset($result)); } - public function move_children_throws_item_data() + public static function move_children_throws_item_data() { return array( array('Item 0 does not exist', 0, 5), @@ -386,16 +386,15 @@ public function move_children_throws_item_data() /** * @dataProvider move_children_throws_item_data - * - * @expectedException OutOfBoundsException - * @expectedExceptionMessage FORUM_NESTEDSET_INVALID_ITEM */ public function test_move_children_throws_item($explain, $forum_id, $target_id) { + $this->expectException('OutOfBoundsException'); + $this->expectExceptionMessage('FORUM_NESTEDSET_INVALID_ITEM'); $this->set->move_children($forum_id, $target_id); } - public function move_children_throws_parent_data() + public static function move_children_throws_parent_data() { return array( array('New parent is child', 4, 5), @@ -406,16 +405,15 @@ public function move_children_throws_parent_data() /** * @dataProvider move_children_throws_parent_data - * - * @expectedException OutOfBoundsException - * @expectedExceptionMessage FORUM_NESTEDSET_INVALID_PARENT */ public function test_move_children_throws_parent($explain, $forum_id, $target_id) { + $this->expectException('OutOfBoundsException'); + $this->expectExceptionMessage('FORUM_NESTEDSET_INVALID_PARENT'); $this->set->move_children($forum_id, $target_id); } - public function change_parent_data() + public static function change_parent_data() { return array( array('Move single child up', @@ -532,7 +530,7 @@ public function test_change_parent($explain, $forum_id, $target_id, $expected_mo $this->assertEquals($expected, $this->db->sql_fetchrowset($result)); } - public function change_parent_throws_item_data() + public static function change_parent_throws_item_data() { return array( array('Item 0 does not exist', 0, 5), @@ -542,16 +540,15 @@ public function change_parent_throws_item_data() /** * @dataProvider change_parent_throws_item_data - * - * @expectedException OutOfBoundsException - * @expectedExceptionMessage FORUM_NESTEDSET_INVALID_ITEM */ public function test_change_parent_throws_item($explain, $forum_id, $target_id) { + $this->expectException('OutOfBoundsException'); + $this->expectExceptionMessage('FORUM_NESTEDSET_INVALID_ITEM'); $this->set->change_parent($forum_id, $target_id); } - public function change_parent_throws_parent_data() + public static function change_parent_throws_parent_data() { return array( array('New parent is child', 4, 5), @@ -562,12 +559,11 @@ public function change_parent_throws_parent_data() /** * @dataProvider change_parent_throws_parent_data - * - * @expectedException OutOfBoundsException - * @expectedExceptionMessage FORUM_NESTEDSET_INVALID_PARENT */ public function test_change_parent_throws_parent($explain, $forum_id, $target_id) { + $this->expectException('OutOfBoundsException'); + $this->expectExceptionMessage('FORUM_NESTEDSET_INVALID_PARENT'); $this->set->change_parent($forum_id, $target_id); } } diff --git a/tests/tree/nestedset_forum_regenerate_test.php b/tests/tree/nestedset_forum_regenerate_test.php index 914cc5f7496..b5bc806fd33 100644 --- a/tests/tree/nestedset_forum_regenerate_test.php +++ b/tests/tree/nestedset_forum_regenerate_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/nestedset_forum_base.php'; +require_once __DIR__ . '/nestedset_forum_base.php'; class phpbb_tests_tree_nestedset_forum_regenerate_test extends phpbb_tests_tree_nestedset_forum_base { @@ -31,7 +31,7 @@ class phpbb_tests_tree_nestedset_forum_regenerate_test extends phpbb_tests_tree_ array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => ''), ); - public function regenerate_left_right_ids_data() + public static function regenerate_left_right_ids_data() { return array( array('UPDATE phpbb_forums diff --git a/tests/tree/nestedset_forum_test.php b/tests/tree/nestedset_forum_test.php index 7ccdc0a9b54..973af358365 100644 --- a/tests/tree/nestedset_forum_test.php +++ b/tests/tree/nestedset_forum_test.php @@ -11,11 +11,11 @@ * */ -require_once dirname(__FILE__) . '/nestedset_forum_base.php'; +require_once __DIR__ . '/nestedset_forum_base.php'; class pphpbb_tests_tree_nestedset_forum_test extends phpbb_tests_tree_nestedset_forum_base { - public function forum_constructor_data() + public static function forum_constructor_data() { return array( array(array( @@ -47,7 +47,7 @@ public function test_forum_constructor($expected) $this->assertEquals($expected, $this->db->sql_fetchrowset($result)); } - public function get_sql_where_data() + public static function get_sql_where_data() { return array( array('SELECT forum_id diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php new file mode 100644 index 00000000000..9641db0a1ad --- /dev/null +++ b/tests/ucp/controller_webpush_test.php @@ -0,0 +1,540 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\exception\http_exception; +use phpbb\notification\type\quote; +use phpbb\request\request_interface; +use phpbb\ucp\controller\webpush; +use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\Response; + +class test_ucp_controller_webpush_test extends phpbb_database_test_case +{ + protected $auth; + protected $avatar_helper; + protected $config; + protected $controller; + protected $controller_helper; + protected $db; + protected $form_helper; + protected $language; + protected $notification_manager; + protected $path_helper; + protected $phpbb_root_path; + protected $php_ext; + protected $request; + protected $template; + protected $user; + protected $user_loader; + + protected function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/webpush.xml'); + } + + protected function setUp(): void + { + global $auth, $config, $phpbb_dispatcher, $user, $phpbb_root_path, $phpEx; + + parent::setUp(); + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + + $this->auth = $this->createMock(\phpbb\auth\auth::class); + $auth = $this->auth; + $this->avatar_helper = $this->createMock(\phpbb\avatar\helper::class); + $this->config = new \phpbb\config\config([ + 'allow_nocensors' => false, + 'sitename' => 'yourdomain.com', + ]); + $config = $this->config; + $this->controller_helper = $this->createMock(\phpbb\controller\helper::class); + $this->db = $this->new_dbal(); + $this->form_helper = $this->createMock(\phpbb\form\form_helper::class); + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $this->language = new \phpbb\language\language($lang_loader); + $this->notification_manager = $this->createMock(\phpbb\notification\manager::class); + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $phpEx; + $symfony_request = $this->createMock(\phpbb\symfony_request::class); + $this->request = $this->createMock(\phpbb\request\request_interface::class); + $this->template = $this->createMock(\Twig\Environment::class); + $this->user = new \phpbb\user($this->language, '\phpbb\datetime'); + + $user = $this->user; + $this->user_loader = new \phpbb\user_loader($this->avatar_helper, $this->db, $this->phpbb_root_path, $this->php_ext, 'phpbb_users'); + $this->path_helper = new \phpbb\path_helper($symfony_request, $this->request, $phpbb_root_path, $phpEx); + + $this->controller = new webpush( + $this->config, + $this->controller_helper, + $this->db, + $this->form_helper, + $this->language, + $this->notification_manager, + $this->path_helper, + $this->request, + $this->user_loader, + $this->user, + $this->template, + 'phpbb_notification_push', + 'phpbb_push_subscriptions' + ); + } + + public static function data_notification_exceptions(): array + { + return [ + 'not_ajax' => [ + false, + false, + USER_NORMAL, + 2, + [], + 'NO_AUTH_OPERATION', + ], + 'is_bot' => [ + true, + true, + USER_NORMAL, + 2, + [], + 'NO_AUTH_OPERATION', + ], + 'inactive_user' => [ + true, + false, + USER_INACTIVE, + 2, + [], + 'NO_AUTH_OPERATION', + ], + 'ignore_user' => [ + true, + false, + USER_IGNORE, + 2, + [], + 'NO_AUTH_OPERATION', + ], + 'no_notification' => [ + true, + false, + USER_NORMAL, + 2, + [], + 'AJAX_ERROR_TEXT', + ], + 'no_notification_anonymous' => [ + true, + false, + USER_NORMAL, + ANONYMOUS, + [ + ['token', '', false, request_interface::REQUEST, 'foobar'], + ], + 'AJAX_ERROR_TEXT', + ], + 'no_notification_anonymous_no_token' => [ + true, + false, + USER_NORMAL, + ANONYMOUS, + [], + 'NO_AUTH_OPERATION', + ], + ]; + } + + /** + * @dataProvider data_notification_exceptions + */ + public function test_notification_no_data($is_ajax, $is_bot, $user_type, $user_id, $request_data, $expected_message) + { + $this->request->method('is_ajax')->willReturn($is_ajax); + $this->request->expects($this->any()) + ->method('variable') + ->willReturnMap($request_data); + $this->user->data = [ + 'is_bot' => $is_bot, + 'user_type' => $user_type, + 'user_id' => $user_id, + ]; + + $this->expectException(http_exception::class); + $this->expectExceptionMessage($expected_message); + + $this->controller->notification(); + } + + public function test_get_user_notification() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->avatar_helper, + $this->controller_helper, + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->willReturnMap([ + ['token', '', false, request_interface::REQUEST, 'foobar'], + ['item_id', 0, false, request_interface::REQUEST, 1], + ['type_id', 0, false, request_interface::REQUEST, 4], + ]); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => 2, + 'user_options' => 230271, + ]; + + $json_response = $this->controller->notification(); + + $response_data = json_decode($json_response->getContent(), true); + + $this->assertEquals([ + 'heading' => 'yourdomain.com', + 'title' => 'Quoted by Guest in:', + 'text' => '"Welcome to phpBB"', + 'url' => 'phpBB/viewtopic.php?p=1#p1', + 'avatar' => [], + ], $response_data); + } + + public function test_get_user_notification_anonymous() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->avatar_helper, + $this->controller_helper, + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->willReturnMap([ + ['token', '', false, request_interface::REQUEST, '0ccf8fcd96a66297b77b66109cbe9870e1a6fa66e42b9bf36d1f2c7263240058'], + ['item_id', 0, false, request_interface::REQUEST, 1], + ['type_id', 0, false, request_interface::REQUEST, 4], + ['user_id', 0, false, request_interface::REQUEST, 2], + ]); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => ANONYMOUS, + 'user_options' => 230271, + ]; + + $json_response = $this->controller->notification(); + + $response_data = json_decode($json_response->getContent(), true); + + $this->assertEquals([ + 'heading' => 'yourdomain.com', + 'title' => 'Quoted by Guest in:', + 'text' => '"Welcome to phpBB"', + 'url' => 'phpBB/viewtopic.php?p=1#p1', + 'avatar' => [], + ], $response_data); + } + + public function test_get_user_notification_anonymous_invalid_token() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->avatar_helper, + $this->controller_helper, + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->willReturnMap([ + ['token', '', false, request_interface::REQUEST, '488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967'], + ['item_id', 0, false, request_interface::REQUEST, 1], + ['type_id', 0, false, request_interface::REQUEST, 4], + ['user_id', 0, false, request_interface::REQUEST, 2], + ]); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => ANONYMOUS, + 'user_options' => 230271, + ]; + + $this->expectException(http_exception::class); + $this->expectExceptionMessage('NO_AUTH_OPERATION'); + + $this->controller->notification(); + } + + public function test_get_user_notification_legacy() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->avatar_helper, + $this->controller_helper, + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->willReturnMap([ + ['token', '', false, request_interface::REQUEST, 'foobar'], + ['item_id', 0, false, request_interface::REQUEST, 2], + ['type_id', 0, false, request_interface::REQUEST, 4], + ]); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => 2, + 'user_options' => 230271, + ]; + + $json_response = $this->controller->notification(); + + $response_data = json_decode($json_response->getContent(), true); + + $this->assertEquals([ + 'heading' => 'yourdomain.com', + 'title' => 'Quoted by Guest in:', + 'text' => '"Welcome to phpBB"', + 'url' => 'phpBB/viewtopic.php?p=1#p1', + 'avatar' => [], + ], $response_data); + } + + public function test_worker() + { + $this->template->method('render')->willReturn('rendered_content'); + $this->controller_helper->method('route')->willReturn('test_route'); + $this->config['assets_version'] = '1.0'; + + $response = $this->controller->worker(); + + $this->assertInstanceOf(Response::class, $response); + $this->assertEquals('text/javascript; charset=UTF-8', $response->headers->get('Content-Type')); + $this->assertEquals('rendered_content', $response->getContent()); + $this->assertNull($response->headers->get('X-PHPBB-IS-BOT')); + } + + public function test_worker_bot() + { + $this->template->method('render')->willReturn('rendered_content'); + $this->controller_helper->method('route')->willReturn('test_route'); + $this->config['assets_version'] = '1.0'; + $this->user->data['is_bot'] = true; + + $response = $this->controller->worker(); + + $this->assertEquals('yes', $response->headers->get('X-PHPBB-IS-BOT')); + } + + public function test_check_subscribe_requests_invalid_form_token() + { + $this->form_helper->method('check_form_tokens')->willReturn(false); + + $this->expectException(http_exception::class); + $this->expectExceptionMessage('FORM_INVALID'); + + $check_subscribe_reflection = new ReflectionMethod($this->controller, 'check_subscribe_requests'); + $check_subscribe_reflection->invoke($this->controller); + } + + public function test_check_subscribe_requests_anonymous_user() + { + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = ANONYMOUS; + + $this->expectException(http_exception::class); + $this->expectExceptionMessage('NO_AUTH_OPERATION'); + + $check_subscribe_reflection = new ReflectionMethod($this->controller, 'check_subscribe_requests'); + $check_subscribe_reflection->invoke($this->controller); + } + + public function test_subscribe_success() + { + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = 2; + $this->user->data['is_bot'] = false; + $this->user->data['user_type'] = USER_NORMAL; + + $symfony_request = $this->createMock(\phpbb\symfony_request::class); + $symfony_request->method('get')->willReturn(json_encode([ + 'endpoint' => 'test_endpoint', + 'expiration_time' => 0, + 'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'] + ])); + + $response = $this->controller->subscribe($symfony_request); + + $this->assertInstanceOf(JsonResponse::class, $response); + $this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true)); + + // Get subscription data from database + $sql = 'SELECT * + FROM phpbb_push_subscriptions + WHERE user_id = 2'; + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $this->assertEquals([ + 'user_id' => '2', + 'endpoint' => 'test_endpoint', + 'p256dh' => 'test_p256dh', + 'auth' => 'test_auth', + 'expiration_time' => 0, + 'subscription_id' => '1', + ], $row); + } + + public function test_unsubscribe_success() + { + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = 2; + $this->user->data['is_bot'] = false; + $this->user->data['user_type'] = USER_NORMAL; + + $symfony_request = $this->createMock(\phpbb\symfony_request::class); + $symfony_request->method('get')->willReturn(json_encode([ + 'endpoint' => 'test_endpoint', + 'expiration_time' => 0, + 'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'] + ])); + + $response = $this->controller->subscribe($symfony_request); + + $this->assertInstanceOf(JsonResponse::class, $response); + $this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true)); + + // Get subscription data from database + $sql = 'SELECT * + FROM phpbb_push_subscriptions + WHERE user_id = 2'; + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $this->assertEquals([ + 'user_id' => '2', + 'endpoint' => 'test_endpoint', + 'p256dh' => 'test_p256dh', + 'auth' => 'test_auth', + 'expiration_time' => 0, + 'subscription_id' => '1', + ], $row); + + // Now unsubscribe + $response = $this->controller->unsubscribe($symfony_request); + + $this->assertInstanceOf(JsonResponse::class, $response); + $this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true)); + + // Get subscription data from database + $sql = 'SELECT * + FROM phpbb_push_subscriptions + WHERE user_id = 2'; + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $this->assertEmpty($row); + } +} diff --git a/tests/ucp/fixtures/webpush.xml b/tests/ucp/fixtures/webpush.xml new file mode 100644 index 00000000000..a94086b9c32 --- /dev/null +++ b/tests/ucp/fixtures/webpush.xml @@ -0,0 +1,65 @@ + + + + item_id + push_data + push_token + user_id + notification_type_id + notification_time + + 1 + + 488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967 + 2 + 4 + 1738437884 + + + 2 + + 488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967 + 2 + 4 + 1738437884 + +
    + + notification_type_id + notification_type_name + notification_type_enabled + + 4 + notification.type.quote + 1 + +
    + + user_id + username_clean + user_permissions + user_sig + user_form_salt + + 1 + Anonymous + + + + + + 2 + poster + + + sua0m6f0ektt1g9z + + + 3 + test + + + abcdef + +
    +     diff --git a/tests/ui/permission_roles_test.php b/tests/ui/permission_roles_test.php deleted file mode 100644 index de54cc788dc..00000000000 --- a/tests/ui/permission_roles_test.php +++ /dev/null @@ -1,90 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -/** -* @group ui -*/ -class ui_permission_roles_test extends phpbb_ui_test_case -{ - - public function test_permission_roles() - { - $this->login(); - $this->admin_login(); - $this->add_lang('acp/permissions'); - $this->visit('adm/index.php?i=acp_permissions&mode=setting_forum_local&sid=' . $this->sid); - - // Select forums - $elements = $this->find_element('cssSelector', 'select#forum') - ->findElements(\Facebook\WebDriver\WebDriverBy::tagName('option')); - - foreach ($elements as $element) - { - $element->click(); - } - $this->find_element('cssSelector', 'form#select_victim') - ->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('input[type=submit]')) - ->click(); - - // Select administrators and guests - $groups_form = $this->find_element('cssSelector', 'form#groups'); - $elements = $groups_form - ->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('select')) - ->findElements(\Facebook\WebDriver\WebDriverBy::tagName('option')); - - foreach ($elements as $element) - { - if ($element->getText() === 'Administrators' || $element->getText() === 'Guests') - { - $element->click(); - } - } - $groups_form->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('input[name=submit_edit_options]'))->click(); - - $first_fieldset = $this->find_element('cssSelector', '#perm11'); - $this->assertEquals('none', $first_fieldset->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('div.dropdown'))->getCSSValue('display')); - $first_fieldset - ->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('span.dropdown-toggle')) - ->click(); - $this->assertEquals('block', $first_fieldset->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('div.dropdown'))->getCSSValue('display')); - $lis = $first_fieldset - ->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('ul > li')); - - foreach ($lis as $li) - { - if ($li->getAttribute('data-id') == 18) - { - $li->click(); - - break; - } - } - $this->assertEquals('none', $first_fieldset->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('div.dropdown'))->getCSSValue('display')); - $this->assertEquals(18, $first_fieldset->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('input[type=hidden]'))->getAttribute('value')); - $this->assertEquals($this->lang('ROLE_FORUM_LIMITED'), $first_fieldset->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('span.dropdown-toggle'))->getText()); - - // Check that admin settings didn't get changed - $second_fieldset = $this->find_element('cssSelector', '#perm10'); - $this->assertEquals('none', $second_fieldset->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('div.dropdown'))->getCSSValue('display')); - // Full access = 14 - $this->assertEquals(14, $second_fieldset->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('input[type=hidden]'))->getAttribute('value')); - $this->assertEquals($this->lang('ROLE_FORUM_FULL'), $second_fieldset->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('span.dropdown-toggle'))->getText()); - - // Check that category settings were not modified - $category_fieldset = $this->find_element('cssSelector', '#perm00'); - $this->assertEquals('none', $category_fieldset->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('div.dropdown'))->getCSSValue('display')); - // No settings - $this->assertEquals('', $category_fieldset->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('input[type=hidden]'))->getAttribute('value')); - $this->assertEquals($this->lang('NO_ROLE_ASSIGNED'), $category_fieldset->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector('span.dropdown-toggle'))->getText()); - } -} diff --git a/tests/ui/quick_links_test.php b/tests/ui/quick_links_test.php deleted file mode 100644 index 171ef3ca53f..00000000000 --- a/tests/ui/quick_links_test.php +++ /dev/null @@ -1,26 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -/** -* @group ui -*/ -class quick_links_test extends phpbb_ui_test_case -{ - public function test_quick_links() - { - $this->visit('index.php'); - $this->assertEmpty($this->find_element('className', 'dropdown')->getText()); - $this->find_element('className', 'dropdown-toggle')->click(); - $this->assertNotNull($this->find_element('className', 'dropdown')->getText()); - } -} diff --git a/tests/update/controller_test.php b/tests/update/controller_test.php new file mode 100644 index 00000000000..bba0186b7f7 --- /dev/null +++ b/tests/update/controller_test.php @@ -0,0 +1,351 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\update\controller; +use phpbb\update\get_updates; +use phpbb\filesystem\filesystem; +use phpbb\language\language; + +class phpbb_update_controller_test extends \phpbb_test_case +{ + private $filesystem; + private $filesystem_mock; + private $updater_mock; + private $language_mock; + private $phpbb_root_path; + + protected function setUp(): void + { + global $phpbb_root_path; + + $this->filesystem = new filesystem(); + $this->filesystem_mock = $this->createMock(filesystem::class); + $this->updater_mock = $this->createMock(get_updates::class); + $this->language_mock = $this->createMock(language::class); + $this->phpbb_root_path = $phpbb_root_path; + } + + protected function tearDown(): void + { + $this->filesystem->remove([ + $this->phpbb_root_path . 'store/update.zip', + $this->phpbb_root_path . 'store/update.zip.sig', + $this->phpbb_root_path . 'store/update', + ]); + } + + public function test_download_fails(): void + { + $this->updater_mock->expects($this->once()) + ->method('download') + ->willReturn(false); + + $this->language_mock->expects($this->once()) + ->method('lang') + ->with('UPDATE_PACKAGE_DOWNLOAD_FAILURE') + ->willReturnArgument(0); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'error', 'error' => 'UPDATE_PACKAGE_DOWNLOAD_FAILURE'], $response); + } + + public function test_download_success(): void + { + $this->updater_mock->expects($this->once()) + ->method('download') + ->willReturn(true); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'continue'], $response); + } + + public function test_download_signature_fails(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', false], + [$this->phpbb_root_path . 'store/update', false], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('download') + ->with('https://example.com/update.zip.sig', $update_path . '.sig') + ->willReturn(false); + + $this->language_mock->expects($this->once()) + ->method('lang') + ->with('UPDATE_SIGNATURE_DOWNLOAD_FAILURE') + ->willReturnArgument(0); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'error', 'error' => 'UPDATE_SIGNATURE_DOWNLOAD_FAILURE'], $response); + } + + public function test_download_signature_success(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', false], + [$this->phpbb_root_path . 'store/update', false], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('download') + ->with('https://example.com/update.zip.sig', $update_path . '.sig') + ->willReturn(true); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'continue'], $response); + } + + public function test_signature_validation_fails(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', false], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('validate') + ->willReturn(false); + + $this->language_mock->expects($this->once()) + ->method('lang') + ->with('UPDATE_SIGNATURE_INVALID') + ->willReturnArgument(0); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'error', 'error' => 'UPDATE_SIGNATURE_INVALID'], $response); + } + + public function test_extract_fails(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', false], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('validate') + ->willReturn(true); + + $this->updater_mock->expects($this->once()) + ->method('extract') + ->willReturn(false); + + $this->language_mock->expects($this->once()) + ->method('lang') + ->with('UPDATE_PACKAGE_EXTRACT_FAILURE') + ->willReturnArgument(0); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'error', 'error' => 'UPDATE_PACKAGE_EXTRACT_FAILURE'], $response); + } + + public function test_extract_success(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', false], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('validate') + ->willReturn(true); + + $this->updater_mock->expects($this->once()) + ->method('extract') + ->willReturn(true); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'continue'], $response); + } + + public function test_copy_fails(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + $this->filesystem->touch($update_path); // Simulate existing update file + $this->filesystem->touch($update_path . '.sig'); // Simulate existing signature file + $this->filesystem->mkdir($this->phpbb_root_path . 'store/update'); + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', true], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('copy') + ->willReturn(false); + + $this->language_mock->expects($this->once()) + ->method('lang') + ->with('UPDATE_FILES_COPY_FAILURE') + ->willReturnArgument(0); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'error', 'error' => 'UPDATE_FILES_COPY_FAILURE'], $response); + } + + public function test_copy_success(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + $this->filesystem->touch($update_path); // Simulate existing update file + $this->filesystem->touch($update_path . '.sig'); // Simulate existing signature file + $this->filesystem->mkdir($this->phpbb_root_path . 'store/update'); + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', true], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('copy') + ->willReturn(true); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'continue'], $response); + } + + public function test_successful_update_process(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + $signature_path = $update_path . '.sig'; + $update_dir = $this->phpbb_root_path . 'store/update'; + + $this->filesystem->touch($update_path); + $this->filesystem->touch($signature_path); + $this->filesystem->mkdir($update_dir); + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', true], + [$this->phpbb_root_path . 'install', true], + ]); + + $this->filesystem_mock->expects($this->once()) + ->method('remove') + ->with([$update_dir, $update_path, $signature_path]); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'done'], $response); + } +} \ No newline at end of file diff --git a/tests/update/get_updates_test.php b/tests/update/get_updates_test.php new file mode 100644 index 00000000000..c756972ae7e --- /dev/null +++ b/tests/update/get_updates_test.php @@ -0,0 +1,322 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use GuzzleHttp\Client; +use GuzzleHttp\Exception\ClientException; +use GuzzleHttp\Psr7\Response; +use phpbb\filesystem\exception\filesystem_exception; +use phpbb\filesystem\filesystem_interface; +use phpbb\update\get_updates; + +class phpbb_update_get_updates_test extends phpbb_test_case +{ + private $filesystem; + private $http_client; + private $zipper; + private $update; + private $public_key = 'atest_public_keyatest_public_keyatest_public_keyatest_public_key'; + + private $file_path = __DIR__ . '/../tmp/download.zip'; + + private $signature_path = __DIR__ . '/../tmp/signature.sig'; + + private $phpbb_root_path; + + public function setUp(): void + { + global $phpbb_root_path; + + parent::setUp(); + + $this->filesystem = $this->createMock(filesystem_interface::class); + $this->http_client = $this->createMock(Client::class); + $this->zipper = $this->createMock(ZipArchive::class); + $this->phpbb_root_path = $phpbb_root_path; + + // Set up the `get_updates` instance with injected mocks. + $this->update = new get_updates($this->filesystem, base64_encode($this->public_key), $this->phpbb_root_path); + } + + public function tearDown(): void + { + if (file_exists($this->file_path)) + { + unlink($this->file_path); + } + + if (file_exists($this->signature_path)) + { + unlink($this->signature_path); + } + + parent::tearDown(); + } + + public function test_download_success() + { + $response_mock = $this->createMock(Response::class); + $this->http_client->expects($this->once()) + ->method('request') + ->with('GET', 'http://example.com/update.zip', [ + 'sink' => '/path/to/storage', + 'allow_redirects' => false + ]) + ->willReturn($response_mock); + + $client_reflection = new \ReflectionProperty($this->update, 'http_client'); + $client_reflection->setValue($this->update, $this->http_client); + + $result = $this->update->download('http://example.com/update.zip', '/path/to/storage'); + $this->assertTrue($result); + } + + public function test_download_failure() + { + $this->http_client->expects($this->once()) + ->method('request') + ->willReturnCallback(function ($method, $url, $options) + { + throw new ClientException('bad client', new \GuzzleHttp\Psr7\Request($method, $url), new \GuzzleHttp\Psr7\Response()); + }); + $client_reflection = new \ReflectionProperty($this->update, 'http_client'); + $client_reflection->setValue($this->update, $this->http_client); + + $result = $this->update->download('http://example.com/update.zip', '/path/to/storage'); + $this->assertFalse($result); + } + + public function test_validate_success() + { + $keypair = sodium_crypto_sign_keypair(); + + $secret_key = sodium_crypto_sign_secretkey($keypair); + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + $hash = hash_file('sha384', $this->file_path, true); + file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key))); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertTrue($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_validate_file_not_exist() + { + $file_path = __DIR__ . '/../tmp/download.zip'; + $signature_path = __DIR__ . '/../tmp/signature.sig'; + + $keypair = sodium_crypto_sign_keypair(); + + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($file_path, $signature_path)); + } + + public function test_validate_sig_not_exist() + { + $keypair = sodium_crypto_sign_keypair(); + + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_validate_file_not_accessible() + { + if (strtolower(substr(PHP_OS, 0, 3)) === 'win') + { + $this->markTestSkipped('Unable to test unreadable files on Windows'); + } + + $keypair = sodium_crypto_sign_keypair(); + + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + chmod($this->file_path, 0000); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + + chmod($this->file_path, 0666); + } + + public function test_validate_sig_not_accessible() + { + if (strtolower(substr(PHP_OS, 0, 3)) === 'win') + { + $this->markTestSkipped('Unable to test unreadable files on Windows'); + } + + $keypair = sodium_crypto_sign_keypair(); + + $secret_key = sodium_crypto_sign_secretkey($keypair); + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + $hash = hash_file('sha384', $this->file_path, true); + file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key))); + + chmod($this->signature_path, 0000); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + + chmod($this->signature_path, 0666); + } + + public function test_validate_sig_not_base64() + { + $keypair = sodium_crypto_sign_keypair(); + + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + file_put_contents($this->signature_path, 'SGVsbG8gV29ybGQ==='); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_validate_invalid_pub_key() + { + $keypair = sodium_crypto_sign_keypair(); + + $secret_key = sodium_crypto_sign_secretkey($keypair); + + file_put_contents($this->file_path, 'test file content'); + + $hash = hash_file('sha384', $this->file_path, true); + file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key))); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, '!not!base64'); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_validate_fail() + { + $keypair = sodium_crypto_sign_keypair(); + + $secret_key = sodium_crypto_sign_secretkey($keypair); + + // Recreate keypair for different public key + $keypair = sodium_crypto_sign_keypair(); + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + $hash = hash_file('sha384', $this->file_path, true); + file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key))); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_validate_invalid_pub_key_length() + { + $keypair = sodium_crypto_sign_keypair(); + + $secret_key = sodium_crypto_sign_secretkey($keypair); + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair) . 'Foo='); + + file_put_contents($this->file_path, 'test file content'); + + $hash = hash_file('sha384', $this->file_path, true); + file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key))); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_extract_success() + { + $this->zipper->expects($this->once()) + ->method('open') + ->with('/path/to/zipfile.zip') + ->willReturn(true); + + $this->zipper->expects($this->once()) + ->method('extractTo') + ->with('/path/to/extract') + ->willReturn(true); + + $this->zipper->expects($this->once()) + ->method('close'); + + $zipperReflection = new \ReflectionProperty($this->update, 'zipper'); + $zipperReflection->setValue($this->update, $this->zipper); + + $result = $this->update->extract('/path/to/zipfile.zip', '/path/to/extract'); + $this->assertTrue($result); + } + + public function test_extract_failure() + { + $this->zipper->expects($this->once()) + ->method('open') + ->with('/path/to/zipfile.zip') + ->willReturn(false); + + $zipperReflection = new \ReflectionProperty($this->update, 'zipper'); + $zipperReflection->setValue($this->update, $this->zipper); + + $result = $this->update->extract('/path/to/zipfile.zip', '/path/to/extract'); + $this->assertFalse($result); + } + + public function test_copy_success() + { + $this->filesystem->expects($this->once()) + ->method('mirror') + ->with('/source/dir', $this->phpbb_root_path); + + $result = $this->update->copy('/source/dir'); + $this->assertTrue($result); + } + + public function test_copy_failure() + { + $this->filesystem->expects($this->once()) + ->method('mirror') + ->willThrowException(new filesystem_exception()); + + $result = $this->update->copy('/source/dir'); + $this->assertFalse($result); + } +} diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php index 18b6deed1f2..ed202757831 100644 --- a/tests/upload/filespec_test.php +++ b/tests/upload/filespec_test.php @@ -15,7 +15,6 @@ class phpbb_filespec_test extends phpbb_test_case { const TEST_COUNT = 100; const PREFIX = 'phpbb_'; - const MAX_STR_LEN = 50; const UPLOAD_MAX_FILESIZE = 1000; private $config; @@ -28,7 +27,9 @@ class phpbb_filespec_test extends phpbb_test_case /** @var string phpBB root path */ protected $phpbb_root_path; - protected function setUp() + protected $mimetype_guesser; + + protected function setUp(): void { // Global $config required by unique_id global $config, $phpbb_root_path, $phpEx; @@ -65,8 +66,8 @@ protected function setUp() } $guessers = array( - new \Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser(), - new \Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser(), + new \Symfony\Component\Mime\FileinfoMimeTypeGuesser(), + new \Symfony\Component\Mime\FileBinaryMimeTypeGuesser(), new \phpbb\mimetype\content_guesser(), new \phpbb\mimetype\extension_guesser(), ); @@ -79,10 +80,9 @@ protected function setUp() $this->phpbb_root_path = $phpbb_root_path; } - private function set_reflection_property(&$class, $property_name, $value) + private function set_reflection_property($class, $property_name, $value) { $property = new ReflectionProperty($class, $property_name); - $property->setAccessible(true); $property->setValue($class, $value); } @@ -101,7 +101,7 @@ private function get_filespec($override = array()) return $filespec->set_upload_ary(array_merge($upload_ary, $override)); } - protected function tearDown() + protected function tearDown(): void { $this->config = array(); @@ -123,7 +123,7 @@ public function test_empty_upload_ary() $this->assertTrue($filespec->init_error()); } - public function additional_checks_variables() + public static function additional_checks_variables() { // False here just indicates the file is too large and fails the // filespec::additional_checks method because of it. All other code @@ -164,7 +164,7 @@ public function test_additional_checks_dimensions() $this->assertSame(array('WRONG_SIZE'), $filespec->error); } - public function check_content_variables() + public static function check_content_variables() { // False here indicates that a file is non-binary and contains // disallowed content that makes IE report the mimetype incorrectly. @@ -189,7 +189,7 @@ public function test_check_content($filename, $expected) $this->assertEquals(true, $filespec->check_content(array())); } - public function clean_filename_variables() + public static function clean_filename_variables() { $chunks = str_split('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\'\\" /:*?<>|[];(){},#+=-_`', 8); return array( @@ -229,7 +229,7 @@ public function test_clean_filename_unique() $name = $filespec->get('realname'); $this->assertEquals(strlen($name), 32 + strlen(self::PREFIX)); - $this->assertRegExp('#^[A-Za-z0-9]+$#', substr($name, strlen(self::PREFIX))); + $this->assertMatchesRegularExpression('#^[A-Za-z0-9]+$#', substr($name, strlen(self::PREFIX))); $this->assertFalse(isset($filenames[$name])); $filenames[$name] = true; } @@ -245,13 +245,13 @@ public function test_clean_filename_unique_ext() $name = $filespec->get('realname'); $this->assertEquals(strlen($name), 32 + strlen(self::PREFIX) + strlen('.jpg')); - $this->assertRegExp('#^[A-Za-z0-9]+\.jpg$#', substr($name, strlen(self::PREFIX))); + $this->assertMatchesRegularExpression('#^[A-Za-z0-9]+\.jpg$#', substr($name, strlen(self::PREFIX))); $this->assertFalse(isset($filenames[$name])); $filenames[$name] = true; } } - public function data_clean_filename_avatar() + public static function data_clean_filename_avatar() { return array( array(false, false, ''), @@ -284,7 +284,7 @@ public function test_clean_filename_avatar($filename, $expected, $mode, $prefix $this->assertSame($expected, $filespec->get('realname')); } - public function get_extension_variables() + public static function get_extension_variables() { return array( array('file.png', 'png'), @@ -304,7 +304,7 @@ public function test_get_extension($filename, $expected) $this->assertEquals($expected, \phpbb\files\filespec::get_extension($filename)); } - public function is_image_variables() + public static function is_image_variables() { return array( array('gif', 'image/gif', true), @@ -327,7 +327,7 @@ public function test_is_image($filename, $mimetype, $expected) $this->assertEquals($expected, $filespec->is_image()); } - public function is_image_get_mimetype() + public static function is_image_get_mimetype() { return array( array('gif', 'image/gif', true), @@ -356,7 +356,7 @@ public function test_is_image_get_mimetype($filename, $mimetype, $expected) $this->assertEquals($expected, $filespec->is_image()); } - public function move_file_variables() + public static function move_file_variables() { return array( array('gif_copy', 'gif_moved', 'image/gif', 'gif', false, true), @@ -374,7 +374,7 @@ public function move_file_variables() public function test_move_file($tmp_name, $realname, $mime_type, $extension, $error, $expected) { // Global $phpbb_root_path and $phpEx are required by phpbb_chmod - global $phpbb_root_path, $phpEx; + global $phpbb_root_path; $this->phpbb_root_path = ''; $upload = new phpbb_mock_fileupload(); @@ -407,7 +407,7 @@ public function test_move_file_error() $this->assertFalse($filespec->move_file('foo')); } - public function data_move_file_copy() + public static function data_move_file_copy() { return array( array('gif_copy', true, false, array()), @@ -420,7 +420,7 @@ public function data_move_file_copy() /** * @dataProvider data_move_file_copy */ - public function test_move_file_copy($tmp_name, $move_success, $safe_mode_on, $expected_error) + public function test_move_file_copy($tmp_name, $move_success, $open_basedir_on, $expected_error) { // Initialise a blank filespec object for use with trivial methods $upload_ary = array( @@ -436,7 +436,7 @@ public function test_move_file_copy($tmp_name, $move_success, $safe_mode_on, $ex $php_ini->expects($this->any()) ->method('getBool') ->with($this->anything()) - ->willReturn($safe_mode_on); + ->willReturn($open_basedir_on); $upload = new phpbb_mock_fileupload(); $upload->max_filesize = self::UPLOAD_MAX_FILESIZE; $filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $php_ini, new \FastImageSize\FastImagesize, '', $this->mimetype_guesser); @@ -450,7 +450,7 @@ public function test_move_file_copy($tmp_name, $move_success, $safe_mode_on, $ex $this->assertSame($expected_error, $filespec->error); } - public function data_move_file_imagesize() + public static function data_move_file_imagesize() { return array( array( @@ -529,7 +529,7 @@ public function test_uploadname($filename) $type_cast_helper->set_var($upload_name, $filename, 'string', true, true); $filespec = $this->get_filespec(array('name'=> $upload_name)); - $this->assertSame(trim(utf8_basename(htmlspecialchars($filename))), $filespec->get('uploadname')); + $this->assertSame(trim(utf8_basename(htmlspecialchars($filename, ENT_COMPAT))), $filespec->get('uploadname')); } public function test_is_uploaded() @@ -537,7 +537,6 @@ public function test_is_uploaded() $filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \FastImageSize\FastImageSize(), $this->phpbb_root_path, null); $reflection_filespec = new ReflectionClass($filespec); $plupload_property = $reflection_filespec->getProperty('plupload'); - $plupload_property->setAccessible(true); $plupload_mock = $this->getMockBuilder('\phpbb\plupload\plupload') ->disableOriginalConstructor() ->getMock(); diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php index 84fc00bf985..c8e6bee9075 100644 --- a/tests/upload/fileupload_test.php +++ b/tests/upload/fileupload_test.php @@ -17,6 +17,7 @@ class phpbb_fileupload_test extends phpbb_test_case { private $path; + /** @var \phpbb\filesystem\filesystem */ private $filesystem; /** @var \Symfony\Component\DependencyInjection\ContainerInterface */ @@ -37,7 +38,9 @@ class phpbb_fileupload_test extends phpbb_test_case /** @var string phpBB root path */ protected $phpbb_root_path; - protected function setUp() + protected $mimetype_guesser; + + protected function setUp(): void { // Global $config required by unique_id global $config, $phpbb_root_path, $phpEx; @@ -56,8 +59,8 @@ protected function setUp() $this->filesystem = new \phpbb\filesystem\filesystem(); $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); $guessers = array( - new \Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser(), - new \Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser(), + new \Symfony\Component\Mime\FileinfoMimeTypeGuesser(), + new \Symfony\Component\Mime\FileBinaryMimeTypeGuesser(), new \phpbb\mimetype\content_guesser(), new \phpbb\mimetype\extension_guesser(), ); @@ -65,7 +68,7 @@ protected function setUp() $guessers[3]->set_priority(-2); $this->mimetype_guesser = new \phpbb\mimetype\guesser($guessers); - $this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx); + $this->container = new phpbb_mock_container_builder(); $this->container->set('files.filespec', new \phpbb\files\filespec( $this->filesystem, $this->language, @@ -107,7 +110,7 @@ private function gen_valid_filespec() return $filespec; } - protected function tearDown() + protected function tearDown(): void { // Clear globals global $config, $user; @@ -117,7 +120,7 @@ protected function tearDown() public function test_common_checks_invalid_extension() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_allowed_extensions(array('png')) ->set_max_filesize(100); $file = $this->gen_valid_filespec(); @@ -127,26 +130,26 @@ public function test_common_checks_invalid_extension() public function test_common_checks_disallowed_content() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_allowed_extensions(array('jpg')) ->set_max_filesize(1000); $file = new \phpbb\files\filespec($this->filesystem, $this->language, $this->php_ini, new \FastImageSize\FastImageSize(), $this->phpbb_root_path); $file->set_upload_ary(array( 'size' => 50, - 'tmp_name' => dirname(__FILE__) . '/fixture/disallowed', + 'tmp_name' => __DIR__ . '/fixture/disallowed', 'name' => 'disallowed.jpg', 'type' => 'image/jpg' )) ->set_upload_namespace($upload); - file_put_contents(dirname(__FILE__) . '/fixture/disallowed', '' . file_get_contents(dirname(__FILE__) . '/fixture/jpg')); + file_put_contents(__DIR__ . '/fixture/disallowed', '' . file_get_contents(__DIR__ . '/fixture/jpg')); $upload->common_checks($file); $this->assertEquals('DISALLOWED_CONTENT', $file->error[0]); - unlink(dirname(__FILE__) . '/fixture/disallowed'); + unlink(__DIR__ . '/fixture/disallowed'); } public function test_common_checks_invalid_filename() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_allowed_extensions(array('jpg')) ->set_max_filesize(100); $file = $this->gen_valid_filespec(); @@ -157,7 +160,7 @@ public function test_common_checks_invalid_filename() public function test_common_checks_too_large() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_allowed_extensions(array('jpg')) ->set_max_filesize(100); $file = $this->gen_valid_filespec(); @@ -168,7 +171,7 @@ public function test_common_checks_too_large() public function test_common_checks_valid_file() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_allowed_extensions(array('jpg')) ->set_max_filesize(1000); $file = $this->gen_valid_filespec(); @@ -178,12 +181,18 @@ public function test_common_checks_valid_file() public function test_local_upload() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_allowed_extensions(array('jpg')) ->set_max_filesize(1000); copy($this->path . 'jpg', $this->path . 'jpg.jpg'); - $file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg'); + // Upload file data should be set to prevent "Undefined array key" PHP 8 warning + $filedata = [ + 'size' => 519, + 'realname' => $this->path . 'jpg.jpg', + 'type' => false, + ]; + $file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg', $filedata); $this->assertEquals(0, count($file->error)); $this->assertFalse($file->additional_checks()); $this->assertTrue($file->move_file('../tests/upload/fixture/copies', true)); @@ -192,12 +201,18 @@ public function test_local_upload() public function test_move_existent_file() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_allowed_extensions(array('jpg')) ->set_max_filesize(1000); copy($this->path . 'jpg', $this->path . 'jpg.jpg'); - $file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg'); + // Upload file data should be set to prevent "Undefined array key" PHP 8 warning + $filedata = [ + 'size' => 519, + 'realname' => $this->path . 'jpg.jpg', + 'type' => false, + ]; + $file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg', $filedata); $this->assertEquals(0, count($file->error)); $this->assertFalse($file->move_file('../tests/upload/fixture')); $this->assertFalse($file->get('file_moved')); @@ -206,13 +221,19 @@ public function test_move_existent_file() public function test_move_existent_file_overwrite() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_allowed_extensions(array('jpg')) ->set_max_filesize(1000); copy($this->path . 'jpg', $this->path . 'jpg.jpg'); copy($this->path . 'jpg', $this->path . 'copies/jpg.jpg'); - $file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg'); + // Upload file data should be set to prevent "Undefined array key" PHP 8 warning + $filedata = [ + 'size' => 519, + 'realname' => $this->path . 'jpg.jpg', + 'type' => false, + ]; + $file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg', $filedata); $this->assertEquals(0, count($file->error)); $file->move_file('../tests/upload/fixture/copies', true); $this->assertEquals(0, count($file->error)); @@ -221,7 +242,7 @@ public function test_move_existent_file_overwrite() public function test_valid_dimensions() { - $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); + $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $upload->set_allowed_extensions(false) ->set_max_filesize(false) ->set_allowed_dimensions(1, 1, 100, 100); diff --git a/tests/upload/imagesize_test.php b/tests/upload/imagesize_test.php index 5429bb5c5ee..8ad12740ab6 100644 --- a/tests/upload/imagesize_test.php +++ b/tests/upload/imagesize_test.php @@ -20,14 +20,14 @@ class phpbb_upload_imagesize_test extends \phpbb_test_case /** @var string Path to fixtures */ protected $path; - public function setUp() + protected function setUp(): void { parent::setUp(); $this->imagesize = new \FastImageSize\FastImageSize(); $this->path = __DIR__ . '/fixture/'; } - public function data_get_imagesize() + public static function data_get_imagesize() { return array( array('foobar', 'image/bmp', false), diff --git a/tests/user/fixtures/user_loader_no_guest.xml b/tests/user/fixtures/user_loader_no_guest.xml new file mode 100644 index 00000000000..aaa9d4f0c15 --- /dev/null +++ b/tests/user/fixtures/user_loader_no_guest.xml @@ -0,0 +1,24 @@ + + + + user_id + user_permissions + username + username_clean + user_sig + + 2 + + Admin + admin + + + + 3 + + Test + test + + +
    +     diff --git a/tests/user/user_loader_no_guest_test.php b/tests/user/user_loader_no_guest_test.php new file mode 100644 index 00000000000..b152e615a7a --- /dev/null +++ b/tests/user/user_loader_no_guest_test.php @@ -0,0 +1,90 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +class phpbb_user_loader_no_guest_test extends phpbb_database_test_case +{ + protected $db; + protected $user_loader; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/user_loader_no_guest.xml'); + } + + protected function setUp(): void + { + parent::setUp(); + + $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') + ->disableOriginalConstructor() + ->getMock(); + $this->db = $this->new_dbal(); + $this->user_loader = new \phpbb\user_loader($avatar_helper, $this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users'); + } + + public function test_load_get() + { + $this->user_loader->load_users(array(2)); + + $user = $this->user_loader->get_user(1); + $this->assertFalse($user); + + $user = $this->user_loader->get_user(2); + $this->assertEquals(2, $user['user_id']); + $this->assertEquals('Admin', $user['username']); + } + + public function test_load_get_unloaded() + { + $this->user_loader->load_users(array(2)); + + $user = $this->user_loader->get_user(3); + $this->assertFalse($user); + + $user = $this->user_loader->get_user(3, true); + $this->assertEquals(3, $user['user_id']); + $this->assertEquals('Test', $user['username']); + } + + public function test_load_get_invalid() + { + $this->user_loader->load_users(array(2)); + + $user = $this->user_loader->get_user(9); + $this->assertFalse($user); + + $user = $this->user_loader->get_user(3, true); + $this->assertEquals(3, $user['user_id']); + $this->assertEquals('Test', $user['username']); + } + + public function test_load_get_invalid_query() + { + $this->user_loader->load_users(array(2)); + + $user = $this->user_loader->get_user(9, true); + $this->assertFalse($user); + + $user = $this->user_loader->get_user(3, true); + $this->assertEquals(3, $user['user_id']); + $this->assertEquals('Test', $user['username']); + } + + public function test_load_user_by_username() + { + $user_id = $this->user_loader->load_user_by_username('Test'); + $user = $this->user_loader->get_user($user_id); + $this->assertEquals(3, $user['user_id']); + $this->assertEquals('Test', $user['username']); + } +} diff --git a/tests/user/user_loader_test.php b/tests/user/user_loader_test.php index f871f324ca4..abc746ff8a1 100644 --- a/tests/user/user_loader_test.php +++ b/tests/user/user_loader_test.php @@ -18,15 +18,18 @@ class phpbb_user_loader_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_loader.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/user_loader.xml'); } - public function setUp() + protected function setUp(): void { parent::setUp(); + $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') + ->disableOriginalConstructor() + ->getMock(); $this->db = $this->new_dbal(); - $this->user_loader = new \phpbb\user_loader($this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users'); + $this->user_loader = new \phpbb\user_loader($avatar_helper, $this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users'); } public function test_load_get() @@ -55,6 +58,32 @@ public function test_load_get_unloaded() $this->assertEquals('Test', $user['username']); } + public function test_load_get_invalid() + { + $this->user_loader->load_users(array(2)); + + $user = $this->user_loader->get_user(9); + $this->assertEquals(1, $user['user_id']); + $this->assertEquals('Guest', $user['username']); + + $user = $this->user_loader->get_user(3, true); + $this->assertEquals(3, $user['user_id']); + $this->assertEquals('Test', $user['username']); + } + + public function test_load_get_invalid_query() + { + $this->user_loader->load_users(array(2)); + + $user = $this->user_loader->get_user(9, true); + $this->assertEquals(1, $user['user_id']); + $this->assertEquals('Guest', $user['username']); + + $user = $this->user_loader->get_user(3, true); + $this->assertEquals(3, $user['user_id']); + $this->assertEquals('Test', $user['username']); + } + public function test_load_user_by_username() { $user_id = $this->user_loader->load_user_by_username('Test'); diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php index 4b3c8a5a25a..9b1c6fc4cc5 100644 --- a/tests/utf/utf8_clean_string_test.php +++ b/tests/utf/utf8_clean_string_test.php @@ -13,7 +13,7 @@ class phpbb_utf_utf8_clean_string_test extends phpbb_test_case { - public function cleanable_strings() + public static function cleanable_strings() { return array( array('MiXed CaSe', 'mixed case', 'Checking case folding'), diff --git a/tests/version/fixture/30x.txt b/tests/version/fixture/30x.txt new file mode 100644 index 00000000000..f138ad0c83b --- /dev/null +++ b/tests/version/fixture/30x.txt @@ -0,0 +1,4 @@ +3.0.14 +https://www.phpbb.com/community/viewtopic.php?f=14&t=2313941 +3.3.12 +https://www.phpbb.com/community/viewtopic.php?t=2653732 diff --git a/tests/version/version_fetch_test.php b/tests/version/version_fetch_test.php index c44bd5514ab..b138ff4aff8 100644 --- a/tests/version/version_fetch_test.php +++ b/tests/version/version_fetch_test.php @@ -14,9 +14,11 @@ /* * @group slow */ -class phpbb_version_helper_fetch_test extends phpbb_test_case +class phpbb_version_fetch_test extends phpbb_test_case { - public function setUp() + protected $cache, $version_helper; + + protected function setUp(): void { parent::setUp(); @@ -42,7 +44,7 @@ public function test_version_phpbb_com() global $phpbb_root_path, $phpEx; include_once($phpbb_root_path . 'includes/functions.' . $phpEx); - if (!phpbb_checkdnsrr('version.phpbb.com', 'A')) + if (!checkdnsrr('version.phpbb.com', 'A')) { $this->markTestSkipped(sprintf( 'Could not find a DNS record for hostname %s. ' . diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php index 7b8d71181f3..abc5475ad3a 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -1,4 +1,7 @@ '3.1.0', )); $container = new \phpbb_mock_container_builder(); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $db = new \phpbb\db\driver\factory($container); $this->cache = $this->getMockBuilder('\phpbb\cache\service') - ->setMethods(array('get')) - ->setConstructorArgs(array(new \phpbb\cache\driver\dummy(), $config, $db, '../../', 'php')) + ->addMethods(array('get')) + ->setConstructorArgs(array(new \phpbb\cache\driver\dummy(), $config, $db, $phpbb_dispatcher, '../../', 'php')) ->getMock(); $this->cache->expects($this->any()) ->method('get') - ->with($this->anything()) + ->withAnyParameters() ->will($this->returnValue(false)); - $this->file_downloader = new phpbb_mock_file_downloader(); + + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->addMethods(['set_data']) + ->onlyMethods(['request']) + ->getMock(); + $this->guzzle_mock->method('set_data') + ->will($this->returnCallback(function($data) + { + $this->guzzle_data = $data; + } + )); + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function() + { + return new \GuzzleHttp\Psr7\Response($this->guzzle_status, [], $this->guzzle_data); + } + )); + + $this->file_downloader = $this->getMockBuilder('\phpbb\file_downloader') + ->onlyMethods(['create_client']) + ->getMock(); + $this->file_downloader->method('create_client') + ->will($this->returnValue($this->guzzle_mock)); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); @@ -52,7 +84,7 @@ public function setUp() $this->user->add_lang('acp/common'); } - public function provider_get_versions() + public static function provider_get_versions() { return array( array('', false, '', 'VERSIONCHECK_FAIL'), @@ -201,14 +233,18 @@ public function provider_get_versions() */ public function test_get_versions($input, $valid_data, $expected_return = '', $expected_exception = '') { - $this->file_downloader->set($input); + $this->guzzle_mock->set_data($input); + + // version_helper->get_versions() doesn't return a value on VERSIONCHECK_FAIL but only throws exception + // so the $return is undefined. Define it here + $return = false; if (!$valid_data) { try { $return = $this->version_helper->get_versions(); } catch (\phpbb\exception\runtime_exception $e) { - $this->assertEquals((string)$e->getMessage(), $expected_exception); + $this->assertEquals($expected_exception, $e->getMessage()); } } else @@ -218,4 +254,206 @@ public function test_get_versions($input, $valid_data, $expected_return = '', $e $this->assertEquals($expected_return, $return); } + + public function test_version_phpbb_com() + { + $guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $guzzle_mock->method('request') + ->will($this->returnCallback(function() + { + return new \GuzzleHttp\Psr7\Response(200, [], file_get_contents(__DIR__ . '/fixture/30x.txt')); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($guzzle_mock); + + $hostname = 'version.phpbb.com'; + + $file = $file_downloader->get($hostname, '/phpbb', '30x.txt'); + $errstr = $file_downloader->get_error_string(); + $errno = $file_downloader->get_error_number(); + + $this->assertNotEquals( + 0, + strlen($file), + 'Failed asserting that the response is not empty.' + ); + + $this->assertSame( + '', + $errstr, + 'Failed asserting that the error string is empty.' + ); + + $this->assertSame( + 0, + $errno, + 'Failed asserting that the error number is 0 (i.e. no error occurred).' + ); + + $lines = explode("\n", $file); + + $this->assertGreaterThanOrEqual( + 2, + count($lines), + 'Failed asserting that the version file has at least two lines.' + ); + + $this->assertStringStartsWith( + '3.', + $lines[0], + "Failed asserting that the first line of the version file starts with '3.'" + ); + + $this->assertNotSame( + false, + filter_var($lines[1], FILTER_VALIDATE_URL), + 'Failed asserting that the second line of the version file is a valid URL.' + ); + + $this->assertStringContainsString('http', $lines[1]); + $this->assertStringContainsString('phpbb.com', $lines[1], '', true); + } + + public function test_file_downloader_file_not_found() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function() + { + return new \GuzzleHttp\Psr7\Response(404, [], ''); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FILE_NOT_FOUND'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } + + public function test_file_downloader_exception_not_found() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + $request = new \GuzzleHttp\Psr7\Request('GET', $uri); + $response = new \GuzzleHttp\Psr7\Response(404, [], ''); + throw new RequestException('FILE_NOT_FOUND', $request, $response); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FILE_NOT_FOUND'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } + + public function test_file_downloader_exception_moved() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + $request = new \GuzzleHttp\Psr7\Request('GET', $uri); + $response = new \GuzzleHttp\Psr7\Response(302, [], ''); + throw new RequestException('FILE_MOVED', $request, $response); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->assertFalse($file_downloader->get('foo.com', 'bar', 'foo.txt')); + $this->assertEquals(302, $file_downloader->get_error_number()); + $this->assertEquals('FILE_MOVED', $file_downloader->get_error_string()); + } + + public function test_file_downloader_exception_timeout() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + $request = new \GuzzleHttp\Psr7\Request('GET', $uri); + throw new RequestException('FILE_NOT_FOUND', $request); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FSOCK_TIMEOUT'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } + + public function test_file_downloader_exception_other() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + throw new \RuntimeException('FSOCK_NOT_SUPPORTED'); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FSOCK_DISABLED'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } } diff --git a/tests/version/version_test.php b/tests/version/version_helper_test.php similarity index 79% rename from tests/version/version_test.php rename to tests/version/version_helper_test.php index 2a0240f8475..0683fac5558 100644 --- a/tests/version/version_test.php +++ b/tests/version/version_helper_test.php @@ -13,7 +13,10 @@ class phpbb_version_helper_test extends phpbb_test_case { - public function setUp() + protected $cache; + protected $version_helper; + + protected function setUp(): void { parent::setUp(); @@ -34,7 +37,7 @@ public function setUp() ); } - public function is_stable_data() + public static function is_stable_data() { return array( array( @@ -84,7 +87,7 @@ public function test_is_stable($version, $expected) $this->assertSame($expected, $this->version_helper->is_stable($version)); } - public function get_suggested_updates_data() + public static function get_suggested_updates_data() { return array( array( @@ -205,7 +208,7 @@ public function test_get_suggested_updates($current_version, $versions, $expecte $version_helper = $this ->getMockBuilder('\phpbb\version_helper') - ->setMethods(array( + ->onlyMethods(array( 'get_versions_matching_stability', )) ->setConstructorArgs(array( @@ -226,7 +229,7 @@ public function test_get_suggested_updates($current_version, $versions, $expecte $this->assertSame($expected, $version_helper->get_suggested_updates()); } - public function get_latest_on_current_branch_data() + public static function get_latest_on_current_branch_data() { return array( array( @@ -321,7 +324,7 @@ public function test_get_latest_on_current_branch($current_version, $versions, $ $version_helper = $this ->getMockBuilder('\phpbb\version_helper') - ->setMethods(array( + ->onlyMethods(array( 'get_versions_matching_stability', )) ->setConstructorArgs(array( @@ -342,7 +345,7 @@ public function test_get_latest_on_current_branch($current_version, $versions, $ $this->assertSame($expected, $version_helper->get_latest_on_current_branch()); } - public function get_update_on_branch_data() + public static function get_update_on_branch_data() { return array( array( @@ -350,13 +353,19 @@ public function get_update_on_branch_data() array( '1.0' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '1.1' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -364,9 +373,13 @@ public function get_update_on_branch_data() array( '1.0' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '1.1' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array(), @@ -376,13 +389,19 @@ public function get_update_on_branch_data() array( '1.0' => array( 'current' => '1.0.1-a2', + 'eol' => false, + 'security' => false, ), '1.1' => array( 'current' => '1.1.0', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.0.1-a2', + 'eol' => false, + 'security' => false, ), ), array( @@ -390,13 +409,19 @@ public function get_update_on_branch_data() array( '1.0' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '1.1' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -404,9 +429,13 @@ public function get_update_on_branch_data() array( '1.0' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '1.1' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array(), @@ -416,13 +445,19 @@ public function get_update_on_branch_data() array( '1.0' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '1.1' => array( 'current' => '1.1.0-a2', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.0-a2', + 'eol' => false, + 'security' => false, ), ), array( @@ -436,14 +471,18 @@ public function get_update_on_branch_data() array( '1.0' => array( 'current' => '1.0.1', + 'eol' => false, 'security' => '1.0.1', ), '1.1' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.0.1', + 'eol' => false, 'security' => '1.0.1', ), ), @@ -453,14 +492,18 @@ public function get_update_on_branch_data() array( '1.0' => array( 'current' => '1.0.1', + 'eol' => false, 'security' => '1.0.0', ), '1.1' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.0.1', + 'eol' => false, 'security' => '1.0.0', ), ), @@ -470,14 +513,19 @@ public function get_update_on_branch_data() array( '1.0' => array( 'current' => '1.0.1', + 'eol' => false, 'security' => '1.1.0', ), '1.1' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), // Latest 1.0 release is EOL @@ -487,13 +535,18 @@ public function get_update_on_branch_data() '1.0' => array( 'current' => '1.0.1', 'eol' => true, + 'security' => false, ), '1.1' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), // All are EOL -- somewhat undefined behavior @@ -503,10 +556,12 @@ public function get_update_on_branch_data() '1.0' => array( 'current' => '1.0.1', 'eol' => true, + 'security' => false, ), '1.1' => array( 'current' => '1.1.1', 'eol' => true, + 'security' => false, ), ), array(), @@ -526,7 +581,7 @@ public function test_get_update_on_branch($current_version, $versions, $expected $version_helper = $this ->getMockBuilder('\phpbb\version_helper') - ->setMethods(array( + ->onlyMethods(array( 'get_versions_matching_stability', )) ->setConstructorArgs(array( @@ -547,7 +602,7 @@ public function test_get_update_on_branch($current_version, $versions, $expected $this->assertSame($expected, $version_helper->get_update_on_branch()); } - public function get_ext_update_on_branch_data() + public static function get_ext_update_on_branch_data() { return array( // Single branch, check version for current branch @@ -557,10 +612,14 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -569,6 +628,8 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), ), array(), @@ -579,10 +640,14 @@ public function get_ext_update_on_branch_data() array( '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -591,6 +656,8 @@ public function get_ext_update_on_branch_data() array( '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array(), @@ -602,10 +669,14 @@ public function get_ext_update_on_branch_data() array( '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -614,6 +685,8 @@ public function get_ext_update_on_branch_data() array( '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array(), @@ -624,10 +697,14 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -636,6 +713,8 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), ), array(), @@ -646,10 +725,14 @@ public function get_ext_update_on_branch_data() array( '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -658,6 +741,8 @@ public function get_ext_update_on_branch_data() array( '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array(), @@ -669,13 +754,19 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -684,9 +775,13 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array(), @@ -697,9 +792,13 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array(), @@ -710,13 +809,19 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -725,13 +830,19 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -740,9 +851,13 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array(), @@ -754,13 +869,19 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -769,13 +890,19 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -784,13 +911,19 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array( @@ -799,9 +932,13 @@ public function get_ext_update_on_branch_data() array( '3.1' => array( 'current' => '1.0.1', + 'eol' => false, + 'security' => false, ), '3.2' => array( 'current' => '1.1.1', + 'eol' => false, + 'security' => false, ), ), array(), @@ -821,7 +958,7 @@ public function test_get_ext_update_on_branch($phpbb_version, $ext_version, $ver $version_helper = $this ->getMockBuilder('\phpbb\version_helper') - ->setMethods(array( + ->onlyMethods(array( 'get_versions_matching_stability', )) ->setConstructorArgs(array( diff --git a/tests/viewonline/helper_test.php b/tests/viewonline/helper_test.php index 6540d33287a..d383f9b2f2b 100644 --- a/tests/viewonline/helper_test.php +++ b/tests/viewonline/helper_test.php @@ -13,14 +13,77 @@ class phpbb_viewonline_helper_test extends phpbb_test_case { - public function setUp() + protected $viewonline_helper; + private $auth; + + protected function setUp(): void { + global $phpbb_dispatcher; + parent::setUp(); - $this->viewonline_helper = new \phpbb\viewonline_helper(new \phpbb\filesystem\filesystem()); + $phpbb_root_path = __DIR__ . '/../../phpBB/'; + $phpEx = 'php'; + + $db = $this->getMockBuilder('\phpbb\db\driver\driver_interface') + ->disableOriginalConstructor() + ->getMock(); + + // Mock database to return forum data + $forum_data = [ + 'forum_id' => 1, + 'forum_name' => 'Test Forum', + 'parent_id' => 0, + 'forum_type' => FORUM_POST, + 'left_id' => 1, + 'right_id' => 2, + ]; + + $db->method('sql_fetchrow')->willReturnOnConsecutiveCalls($forum_data, false); + + $config = new \phpbb\config\config([]); + + $dispatcher = new phpbb_mock_event_dispatcher(); + $phpbb_dispatcher = $dispatcher; + + + $container = new phpbb_mock_container_builder(); + $container->setParameter('core.environment', PHPBB_ENVIRONMENT); + + $loader = new \Symfony\Component\Routing\Loader\YamlFileLoader( + new \phpbb\routing\file_locator($phpbb_root_path) + ); + + $extension_manager = new phpbb_mock_extension_manager($phpbb_root_path); + $resources_locator = new \phpbb\routing\resources_locator\default_resources_locator( + $phpbb_root_path, + PHPBB_ENVIRONMENT, + $extension_manager + ); + + // Create router + $router = new phpbb_mock_router($container, $resources_locator, $loader, $phpEx, './', '', ''); + + // Mock controller helper to use the real router for generating route URLs + $controller_helper = $this->getMockBuilder('\phpbb\controller\helper') + ->disableOriginalConstructor() + ->getMock(); + $controller_helper->method('route') + ->willReturnCallback(function($route) use ($router) { + // Use the real router to generate the actual URL for the route + return '.' . $router->generate($route); + }); + + $language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); + + $this->auth = $this->getMockBuilder('\phpbb\auth\auth') + ->disableOriginalConstructor() + ->getMock(); + + $this->viewonline_helper = new \phpbb\members\viewonline_helper($db, $config, $dispatcher, $router, $controller_helper, $language, $this->auth, './', $phpEx, 'adm/', '%tables.users%', '%tables.sessions%', '%tables.topics%', '%tables.forums%'); } - public function session_pages_data() + public static function session_pages_data() { return array( array('index.php', 'index'), @@ -43,4 +106,80 @@ public function test_get_user_page($session_page, $expected) $this->assertArrayHasKey(1, $on_page); $this->assertSame($expected, $on_page[1]); } + + public static function get_location_data() + { + return array( + // Route-based pages - routes have prefixes as defined in routing.yml + // index + array('', 0, true, 'Index page', './'), + array('/', 0, true, 'Index page', './'), + array('/app.php/', 0, true, 'Index page', './'), + array('index.php', 0, true, 'Index page', './index.php'), + array('./index.php', 0, true, 'Index page', './index.php'), + // help.yml routes have prefix /help + array('/help/bbcode', 0, true, 'Viewing FAQ', './help/faq'), + array('/help/faq', 0, true, 'Viewing FAQ', './help/faq'), + // members.yml routes have prefix /members + array('/members/online', 0, true, 'Viewing who is online', './members/online'), + array('/members/online/whois/abc123', 0, true, 'Viewing who is online', './members/online'), + array('/members/team', 0, true, 'Viewing member details', './memberlist.php'), + // report.yml routes have no prefix + array('/pm/5/report', 0, true, 'Reporting post', './index.php'), + array('/post/10/report', 0, true, 'Reporting post', './index.php'), + + // Legacy pages - admin + array('adm/index.php', 0, true, 'Administration Control Panel', './index.php'), + + // Legacy pages - search + array('search.php', 0, true, 'Searching forums', './search.php'), + + // Legacy pages - memberlist + array('memberlist.php', 0, true, 'Viewing member details', './memberlist.php'), + array('memberlist.php?mode=viewprofile&u=2', 0, true, 'Viewing member profile', './memberlist.php'), + array('memberlist.php?mode=contactadmin', 0, true, 'Viewing contact page', './memberlist.php?mode=contactadmin'), + + // Legacy pages - MCP + array('mcp.php', 0, true, 'Viewing moderator control panel', './index.php'), + + // Legacy pages - UCP + array('ucp.php', 0, true, 'Viewing user control panel', './index.php'), + array('ucp.php?mode=register', 0, true, 'Registering account', './index.php'), + array('ucp.php?i=pm&mode=compose', 0, true, 'Composing private message', './index.php'), + array('ucp.php?i=pm&mode=view', 0, true, 'Viewing private messages', './index.php'), + array('ucp.php?i=prefs&mode=view', 0, true, 'Changing board preferences', './index.php'), + array('ucp.php?i=profile&mode=edit', 0, true, 'Changing profile settings', './index.php'), + + // Forum-based pages with forum access + array('posting.php?f=1&mode=reply', 1, true, 'Replying to message in Test Forum', './viewforum.php?f=1'), + array('posting.php?f=1&mode=quote', 1, true, 'Replying to message in Test Forum', './viewforum.php?f=1'), + array('posting.php?f=1&mode=post', 1, true, 'Posting message in Test Forum', './viewforum.php?f=1'), + array('viewtopic.php?f=1&t=1', 1, true, 'Reading topic in Test Forum', './viewforum.php?f=1'), + array('viewforum.php?f=1', 1, true, 'Viewing topics in Test Forum', './viewforum.php?f=1'), + + // Forum-based pages without forum access - should redirect to index + array('posting.php?f=1&mode=reply', 1, false, 'Index page', './index.php'), + array('viewtopic.php?f=1&t=1', 1, false, 'Index page', './index.php'), + array('viewforum.php?f=1', 1, false, 'Index page', './index.php'), + + // Unknown route + array('/unknown/route', 0, true, 'Index page', './index.php'), + ); + } + + /** + * @dataProvider get_location_data + */ + public function test_get_location($session_page, $forum_id, $has_access, $expected_location, $expected_url) + { + $this->auth->method('acl_get')->willReturn($has_access); + + list($location, $location_url) = $this->viewonline_helper->get_location($session_page, $forum_id); + + $this->assertIsString($location); + $this->assertIsString($location_url); + + $this->assertEquals($expected_location, $location, "Location mismatch for page: {$session_page}"); + $this->assertEquals($expected_url, $location_url, "URL mismatch for page: {$session_page}"); + } } diff --git a/tests/wrapper/gmgetdate_test.php b/tests/wrapper/gmgetdate_test.php index 08ee491c0f1..8ef3991e2eb 100644 --- a/tests/wrapper/gmgetdate_test.php +++ b/tests/wrapper/gmgetdate_test.php @@ -13,15 +13,15 @@ class phpbb_wrapper_gmgetdate_test extends phpbb_test_case { - public static function phpbb_gmgetdate_data() + public static function phpbb_gmgetdate_data(): array { - return array( - array(''), - array('UTC'), - array('Europe/Berlin'), - array('America/Los_Angeles'), - array('Antarctica/South_Pole'), - ); + return [ + [''], + ['UTC'], + ['Europe/Berlin'], + ['America/Los_Angeles'], + ['Pacific/Auckland'], + ]; } /** diff --git a/tests/wrapper/phpbb_php_ini_test.php b/tests/wrapper/phpbb_php_ini_test.php index 58277447024..57aed77a1a1 100644 --- a/tests/wrapper/phpbb_php_ini_test.php +++ b/tests/wrapper/phpbb_php_ini_test.php @@ -11,14 +11,14 @@ * */ -require_once dirname(__FILE__) . '/phpbb_php_ini_fake.php'; +require_once __DIR__ . '/phpbb_php_ini_fake.php'; class phpbb_wrapper_phpbb_php_ini_test extends phpbb_test_case { /** @var \phpbb_php_ini_fake php_ini */ protected $php_ini; - public function setUp() + protected function setUp(): void { $this->php_ini = new phpbb_php_ini_fake; } diff --git a/tests/wrapper/version_compare_test.php b/tests/wrapper/version_compare_test.php index ee23fe779cd..a12d0e50acb 100644 --- a/tests/wrapper/version_compare_test.php +++ b/tests/wrapper/version_compare_test.php @@ -97,7 +97,7 @@ public function test_equality($version1, $version2) ); } - public function equality_test_data() + public static function equality_test_data() { return array( array('1.1.0-A2', '1.1.0-a2'), @@ -118,7 +118,7 @@ public function test_alpha_beta($expected, $version1, $version2) } - public function alpha_beta_test_data() + public static function alpha_beta_test_data() { return array( array(-1, '1.1.0-A2', '1.1.0-B1'), diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh deleted file mode 100755 index 1aa8dca073a..00000000000 --- a/travis/check-executable-files.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e - -DB=$1 -TRAVIS_PHP_VERSION=$2 -NOTESTS=$3 -root="$4" -path="${root}phpBB/" - -if [ "$NOTESTS" == '1' ] -then - # Check the permissions of the files - - # The following variables MUST NOT contain any wildcard - # Directories to skip - directories_skipped="-path ${path}develop -o -path ${path}vendor" - - # Files to skip - files_skipped="-false" - - # Files which have to be executable - executable_files="-path ${path}bin/* -o -path ${path}install/phpbbcli.php" - - incorrect_files=$( \ - find ${path} \ - '(' \ - '(' \ - ${directories_skipped} \ - ')' \ - -a -type d -prune -a -type f \ - ')' -o \ - '(' \ - -type f -a \ - -not '(' \ - ${files_skipped} \ - ')' -a \ - '(' \ - '(' \ - '(' \ - ${executable_files} \ - ')' -a \ - -not -perm +100 \ - ')' -o \ - '(' \ - -not '(' \ - ${executable_files} \ - ')' -a \ - -perm +111 \ - ')' \ - ')' \ - ')' \ - ) - - if [ "${incorrect_files}" != '' ] - then - echo "The following files do not have proper permissions:"; - ls -la ${incorrect_files} - exit 1; - fi -fi diff --git a/travis/check-sami-parse-errors.sh b/travis/check-sami-parse-errors.sh deleted file mode 100755 index 4cc2cee5258..00000000000 --- a/travis/check-sami-parse-errors.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e - -DB=$1 -TRAVIS_PHP_VERSION=$2 -NOTESTS=$3 - -if [ "$NOTESTS" == '1' ] -then - # Workarounds for - # https://github.com/fabpot/Sami/issues/116 - # and - # https://github.com/fabpot/Sami/issues/117 - errors=$( - unbuffer phpBB/vendor/bin/sami.php parse build/sami-checkout.conf.php -v | \ - sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | \ - grep "ERROR: " | \ - tee /dev/tty | \ - wc -l - ) - if [ "$errors" != "0" ] - then - exit 1 - fi -fi diff --git a/travis/check-stylesheet.sh b/travis/check-stylesheet.sh deleted file mode 100755 index 331f3f0c30a..00000000000 --- a/travis/check-stylesheet.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set +x - -NOTESTS=$1 - -if [ "$NOTESTS" == '1' ] -then - # Define a node version. - TRAVIS_NODE_VERSION="4" - - # Clear out whatever version of NVM Travis has. - # Their version of NVM is probably old. - rm -rf ~/.nvm - # Grab NVM. - git clone https://github.com/creationix/nvm.git ~/.nvm > /dev/null - # Checkout the latest stable tag. - # Note that you can just hardcode a preferred version here. - (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) - # Install the desired version of Node - source ~/.nvm/nvm.sh - nvm install $TRAVIS_NODE_VERSION > /dev/null - npm install -g > /dev/null - npm install > /dev/null - set -x - stylelint "phpBB/styles/prosilver/theme/*.css" - # Disable admin stylelint for now - stylelint "phpBB/adm/style/*.css" -fi diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml deleted file mode 100644 index 4b85124783e..00000000000 --- a/travis/phpunit-mariadb-travis.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - ../tests - ../tests/functional - ../tests/lint_test.php - ../tests/ui - - - ../tests/functional - - - ../tests/ui - - - - - - slow - - - - - - - - - - - - - - diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml deleted file mode 100644 index cccfc0aee80..00000000000 --- a/travis/phpunit-mysql-travis.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - ../tests - ../tests/functional - ../tests/lint_test.php - ../tests/ui - - - ../tests/functional - - - ../tests/ui - - - - - - slow - - - - - - - - - - - - - - - diff --git a/travis/phpunit-mysqli-travis.xml b/travis/phpunit-mysqli-travis.xml deleted file mode 100644 index 4d649681b09..00000000000 --- a/travis/phpunit-mysqli-travis.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - ../tests - ../tests/functional - ../tests/lint_test.php - ../tests/ui - - - ../tests/functional - - - ../tests/ui - - - - - - slow - - - - - - - - - - - - - - - diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml deleted file mode 100644 index ae56da37f5e..00000000000 --- a/travis/phpunit-postgres-travis.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - ../tests - ../tests/functional - ../tests/lint_test.php - ../tests/ui - - - ../tests/functional - - - ../tests/ui - - - - - - slow - - - - - - - - - - - - - - - diff --git a/travis/phpunit-sqlite3-travis.xml b/travis/phpunit-sqlite3-travis.xml deleted file mode 100644 index 8eabcc7243b..00000000000 --- a/travis/phpunit-sqlite3-travis.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - ../tests - ../tests/functional - ../tests/lint_test.php - ../tests/ui - - - ../tests/functional - - - ../tests/ui - - - - - - slow - - - - - - - - - - - - - - - diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh deleted file mode 100755 index 9bc487915d6..00000000000 --- a/travis/setup-mariadb.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -# MariaDB Series -VERSION='5.5' - -# Operating system codename, e.g. "precise" -OS_CODENAME=$(lsb_release --codename --short) - -# Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf) -sudo apt-get purge -y mysql-common - -if ! which add-apt-repository > /dev/null -then - sudo apt-get update - sudo apt-get install -y python-software-properties -fi - -MIRROR_DOMAIN='ftp.osuosl.org' -sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db -sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" -sudo apt-get update - -# Pin repository in order to avoid conflicts with MySQL from distribution -# repository. See https://mariadb.com/kb/en/installing-mariadb-deb-files -# section "Version Mismatch Between MariaDB and Ubuntu/Debian Repositories" -echo " -Package: * -Pin: origin $MIRROR_DOMAIN -Pin-Priority: 1000 -" | sudo tee /etc/apt/preferences.d/mariadb - -sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd" -sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd" -sudo apt-get install -y mariadb-server - -# Set root password to empty string. -echo " -USE mysql; -UPDATE user SET Password = PASSWORD('') where User = 'root'; -FLUSH PRIVILEGES; -" | mysql -u root -prootpasswd - -mysql --version diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh deleted file mode 100755 index d9544858b76..00000000000 --- a/travis/setup-php-extensions.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -function find_php_ini -{ - echo $(php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||") -} - -# $1 - PHP extension name -# $2 - PHP ini file path -function register_php_extension -{ - echo "extension=$1.so" >> "$2" -} - -# $1 - PHP extension name -# $2 - PHP ini file path -function install_php_extension -{ - echo "Installing $1 PHP extension" - - # See http://www.php.net/manual/en/install.pecl.phpize.php - cd "$1" - phpize - ./configure - make - make install - cd .. - - register_php_extension "$1" "$2" -} - -php_ini_file=$(find_php_ini) - -# apc -if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.5.0-dev', '<');"` == "1" ] -then - echo 'Enabling APC PHP extension' - register_php_extension 'apc' "$php_ini_file" - echo 'apc.enable_cli=1' >> "$php_ini_file" -else - echo 'Disabling Opcache' - echo 'opcache.enable=0' >> "$php_ini_file" -fi - -# redis -# Disabled redis for now as it causes travis to fail -# git clone git://github.com/nicolasff/phpredis.git redis -# install_php_extension 'redis' "$php_ini_file" diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh deleted file mode 100755 index 7fb67e04547..00000000000 --- a/travis/setup-webserver.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -sudo apt-get update -sudo apt-get install -y nginx realpath - -sudo service nginx stop - -DIR=$(dirname "$0") -USER=$(whoami) -PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB") -NGINX_CONF="/etc/nginx/sites-enabled/default" -APP_SOCK=$(realpath "$DIR")/php-app.sock - -# php-fpm -PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm" -PHP_FPM_CONF="$DIR/php-fpm.conf" - -echo " - [global] - - [travis] - user = $USER - group = $USER - listen = $APP_SOCK - listen.mode = 0666 - pm = static - pm.max_children = 2 - - php_admin_value[memory_limit] = 128M -" > $PHP_FPM_CONF - -sudo $PHP_FPM_BIN \ - --fpm-config "$DIR/php-fpm.conf" - -# nginx -cat $DIR/../phpBB/docs/nginx.sample.conf \ -| sed "s/root \/path\/to\/phpbb/root $(echo $PHPBB_ROOT_PATH | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g' -e 's/&/\\\&/g')/g" \ -| sed -e '1,/The actual board domain/d' \ -| sed -e '/If running php as fastcgi/,$d' \ -| sed -e "s/fastcgi_pass php;/fastcgi_pass unix:$(echo $APP_SOCK | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g' -e 's/&/\\\&/g');/g" \ -| sed -e 's/#listen 80/listen 80/' \ -| sudo tee $NGINX_CONF - -sudo service nginx start diff --git a/vagrant/after.sh b/vagrant/after.sh index 03008a88d0d..a6e23d46dd4 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -1,13 +1,13 @@ #!/bin/sh +PHP_VERSION="8.2" PHPBB_PATH="/home/vagrant/phpbb" PHPBB_CONFIG="${PHPBB_PATH}/phpBB/config.php" -PHPBB_SQLITE="/tmp/phpbb.sqlite3" PHPBB_INSTALL="${PHPBB_PATH}/vagrant/phpbb-install-config.yml" # Ensure composer deps are installed cd ${PHPBB_PATH}/phpBB -php ../composer.phar install +php${PHP_VERSION} ../composer.phar install # Backup and remove current config.php file if [ -e ${PHPBB_CONFIG} ] @@ -16,20 +16,8 @@ then rm -rf ${PHPBB_CONFIG} fi -# Delete any sqlite db -if [ -e ${PHPBB_SQLITE} ] -then - rm -rf ${PHPBB_SQLITE} -fi - # Install phpBB -php ${PHPBB_PATH}/phpBB/install/phpbbcli.php install ${PHPBB_INSTALL} - -# Update sqlite db file permissions -if [ -e ${PHPBB_SQLITE} ] -then - sudo chown -R vagrant ${PHPBB_SQLITE} -fi +php${PHP_VERSION} ${PHPBB_PATH}/phpBB/install/phpbbcli.php install ${PHPBB_INSTALL} # Add DEBUG mode to phpBB to remove annoying installer warnings echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG} @@ -37,14 +25,13 @@ echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG} # Change environment to development sed -i '/^.*PHPBB_ENVIRONMENT.*$/s/production/development/' ${PHPBB_CONFIG} -# Display load time -sed -i '/^.*PHPBB_DISPLAY_LOAD_TIME.*$/s/^\/\/[[:blank:]]*//' ${PHPBB_CONFIG} - # Update the PHP memory limits (enough to allow phpunit tests to run) -sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/7.1/fpm/php.ini +sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/${PHP_VERSION}/fpm/php.ini + +# Fix for urls with app.php +sed -i "s/cgi.fix_pathinfo=.*/cgi.fix_pathinfo=1/" /etc/php/${PHP_VERSION}/fpm/php.ini -# Make routes work in vagrant (https://tracker.phpbb.com/browse/PHPBB3-15400) -sed -i '/^.*try_files.*$/s/index/app/' /etc/nginx/sites-enabled/phpbb.app -nginx -s reload +# Restart php-fpm to apply php.ini changes +systemctl restart php${PHP_VERSION}-fpm.service -echo "Your board is ready at http://192.168.10.10/" +echo "Your board is ready at http://192.168.56.56/" diff --git a/vagrant/bootstrap.yaml b/vagrant/bootstrap.yaml index 1c2b2657126..fd1e90d355c 100644 --- a/vagrant/bootstrap.yaml +++ b/vagrant/bootstrap.yaml @@ -1,5 +1,5 @@ --- -ip: "192.168.10.10" +ip: "192.168.56.56" memory: 2048 cpus: 1 hostname: phpbb @@ -14,17 +14,11 @@ keys: folders: - map: "." to: "/home/vagrant/phpbb" - sites: - map: phpbb.app to: "/home/vagrant/phpbb/phpBB" - -databases: - - phpbb - -variables: - - key: APP_ENV - value: local + type: apache + php: "8.2" # blackfire: # - id: foo diff --git a/vagrant/phpbb-install-config.yml b/vagrant/phpbb-install-config.yml index 023d7b1a9d8..0b899582997 100644 --- a/vagrant/phpbb-install-config.yml +++ b/vagrant/phpbb-install-config.yml @@ -15,7 +15,7 @@ installer: dbport: ~ dbuser: homestead dbpasswd: secret - dbname: phpbb + dbname: homestead table_prefix: phpbb_ # database: # dbms: postgres @@ -38,7 +38,6 @@ installer: enabled: false smtp_delivery : ~ smtp_host: ~ - smtp_auth: ~ smtp_user: ~ smtp_pass: ~ @@ -46,6 +45,6 @@ installer: cookie_secure: false server_protocol: http:// force_server_vars: false - server_name: 192.168.10.10 + server_name: 192.168.56.56 server_port: 80 script_path: /