[PHP-WEBMASTER] [web-downloads] force pushed branch main
Force pushed branch main in repository web-downloads. Pusher: shivammathur Before: https://github.com/php/web-downloads/commit/277af2836aee69f21aa9ed441065a6ea7b0e6c56 After: https://github.com/php/web-downloads/commit/3ae466e62807b8819403af17b02b0cd7c2cd2212 Compare: https://github.com/php/web-downloads/compare/277af2836aee...3ae466e62807 Tree: https://github.com/php/web-downloads/tree/main Commit mails will not be sent for force-pushed commits!
[PHP-WEBMASTER] [web-downloads] force pushed branch main
Force pushed branch main in repository web-downloads. Pusher: shivammathur Before: https://github.com/php/web-downloads/commit/020e463c5450296a8a04a9008ef0492827359815 After: https://github.com/php/web-downloads/commit/277af2836aee69f21aa9ed441065a6ea7b0e6c56 Compare: https://github.com/php/web-downloads/compare/020e463c5450...277af2836aee Tree: https://github.com/php/web-downloads/tree/main Commit mails will not be sent for force-pushed commits!
[PHP-WEBMASTER] [web-php] master: Add function for translation of UI elements (#1057)
Author: haszi (haszi)
Committer: GitHub (web-flow)
Pusher: Girgias
Date: 2024-10-14T11:41:38+01:00
Commit:
https://github.com/php/web-php/commit/83705efdd0e217090aaa7b06d98dfcc8aacb8445
Raw diff:
https://github.com/php/web-php/commit/83705efdd0e217090aaa7b06d98dfcc8aacb8445.diff
Add function for translation of UI elements (#1057)
Co-authored-by: haszi
Changed paths:
A include/ui_translation/de.ini
A include/ui_translation/en.ini
A include/ui_translation/es.ini
A include/ui_translation/fr.ini
A include/ui_translation/it.ini
A include/ui_translation/ja.ini
A include/ui_translation/pt_br.ini
A include/ui_translation/ru.ini
A include/ui_translation/tr.ini
A include/ui_translation/zh.ini
M include/shared-manual.inc
Diff:
diff --git a/include/shared-manual.inc b/include/shared-manual.inc
index d14d6c4565..f104d1549d 100644
--- a/include/shared-manual.inc
+++ b/include/shared-manual.inc
@@ -30,7 +30,9 @@ use phpweb\UserNotes\UserNote;
*
* @param array $notes
*/
-function manual_notes($notes, $repo = 'en'):void {
+function manual_notes($notes):void {
+global $LANG;
+
// Get needed values
list($filename) = $GLOBALS['PGI']['this'];
@@ -42,6 +44,7 @@ function manual_notes($notes, $repo = 'en'):void {
$sorter = new Sorter();
$sorter->sort($notes);
+$addNote = autogen('add_a_note', $LANG);
// Link target to add a note to the current manual page,
// and it's extended form with a [+] image
$addnotelink = '/manual/add-note.php?sect=' . $filename .
@@ -49,7 +52,7 @@ function manual_notes($notes, $repo = 'en'):void {
'&redirect=' . $_SERVER['BASE_HREF'];
$addnotesnippet = make_link(
$addnotelink,
-"＋add a note",
+"＋$addNote",
);
$num_notes = count($notes);
@@ -58,17 +61,19 @@ function manual_notes($notes, $repo = 'en'):void {
$noteCountHtml = "$num_notes note" . ($num_notes
== 1 ? '' : 's') . "";
}
+$userContributedNotes = autogen('user_contributed_notes', $LANG);
echo <<
{$addnotesnippet}
- User Contributed Notes {$noteCountHtml}
+ $userContributedNotes {$noteCountHtml}
END_USERNOTE_HEADER;
// If we have no notes, then inform the user
if ($num_notes === 0) {
-echo "\n There are no user contributed notes for
this page.";
+$noUserContributedNotes = autogen('no_user_notes', $LANG);
+echo "\n $noUserContributedNotes";
} else {
// If we have notes, print them out
echo '';
@@ -334,7 +339,7 @@ PAGE_TOOLS;
}
function manual_language_chooser($currentlang, $currentpage) {
-global $ACTIVE_ONLINE_LANGUAGES;
+global $ACTIVE_ONLINE_LANGUAGES, $LANG;
// Prepare the form with all the options
$othersel = ' selected="selected"';
@@ -350,10 +355,11 @@ function manual_language_chooser($currentlang,
$currentpage) {
$out[] = "Other";
$format_options = implode("\n" . str_repeat(' ', 6), $out);
+$changeLanguage = autogen('change_language', $LANG);
$r = <<
- Change language:
+ $changeLanguage:
{$format_options}
@@ -364,7 +370,7 @@ CHANGE_LANG;
}
function manual_footer($setup): void {
-global $USERNOTES, $__RELATED;
+global $USERNOTES, $__RELATED, $LANG;
$id = substr($setup['this'][0], 0, -4);
$repo = strtolower($setup["head"][1]); // pt_BR etc.
@@ -393,18 +399,23 @@ function manual_footer($setup): void {
$contributors = 'All contributors.';
}
+$improveThisPage = autogen('improve_this_page', $LANG);
+$howToImproveThisPage = autogen('how_to_improve_this_page', $LANG);
+$contributionGuidlinesOnGithub =
autogen('contribution_guidlines_on_github', $LANG);
+$submitPullRequest = autogen('submit_a_pull_request', $LANG);
+$reportBug = autogen('report_a_bug', $LANG);
echo <<
- Improve This Page
+ $improveThisPage
$lastUpdate $contributors
-https://github.com/php/doc-base/blob/master/README.md";
title="This will take you to our contribution guidelines on GitHub."
target="_blank" rel="noopener noreferrer">Learn How To Improve This Page
+https://github.com/php/doc-base/blob/master/README.md";
title="$contributionGuidlinesOnGithub" target="_blank" rel="noopener
noreferrer">$howToImproveThisPage
•
-Submit a Pull Request
+$submitPullRequest
•
-https://github.com/php/doc-{$repo}/issues/new?body=From%20manual%20page:%20https:%2F%2Fphp.net%2F$id%0A%0A---";>Report
a Bug
+https://github.com/php/doc-{$repo}/issues/new?body=From%20manual%20page:%20https:%2F%2Fphp.net%2F$id%0A%0A---";>$reportBug
CONTRIBUTE;
@@ -459,3 +470,35 @@ CONTRIBUTORS;
manual_footer($setup);
exit;
}
+
+function autogen(string $text, string $lang) {
+static $translations = [];
+
+$lang = ($lang === "") ? "en" : $lang;
+if (i
[PHP-WEBMASTER] [web-php] PR #1057: Add function for translation of UI elements
Pull Request: https://github.com/php/web-php/pull/1057 Closed by Girgias.
[PHP-WEBMASTER] [web-php] PR #1093: pt_br.ini: Fill in translations in pt_br for English terms
Pull Request: https://github.com/php/web-php/pull/1093 Author: leonardolara
[PHP-WEBMASTER] [web-php] PR #1091: Fix typo in 8.4 RC2 release announcement
Pull Request: https://github.com/php/web-php/pull/1091 Author: DanielRuf
[PHP-WEBMASTER] [web-php] PR #1091: Fix typo in 8.4 RC2 release announcement
Pull Request: https://github.com/php/web-php/pull/1091 Closed by saundefined.
[PHP-WEBMASTER] [web-php] master: Fix typo in 8.4.0 RC2 release announcement (#1091)
Author: Daniel Ruf (DanielRuf) Committer: GitHub (web-flow) Pusher: saundefined Date: 2024-10-14T18:47:44+05:00 Commit: https://github.com/php/web-php/commit/85eb93c41f4fb926310b0e08fda655ba4488d448 Raw diff: https://github.com/php/web-php/commit/85eb93c41f4fb926310b0e08fda655ba4488d448.diff Fix typo in 8.4.0 RC2 release announcement (#1091) Changed paths: M archive/entries/2024-10-10-1.xml Diff: diff --git a/archive/entries/2024-10-10-1.xml b/archive/entries/2024-10-10-1.xml index 09c27e6718..676a72898c 100644 --- a/archive/entries/2024-10-10-1.xml +++ b/archive/entries/2024-10-10-1.xml @@ -11,7 +11,7 @@ http://www.w3.org/1999/xhtml";> The PHP team is pleased to announce the release of PHP 8.4.0, RC2. - This is the first release candidate, continuing the PHP 8.4 release cycle, + This is the second release candidate, continuing the PHP 8.4 release cycle, the rough outline of which is specified in the https://wiki.php.net/todo/php84";>PHP Wiki.
[PHP-WEBMASTER] [web-php] master: Move `language_choose_code()` into new `LangChooser` class (#1081)
Author: Takuya Aramaki (takaram)
Committer: GitHub (web-flow)
Pusher: saundefined
Date: 2024-10-14T18:48:22+05:00
Commit:
https://github.com/php/web-php/commit/38ef33f923321519476d353aabf3d9e19fb1d0d9
Raw diff:
https://github.com/php/web-php/commit/38ef33f923321519476d353aabf3d9e19fb1d0d9.diff
Move `language_choose_code()` into new `LangChooser` class (#1081)
Changed paths:
A src/LangChooser.php
A tests/Unit/LangChooserTest.php
M include/langchooser.inc
Diff:
diff --git a/include/langchooser.inc b/include/langchooser.inc
index 40790ad9d2..230a3d707d 100644
--- a/include/langchooser.inc
+++ b/include/langchooser.inc
@@ -28,170 +28,20 @@
*/
+use phpweb\LangChooser;
+
+require_once __DIR__ . '/../src/autoload.php';
+
// Default STRIPPED_URI
$_SERVER['STRIPPED_URI'] = htmlspecialchars($_SERVER['REQUEST_URI'],
ENT_QUOTES, 'UTF-8');
// The code is encapsulated in a function,
// so the variable namespace is not polluted
-list($LANG, $EXPL_LANG, $UA_LANGS) = language_choose_code();
+list($LANG, $EXPL_LANG) = (new LangChooser($LANGUAGES,
$INACTIVE_ONLINE_LANGUAGES, myphpnet_language(), default_language() ?:
''))->chooseCode(
+$_REQUEST['lang'] ?? null,
+$_SERVER['REQUEST_URI'],
+$_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? null,
+);
// Compatibility
if ($EXPL_LANG == '') { unset($EXPL_LANG); }
-
-function language_choose_code()
-{
-// Contains all the languages picked up by the
-// process in priority order (without repeating codes)
-$languages = [];
-
-// Default values for languages
-$explicitly_specified = ''; $selected = '';
-
-// Specified for the request (GET/POST parameter)
-if (!empty($_REQUEST['lang']) && is_string($_REQUEST['lang'])) {
-$explicitly_specified =
language_add(htmlspecialchars($_REQUEST['lang'], ENT_QUOTES, 'UTF-8'),
$languages);
-}
-
-// Specified in a shortcut URL (eg. /en/echo or /pt_br/echo)
-if (preg_match("!^/(\\w{2}(_\\w{2})?)/!",
htmlspecialchars($_SERVER['REQUEST_URI'],ENT_QUOTES, 'UTF-8'), $flang)) {
-
-// Put language into preference list
-$rlang = language_add($flang[1], $languages);
-
-// Set explicity specified language
-if (empty($explicitly_specified)) {
-$explicitly_specified = $rlang;
-}
-
-// Drop out langauge specification from URL, as this is already handled
-$_SERVER['STRIPPED_URI'] = preg_replace(
-"!^/$flang[1]/!", "/", htmlspecialchars($_SERVER['REQUEST_URI'],
ENT_QUOTES, 'UTF-8'),
-);
-
-}
-
-// Specified in a manual URL (eg. manual/en/ or manual/pt_br/)
-if (preg_match("!^/manual/(\\w{2}(_\\w{2})?)(/|$)!",
htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'), $flang)) {
-
-$flang = language_add($flang[1], $languages);
-
-// Set explicity specified language
-if (empty($explicitly_specified)) {
-$explicitly_specified = $flang;
-}
-}
-
-// Honor the users own language setting (if available)
-if (myphpnet_language()) {
-language_add(myphpnet_language(), $languages);
-}
-
-// Specified by the user via the browser's Accept Language setting
-// Samples: "hu, en-us;q=0.66, en;q=0.33", "hu,en-us;q=0.5"
-$browser_langs = []; $parsed_langs = [];
-
-// Check if we have $_SERVER['HTTP_ACCEPT_LANGUAGE'] set and
-// it no longer breaks if you only have one language set :)
-if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-$browser_accept = explode(",", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-
-// Go through all language preference specs
-foreach ($browser_accept as $value) {
-// The language part is either a code or a code with a quality
-// We cannot do anything with a * code, so it is skipped
-// If the quality is missing, it is assumed to be 1 according to
the RFC
-if (preg_match("!([a-z-]+)(;q=([0-9\\.]+))?!", trim($value),
$found)) {
-$quality = (isset($found[3]) ? (float) $found[3] : 1.0);
-$browser_langs[] = [$found[1], $quality];
-}
-unset($found);
-}
-}
-
-// Order the codes by quality
-usort($browser_langs, "language_accept_order");
-
-// For all languages found in the accept-language
-foreach ($browser_langs as $langdata) {
-
-// Translation table for accept-language codes and phpdoc codes
-switch ($langdata[0]) {
-case "pt-br":
-$langdata[0] = 'pt_br';
-break;
-case "zh-cn":
-$langdata[0] = 'zh';
-break;
-case "zh-hk":
-$langdata[0] = 'hk';
-break;
-case "zh-tw":
-$langdata[0] = 'tw';
-break;
-}
-
-// We do not support flavors of languages (except the ones above)
-// This is not in conformance to the RFC, but it here for
[PHP-WEBMASTER] [web-php] PR #1081: Move `language_choose_code()` into new `LangChooser` class
Pull Request: https://github.com/php/web-php/pull/1081 Closed by saundefined.
[PHP-WEBMASTER] [web-php] dependabot/composer/phpunit/phpunit-11.4.1: composer(deps-dev): bump phpunit/phpunit from 11.4.0 to 11.4.1
Author: dependabot[bot] (dependabot[bot])
Committer: GitHub (web-flow)
Pusher: dependabot[bot]
Date: 2024-10-14T15:47:33Z
Commit:
https://github.com/php/web-php/commit/86e5d67ec905af7b6d9cb835ea7785f549268e06
Raw diff:
https://github.com/php/web-php/commit/86e5d67ec905af7b6d9cb835ea7785f549268e06.diff
composer(deps-dev): bump phpunit/phpunit from 11.4.0 to 11.4.1
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from
11.4.0 to 11.4.1.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
-
[Changelog](https://github.com/sebastianbergmann/phpunit/blob/11.4.1/ChangeLog-11.4.md)
-
[Commits](https://github.com/sebastianbergmann/phpunit/compare/11.4.0...11.4.1)
---
updated-dependencies:
- dependency-name: phpunit/phpunit
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Changed paths:
M composer.json
M composer.lock
Diff:
diff --git a/composer.json b/composer.json
index 4237658051..477d8d05bd 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
"require-dev": {
"ext-curl": "*",
"friendsofphp/php-cs-fixer": "^3.64.0",
-"phpunit/phpunit": "^11.4.0"
+"phpunit/phpunit": "^11.4.1"
},
"autoload": {
"psr-4": {
diff --git a/composer.lock b/composer.lock
index c14aab91c2..a93f951b94 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies";,
"This file is @generated automatically"
],
-"content-hash": "6f6b97c3f2668e6a279fb4849c7574ba",
+"content-hash": "c0deb4f37e34214c8e5b54d96906b882",
"packages": [],
"packages-dev": [
{
@@ -570,16 +570,16 @@
},
{
"name": "nikic/php-parser",
-"version": "v5.3.0",
+"version": "v5.3.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git";,
-"reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a"
+"reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a";,
-"reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a",
+"url":
"https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b";,
+"reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
"shasum": ""
},
"require": {
@@ -622,9 +622,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues";,
-"source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0";
+"source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1";
},
-"time": "2024-09-29T13:56:26+00:00"
+"time": "2024-10-08T18:51:32+00:00"
},
{
"name": "phar-io/manifest",
@@ -746,35 +746,35 @@
},
{
"name": "phpunit/php-code-coverage",
-"version": "11.0.6",
+"version": "11.0.7",
"source": {
"type": "git",
"url":
"https://github.com/sebastianbergmann/php-code-coverage.git";,
-"reference": "ebdffc9e09585dafa71b9bffcdb0a229d4704c45"
+"reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ebdffc9e09585dafa71b9bffcdb0a229d4704c45";,
-"reference": "ebdffc9e09585dafa71b9bffcdb0a229d4704c45",
+"url":
"https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f7f08030e8811582cc459871d28d6f5a1a4d35ca";,
+"reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
-"nikic/php-parser": "^5.1.0",
+"nikic/php-parser": "^5.3.1",
"php": ">=8.2",
-"phpunit/php-file-iterator": "^5.0.1",
+"phpunit/php-file-iterator": "^5.1.0",
"phpunit/php-text-template": "^4.0.1",
"sebastian/code-unit-reverse-lookup": "^4.0.1",
"sebastian/complexity": "^4.0.1",
"sebastian/environment": "^7.2.0",
"sebastian/lines-of-code": "^3.0.1",
-"sebastian/version": "^5.0.1",
+"sebastian/version": "^5.0.2",
"theseer/tokenize
[PHP-WEBMASTER] [web-php] created branch dependabot/composer/phpunit/phpunit-11.4.1
Created branch dependabot/composer/phpunit/phpunit-11.4.1 in repository web-php. Pusher: dependabot[bot] After: https://github.com/php/web-php/commit/86e5d67ec905af7b6d9cb835ea7785f549268e06 Compare: https://github.com/php/web-php/commit/86e5d67ec905 Tree: https://github.com/php/web-php/tree/dependabot/composer/phpunit/phpunit-11.4.1
[PHP-WEBMASTER] [web-php] PR #1092: composer(deps-dev): bump phpunit/phpunit from 11.4.0 to 11.4.1
Pull Request: https://github.com/php/web-php/pull/1092 Author: dependabot[bot] Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 11.4.0 to 11.4.1. Release notes Sourced from https://github.com/sebastianbergmann/phpunit/releases";>phpunit/phpunit's releases. PHPUnit 11.4.1 Changed Updated regular expressions used by StringMatchesFormatDescription constraint to be consistent with PHP's run-tests.php Fixed https://redirect.github.com/sebastianbergmann/phpunit/pull/5977";>#5977: TestDox result collector does not correctly handle baseline-ignored E_DEPRECATED issues https://docs.phpunit.de/en/11.4/installation.html";>How to install or update PHPUnit Changelog Sourced from https://github.com/sebastianbergmann/phpunit/blob/11.4.1/ChangeLog-11.4.md";>phpunit/phpunit's changelog. [11.4.1] - 2024-10-08 Changed Updated regular expressions used by StringMatchesFormatDescription constraint to be consistent with PHP's run-tests.php Fixed https://redirect.github.com/sebastianbergmann/phpunit/pull/5977";>#5977: TestDox result collector does not correctly handle baseline-ignored E_DEPRECATED issues Commits https://github.com/sebastianbergmann/phpunit/commit/7875627f15f4da7e7f0823d1f323f7295a77334e";>7875627 Prepare release https://github.com/sebastianbergmann/phpunit/commit/14353201433e1888f449e2dd96957fdfc78a4771";>1435320 Merge branch '10.5' into 11.4 https://github.com/sebastianbergmann/phpunit/commit/aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870";>aa0a8ce Prepare release https://github.com/sebastianbergmann/phpunit/commit/c5a67e72fce72089943e50869a4d823db412c675";>c5a67e7 Merge branch '10.5' into 11.4 https://github.com/sebastianbergmann/phpunit/commit/126dcea55ed95c891d09d950c4a3d7ea660b92e3";>126dcea Closes https://redirect.github.com/sebastianbergmann/phpunit/issues/5980";>#5980 https://github.com/sebastianbergmann/phpunit/commit/f2416db5a838c2d7a9cc5a28351bfb7427105672";>f2416db Merge branch '10.5' into 11.4 https://github.com/sebastianbergmann/phpunit/commit/f19334f3011eeffb06cfffecedb1183bbe3c91ab";>f19334f Closes https://redirect.github.com/sebastianbergmann/phpunit/issues/5979";>#5979 https://github.com/sebastianbergmann/phpunit/commit/690a1f703d64b928216c91b8b8da6420ccc4ff2d";>690a1f7 Fix CS/WS issue https://github.com/sebastianbergmann/phpunit/commit/2403ff78fe92e7785d355286c6181213d109be2d";>2403ff7 Fix CS/WS issue https://github.com/sebastianbergmann/phpunit/commit/360f0f08ac0ccc618f0dca74c2216a4d95e8865c";>360f0f0 Merge branch '10.5' into 11.4 Additional commits viewable in https://github.com/sebastianbergmann/phpunit/compare/11.4.0...11.4.1";>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
[PHP-WEBMASTER] [web-php] master: composer(deps-dev): bump phpunit/phpunit from 11.4.0 to 11.4.1 (#1092)
Author: dependabot[bot] (dependabot[bot])
Committer: GitHub (web-flow)
Pusher: saundefined
Date: 2024-10-14T20:51:05+05:00
Commit:
https://github.com/php/web-php/commit/2eb6b2bebbf97781a30a83fb455068c7509b566d
Raw diff:
https://github.com/php/web-php/commit/2eb6b2bebbf97781a30a83fb455068c7509b566d.diff
composer(deps-dev): bump phpunit/phpunit from 11.4.0 to 11.4.1 (#1092)
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from
11.4.0 to 11.4.1.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
-
[Changelog](https://github.com/sebastianbergmann/phpunit/blob/11.4.1/ChangeLog-11.4.md)
-
[Commits](https://github.com/sebastianbergmann/phpunit/compare/11.4.0...11.4.1)
---
updated-dependencies:
- dependency-name: phpunit/phpunit
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Changed paths:
M composer.json
M composer.lock
Diff:
diff --git a/composer.json b/composer.json
index 4237658051..477d8d05bd 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
"require-dev": {
"ext-curl": "*",
"friendsofphp/php-cs-fixer": "^3.64.0",
-"phpunit/phpunit": "^11.4.0"
+"phpunit/phpunit": "^11.4.1"
},
"autoload": {
"psr-4": {
diff --git a/composer.lock b/composer.lock
index c14aab91c2..a93f951b94 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies";,
"This file is @generated automatically"
],
-"content-hash": "6f6b97c3f2668e6a279fb4849c7574ba",
+"content-hash": "c0deb4f37e34214c8e5b54d96906b882",
"packages": [],
"packages-dev": [
{
@@ -570,16 +570,16 @@
},
{
"name": "nikic/php-parser",
-"version": "v5.3.0",
+"version": "v5.3.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git";,
-"reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a"
+"reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a";,
-"reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a",
+"url":
"https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b";,
+"reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
"shasum": ""
},
"require": {
@@ -622,9 +622,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues";,
-"source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0";
+"source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1";
},
-"time": "2024-09-29T13:56:26+00:00"
+"time": "2024-10-08T18:51:32+00:00"
},
{
"name": "phar-io/manifest",
@@ -746,35 +746,35 @@
},
{
"name": "phpunit/php-code-coverage",
-"version": "11.0.6",
+"version": "11.0.7",
"source": {
"type": "git",
"url":
"https://github.com/sebastianbergmann/php-code-coverage.git";,
-"reference": "ebdffc9e09585dafa71b9bffcdb0a229d4704c45"
+"reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ebdffc9e09585dafa71b9bffcdb0a229d4704c45";,
-"reference": "ebdffc9e09585dafa71b9bffcdb0a229d4704c45",
+"url":
"https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f7f08030e8811582cc459871d28d6f5a1a4d35ca";,
+"reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
-"nikic/php-parser": "^5.1.0",
+"nikic/php-parser": "^5.3.1",
"php": ">=8.2",
-"phpunit/php-file-iterator": "^5.0.1",
+"phpunit/php-file-iterator": "^5.1.0",
"phpunit/php-text-template": "^4.0.1",
"sebastian/code-unit-reverse-lookup": "^4.0.1",
"sebastian/complexity": "^4.0.1",
"sebastian/environment": "^7.2.0",
"sebastian/lines-of-code": "^3.0.1",
-"sebastian/version"
[PHP-WEBMASTER] [web-php] PR #1092: composer(deps-dev): bump phpunit/phpunit from 11.4.0 to 11.4.1
Pull Request: https://github.com/php/web-php/pull/1092 Closed by saundefined.
[PHP-WEBMASTER] [web-php] deleted branch dependabot/composer/phpunit/phpunit-11.4.1
Deleted branch dependabot/composer/phpunit/phpunit-11.4.1 in repository web-php. Pusher: saundefined Before: https://github.com/php/web-php/commit/86e5d67ec905af7b6d9cb835ea7785f549268e06 Compare: https://github.com/php/web-php/compare/86e5d67ec905... Tree: https://github.com/php/web-php/tree/dependabot/composer/phpunit/phpunit-11.4.1
[PHP-WEBMASTER] [web-php] PR #1093: pt_br.ini: Fill in translations in pt_br for English terms
Pull Request: https://github.com/php/web-php/pull/1093 Closed by saundefined.
[PHP-WEBMASTER] [web-php] master: pt_br.ini: Fill in translations for terms (#1093)
Author: Leonardo Lara Rodrigues (leonardolara) Committer: GitHub (web-flow) Pusher: saundefined Date: 2024-10-14T22:58:25+05:00 Commit: https://github.com/php/web-php/commit/0d93b55d79f28343a414eb11278feab3d71a16cb Raw diff: https://github.com/php/web-php/commit/0d93b55d79f28343a414eb11278feab3d71a16cb.diff pt_br.ini: Fill in translations for terms (#1093) Changed paths: M include/ui_translation/pt_br.ini Diff: diff --git a/include/ui_translation/pt_br.ini b/include/ui_translation/pt_br.ini index e24fe76b9e..4b41526664 100644 --- a/include/ui_translation/pt_br.ini +++ b/include/ui_translation/pt_br.ini @@ -1,9 +1,9 @@ -change_language = "" -improve_this_page = "" -how_to_improve_this_page = "" -contribution_guidlines_on_github = "" -submit_a_pull_request = "" -report_a_bug = "" -add_a_note = "" -user_contributed_notes = "" -no_user_notes = "" +change_language = "Selecione a língua:" +improve_this_page = "Melhore Esta Página" +how_to_improve_this_page = "Aprenda Como Melhorar Esta Página" +contribution_guidlines_on_github = "Este atalho te leva ao nosso guia de contribuição no GitHub" +submit_a_pull_request = "Envie uma Solicitação de Modificação" +report_a_bug = "Reporte um Problema" +add_a_note = "adicione uma nota" +user_contributed_notes = "Notas Enviadas por Usuários (em inglês)" +no_user_notes = "Não há notas de usuários para esta página."
[PHP-WEBMASTER] [web-php] master: Update Russian translation for UI
Author: Sergey Panteleev (saundefined) Date: 2024-10-14T22:59:49+05:00 Commit: https://github.com/php/web-php/commit/e1236fc9cbe6687db2f62c1f7f11ee05b63200d2 Raw diff: https://github.com/php/web-php/commit/e1236fc9cbe6687db2f62c1f7f11ee05b63200d2.diff Update Russian translation for UI Changed paths: M include/ui_translation/ru.ini Diff: diff --git a/include/ui_translation/ru.ini b/include/ui_translation/ru.ini index e24fe76b9e..72245402f9 100644 --- a/include/ui_translation/ru.ini +++ b/include/ui_translation/ru.ini @@ -1,9 +1,9 @@ -change_language = "" -improve_this_page = "" -how_to_improve_this_page = "" -contribution_guidlines_on_github = "" -submit_a_pull_request = "" -report_a_bug = "" -add_a_note = "" -user_contributed_notes = "" -no_user_notes = "" +change_language = "Язык" +improve_this_page = "Улучшение страницы" +how_to_improve_this_page = "Инструкция" +contribution_guidlines_on_github = "Github-инструкция по улучшению страниц" +submit_a_pull_request = "Исправление" +report_a_bug = "Сообщение об ошибке" +add_a_note = "Добавить примечание" +user_contributed_notes = "Примечания пользователей" +no_user_notes = "Пользователи ещё не добавляли примечания для страницы"
[PHP-WEBMASTER] [web-downloads] main: Add redirect for uppercase pecl builds in redirect.php
Author: Shivam Mathur (shivammathur)
Committer: GitHub (web-flow)
Pusher: shivammathur
Date: 2024-10-15T00:19:39+05:30
Commit:
https://github.com/php/web-downloads/commit/020e463c5450296a8a04a9008ef0492827359815
Raw diff:
https://github.com/php/web-downloads/commit/020e463c5450296a8a04a9008ef0492827359815.diff
Add redirect for uppercase pecl builds in redirect.php
Changed paths:
M public/redirect.php
Diff:
diff --git a/public/redirect.php b/public/redirect.php
index d166f3e..c69b4bf 100644
--- a/public/redirect.php
+++ b/public/redirect.php
@@ -3,6 +3,11 @@
$fixed = str_replace( 'Win32-vc', 'Win32-VC', $_SERVER['REQUEST_URI'] );
header("Location: $fixed", true, 301);
exit();
+} else if(preg_match('/\/pecl\/.*\/php_[^\-]+\-([^\-]+)/',
$_SERVER['REQUEST_URI'])) {
+preg_match_all('/\/pecl\/.*\/php_[^\-]+\-([^\-]+)/',
$_SERVER['REQUEST_URI'], $matches);
+$fixed = str_replace($matches[1][0], strtoupper($matches[1][0]),
$_SERVER['REQUEST_URI']);
+header("Location: $fixed", true, 301);
+exit();
}
header('Location: /', true, 404);
