Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use https URLs #23072

Merged
merged 4 commits into from
Feb 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
## Piwik 2.16.2

### New APIs
* Multiple JavaScript trackers can now be created easily via `_paq.push(['addTracker', piwikUrl, piwikSiteId])`. All tracking requests will be then sent to all added Piwik trackers. [Learn more.](http://developer.matomo.org/guides/tracking-javascript-guide#multiple-piwik-trackers)
* Multiple JavaScript trackers can now be created easily via `_paq.push(['addTracker', piwikUrl, piwikSiteId])`. All tracking requests will be then sent to all added Piwik trackers. [Learn more.](https://developer.matomo.org/guides/tracking-javascript-guide#multiple-piwik-trackers)
* It is possible to get an asynchronously created tracker instance (`addTracker`) via the method `Piwik.getAsyncTracker(optionalPiwikUrl, optionalPiwikSiteId)`. This allows you to get the tracker instance and to send different tracking requests to this Piwik instance and to configure it differently than other tracker instances.
* Added a new API method `Goals.getGoal($idSite, $idGoal)` to fetch a single goal.

Expand Down
2 changes: 1 addition & 1 deletion core/API/DocumentationGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function getApiDocumentationAsString($outputExampleUrls = true)
}

/**
* Used on developer.piwik.org
* Used on developer.matomo.org
*
* @param bool|true $outputExampleUrls
* @param string $prefixUrls
Expand Down
2 changes: 1 addition & 1 deletion core/API/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
* ));
* echo "This DataTable has " . $dataTable->getRowsCount() . " rows.";
*
* @see http://piwik.org/docs/analytics-api
* @see https://piwik.org/docs/analytics-api
* @api
*/
class Request
Expand Down
2 changes: 1 addition & 1 deletion core/Application/Environment.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public function getContainer()
}

/**
* @link http://php-di.org/doc/container-configuration.html
* @link https://php-di.org/doc/container-configuration.html
*/
private function createContainer()
{
Expand Down
2 changes: 1 addition & 1 deletion core/CliMulti.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public function __construct(?LoggerInterface $logger = null)
*
* @param string[] $piwikUrls An array of urls, for instance:
*
* `array('http://www.example.com/piwik?module=API...')`
* `array('https://www.example.com/matomo?module=API...')`
*
* **Make sure query parameter values are properly encoded in the URLs.**
*
Expand Down
4 changes: 2 additions & 2 deletions core/Common.php
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ public static function safe_unserialize($string, $allowedClasses = [], $rethrow
*
* **Implementation Details**
*
* - [htmlspecialchars](http://php.net/manual/en/function.htmlspecialchars.php) is used to escape text.
* - [htmlspecialchars](https://php.net/manual/en/function.htmlspecialchars.php) is used to escape text.
* - Single quotes are not escaped so **Piwik's amazing community** will still be
* **Piwik's amazing community**.
* - Use of the `magic_quotes` setting will not break this method.
Expand Down Expand Up @@ -678,7 +678,7 @@ public static function getRandomString($length = 16, $alphabet = "abcdefghijklmn
* Convert hexadecimal representation into binary data.
* !! Will emit warning if input string is not hex!!
*
* @see http://php.net/bin2hex
* @see https://php.net/bin2hex
*
* @param string $str Hexadecimal representation
* @return string
Expand Down
2 changes: 1 addition & 1 deletion core/Console.php
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ protected function initEnvironment(OutputInterface $output)
* Register the console output into the logger.
*
* Ideally, this should be done automatically with events:
* @see http://symfony.com/fr/doc/current/components/console/events.html
* @see https://symfony.com/fr/doc/current/components/console/events.html
* @see Symfony\Bridge\Monolog\Handler\ConsoleHandler::onCommand()
* But it would require to install Symfony's Event Dispatcher.
*/
Expand Down
2 changes: 1 addition & 1 deletion core/Container/ContainerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function __construct(PluginList $pluginList, GlobalSettingsProvider $sett
}

/**
* @link http://php-di.org/doc/container-configuration.html
* @link https://php-di.org/doc/container-configuration.html
* @throws \Exception
* @return Container
*/
Expand Down
2 changes: 1 addition & 1 deletion core/Cookie.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ protected function getDefaultExpire()
* setcookie() replacement -- we don't use the built-in function because
* it is buggy for some PHP versions.
*
* @link http://php.net/setcookie
* @link https://php.net/setcookie
*
* @param string $Name Name of cookie
* @param string $Value Value of cookie
Expand Down
4 changes: 2 additions & 2 deletions core/DataTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
*
* All predefined filters exist in the **Piwik\DataTable\BaseFilter** namespace.
*
* _Note: For convenience, [anonymous functions](http://www.php.net/manual/en/functions.anonymous.php)
* _Note: For convenience, [anonymous functions](https://www.php.net/manual/en/functions.anonymous.php)
* can be used as DataTable filters._
*
* ### Applying Filters
Expand Down Expand Up @@ -1826,7 +1826,7 @@ public function setMaximumAllowedRows($maximumAllowedRows)
* a subtable is encountered w/o the required label, a new row is created
* with the label, and a new subtable is added to the row.
*
* Read [http://en.wikipedia.org/wiki/Tree_(data_structure)#Traversal_methods](http://en.wikipedia.org/wiki/Tree_(data_structure)#Traversal_methods)
* Read [https://en.wikipedia.org/wiki/Tree_(data_structure)#Traversal_methods](https://en.wikipedia.org/wiki/Tree_(data_structure)#Traversal_methods)
* for more information about tree walking.
*
* @param array $path The path to walk. An array of label values. The first element
Expand Down
2 changes: 1 addition & 1 deletion core/DataTable/Filter/ColumnCallbackAddColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class ColumnCallbackAddColumn extends BaseFilter
* @param string $columnToAdd The name of the column to add.
* @param callable $functionToApply The callback to apply to each row of a DataTable. The columns
* specified in `$columns` are passed to this callback.
* @param array $functionParameters deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php)
* @param array $functionParameters deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php)
* instead.
*/
public function __construct($table, $columns, $columnToAdd, $functionToApply, $functionParameters = array())
Expand Down
2 changes: 1 addition & 1 deletion core/DataTable/Filter/ColumnCallbackAddMetadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ColumnCallbackAddMetadata extends BaseFilter
* @param string|array $columnsToRead The columns to read from each row and pass on to the callback.
* @param string $metadataToAdd The name of the metadata field that will be added to each row.
* @param callable $functionToApply The callback to apply for each row.
* @param array $functionParameters deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php)
* @param array $functionParameters deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php)
* instead.
* @param bool $applyToSummaryRow Whether the callback should be applied to the summary row or not.
*/
Expand Down
2 changes: 1 addition & 1 deletion core/DataTable/Filter/ColumnCallbackDeleteRow.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ColumnCallbackDeleteRow extends BaseFilter
* passed to the callback.
* @param callback $function The callback that determines whether a row should be deleted
* or not. Should return `true` if the row should be deleted.
* @param array $functionParams deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php)
* @param array $functionParams deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php)
* instead.
*/
public function __construct($table, $columnsToFilter, $function, $functionParams = [])
Expand Down
2 changes: 1 addition & 1 deletion core/DataTable/Filter/ColumnCallbackReplace.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ColumnCallbackReplace extends BaseFilter
* and then replaced with the callback's result.
* @param callable $functionToApply The function to execute. Must take the column value as a parameter
* and return a value that will be used to replace the original.
* @param array|null $functionParameters deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php)
* @param array|null $functionParameters deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php)
* instead.
* @param array $extraColumnParameters Extra column values that should be passed to the callback, but
* shouldn't be replaced.
Expand Down
2 changes: 1 addition & 1 deletion core/DataTable/Filter/GroupBy.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class GroupBy extends BaseFilter
* @param string $groupByColumn The column name to reduce.
* @param callable $reduceFunction The reduce function. This must alter the `$groupByColumn`
* column in some way. If not set then the filter will group by the raw column value.
* @param array $parameters deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php)
* @param array $parameters deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php)
* instead.
*/
public function __construct($table, $groupByColumn, $reduceFunction = null, $parameters = array())
Expand Down
2 changes: 1 addition & 1 deletion core/DataTable/Filter/MetadataCallbackReplace.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class MetadataCallbackReplace extends ColumnCallbackReplace
* and then replaced with the callback's result.
* @param callable $functionToApply The function to execute. Must take the metadata value as a parameter
* and return a value that will be used to replace the original.
* @param array|null $functionParameters deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php)
* @param array|null $functionParameters deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php)
* instead.
* @param array $extraColumnParameters Extra column values that should be passed to the callback, but
* shouldn't be replaced.
Expand Down
2 changes: 1 addition & 1 deletion core/DataTable/Filter/SafeDecodeLabel.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static function decodeLabelSafe($value)
// ENT_IGNORE so that if utf8 string has some errors, we simply discard invalid code unit sequences
$style = ENT_QUOTES | ENT_IGNORE;

// See changes in 5.4: http://nikic.github.com/2012/01/28/htmlspecialchars-improvements-in-PHP-5-4.html
// See changes in 5.4: https://nikic.github.com/2012/01/28/htmlspecialchars-improvements-in-PHP-5-4.html
// Note: at some point we should change ENT_IGNORE to ENT_SUBSTITUTE
$value = htmlspecialchars($value, $style, 'UTF-8');

Expand Down
4 changes: 2 additions & 2 deletions core/DataTable/Filter/Sort.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/**
* Sorts a {@link DataTable} based on the value of a specific column.
*
* It is possible to specify a natural sorting (see [php.net/natsort](http://php.net/natsort) for details).
* It is possible to specify a natural sorting (see [php.net/natsort](https://php.net/natsort) for details).
*
* @api
*/
Expand All @@ -38,7 +38,7 @@ class Sort extends BaseFilter
* @param DataTable $table The table to eventually filter.
* @param string $columnToSort The name of the column to sort by.
* @param string $order order `'asc'` or `'desc'`.
* @param bool $naturalSort Whether to use a natural sort or not (see {@link http://php.net/natsort}).
* @param bool $naturalSort Whether to use a natural sort or not (see {@link https://php.net/natsort}).
* @param bool $recursiveSort Whether to sort all subtables or not.
* @param bool|callback $doSortBySecondaryColumn If true will sort by a secondary column. The column is automatically
* detected and will be either nb_visits or label, if possible.
Expand Down
2 changes: 1 addition & 1 deletion core/DataTable/Filter/Truncate.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private function addSummaryRow($table)
// case when the last row is a summary row, it is not indexed by $count but by DataTable::ID_SUMMARY_ROW
$summaryRow = $table->getRowFromId(DataTable::ID_SUMMARY_ROW);

//FIXME: I'm not sure why it could return false, but it was reported in: http://forum.piwik.org/read.php?2,89324,page=1#msg-89442
//FIXME: I'm not sure why it could return false, but it was reported in: https://forum.piwik.org/read.php?2,89324,page=1#msg-89442
if ($summaryRow) {
$newRow->sumRow($summaryRow, $enableCopyMetadata = false, $aggregationOps);
}
Expand Down
4 changes: 2 additions & 2 deletions core/Date.php
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ public function isLeapYear()
}

/**
* Converts this date to the requested string format. See {@link http://php.net/date}
* Converts this date to the requested string format. See {@link https://php.net/date}
* for the list of format strings.
*
* @param string $format
Expand Down Expand Up @@ -1141,7 +1141,7 @@ public static function secondsToDays($secs)

private static function getInvalidDateFormatException($dateString)
{
$message = Piwik::translate('General_ExceptionInvalidDateFormat', array("YYYY-MM-DD, or 'today' or 'yesterday'", "strtotime", "http://php.net/strtotime"));
$message = Piwik::translate('General_ExceptionInvalidDateFormat', array("YYYY-MM-DD, or 'today' or 'yesterday'", "strtotime", "https://php.net/strtotime"));
return new Exception($message . ": " . var_export($dateString, true));
}

Expand Down
4 changes: 2 additions & 2 deletions core/Db.php
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ public static function destroyDatabaseObject()
* Executes an unprepared SQL query. Recommended for DDL statements like `CREATE`,
* `DROP` and `ALTER`. The return value is DBMS-specific. For MySQLI, it returns the
* number of rows affected. For PDO, it returns a
* [Zend_Db_Statement](http://framework.zend.com/manual/1.12/en/zend.db.statement.html) object.
* [Zend_Db_Statement](https://framework.zend.com/manual/1.12/en/zend.db.statement.html) object.
*
* @param string $sql The SQL query.
* @throws \Exception If there is an error in the SQL.
Expand Down Expand Up @@ -267,7 +267,7 @@ public static function exec($sql)
}

/**
* Executes an SQL query and returns the [Zend_Db_Statement](http://framework.zend.com/manual/1.12/en/zend.db.statement.html)
* Executes an SQL query and returns the [Zend_Db_Statement](https://framework.zend.com/manual/1.12/en/zend.db.statement.html)
* for the query.
*
* This method is meant for non-query SQL statements like `INSERT` and `UPDATE. If you want to fetch
Expand Down
2 changes: 1 addition & 1 deletion core/Db/Adapter/Mysqli.php
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public static function isMysqliErrorNumber($e, $connection, $errno)
* Execute unprepared SQL query and throw away the result
*
* Workaround some SQL statements not compatible with prepare().
* See http://framework.zend.com/issues/browse/ZF-1398
* See https://framework.zend.com/issues/browse/ZF-1398
*
* @param string $sqlQuery
* @return int Number of rows affected (SELECT/INSERT/UPDATE/DELETE)
Expand Down
6 changes: 3 additions & 3 deletions core/Db/Adapter/Pdo/Mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ public function getConnection()
/**
* Before MySQL 5.1.17, server-side prepared statements
* do not use the query cache.
* @see http://dev.mysql.com/doc/refman/5.1/en/query-cache-operation.html
* @see https://dev.mysql.com/doc/refman/5.1/en/query-cache-operation.html
*
* MySQL also does not support preparing certain DDL and SHOW
* statements.
* @see http://framework.zend.com/issues/browse/ZF-1398
* @see https://framework.zend.com/issues/browse/ZF-1398
*/
$this->_connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);

Expand Down Expand Up @@ -296,7 +296,7 @@ public function getClientVersion()
/**
* Override _dsn() to ensure host and port to not be passed along
* if unix_socket is set since setting both causes unexpected behaviour
* @see http://php.net/manual/en/ref.pdo-mysql.connection.php
* @see https://php.net/manual/en/ref.pdo-mysql.connection.php
*/
protected function _dsn() // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
{
Expand Down
2 changes: 1 addition & 1 deletion core/Db/BatchInsert.php
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public static function createTableFromCSVFile($tableName, $fields, $filePath, $f
/*
* Second attempt: using the LOCAL keyword means the client reads the file and sends it to the server;
* the LOCAL keyword may trigger a known PHP PDO\MYSQL bug when MySQL not built with --enable-local-infile
* @see http://bugs.php.net/bug.php?id=54158
* @see https://bugs.php.net/bug.php?id=54158
*/
$openBaseDir = ini_get('open_basedir');
$safeMode = ini_get('safe_mode');
Expand Down
6 changes: 3 additions & 3 deletions core/Filesystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static function isValidFilename($filename)

/**
* Get canonicalized absolute path
* See http://php.net/realpath
* See https://php.net/realpath
*
* @param string $path
* @return string canonicalized absolute path
Expand Down Expand Up @@ -183,11 +183,11 @@ public static function checkIfFileSystemIsNFS()
/**
* Recursively find pathnames that match a pattern.
*
* See {@link http://php.net/manual/en/function.glob.php glob} for more info.
* See {@link https://php.net/manual/en/function.glob.php glob} for more info.
*
* @param string $sDir directory The directory to glob in.
* @param string $sPattern pattern The pattern to match paths against.
* @param int $nFlags `glob()` . See {@link http://php.net/manual/en/function.glob.php glob()}.
* @param int $nFlags `glob()` . See {@link https://php.net/manual/en/function.glob.php glob()}.
* @return array The list of paths that match the pattern.
* @api
*/
Expand Down
2 changes: 1 addition & 1 deletion core/FrontController.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
* return $realtimeMap->render();
* }
*
* For a detailed explanation, see the documentation [here](https://developer.piwik.org/guides/how-piwik-works).
* For a detailed explanation, see the documentation [here](https://developer.matomo.org/guides/how-piwik-works).
*
* @method static \Piwik\FrontController getInstance()
*/
Expand Down
2 changes: 1 addition & 1 deletion core/Http.php
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ private static function buildHeadersForPost($requestBody)
* {
* $outputPath = PIWIK_INCLUDE_PATH . '/tmp/averybigfile.zip';
* $isStart = Common::getRequestVar('isStart', 1, 'int');
* Http::downloadChunk("http://bigfiles.com/averybigfile.zip", $outputPath, $isStart == 1);
* Http::downloadChunk("https://bigfiles.com/averybigfile.zip", $outputPath, $isStart == 1);
* }
* ```
*
Expand Down
2 changes: 1 addition & 1 deletion core/Intl/Data/Resources/currencies.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* International currencies in circulation.
*
* @see http://en.wikipedia.org/wiki/List_of_circulating_currencies
* @see https://en.wikipedia.org/wiki/List_of_circulating_currencies
*/
return array(
// 'ISO-4217 CODE' => array('currency symbol', 'description'),
Expand Down
2 changes: 1 addition & 1 deletion core/Nonce.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* Nonces in Piwik are stored as a session variable and have a configurable expiration.
*
* Learn more about nonces [here](http://en.wikipedia.org/wiki/Cryptographic_nonce).
* Learn more about nonces [here](https://en.wikipedia.org/wiki/Cryptographic_nonce).
*
* @api
*/
Expand Down
2 changes: 1 addition & 1 deletion core/NumberFormatter.php
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ protected function formatNumberWithPattern($pattern, $value, $maximumFractionDig
*
* @return string
*
* @see http://cldr.unicode.org/translation/number-symbols
* @see https://cldr.unicode.org/translation/number-symbols
*/
protected function replaceSymbols($value)
{
Expand Down
2 changes: 1 addition & 1 deletion core/Plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ public function schedulePluginReArchiving()
* Extracts the plugin name from a backtrace array. Returns `false` if we can't find one.
*
* @param array $backtrace The result of {@link debug_backtrace()} or
* [Exception::getTrace()](http://www.php.net/manual/en/exception.gettrace.php).
* [Exception::getTrace()](https://www.php.net/manual/en/exception.gettrace.php).
* @return string|false
*/
public static function getPluginNameFromBacktrace($backtrace)
Expand Down
Loading
Loading