Merge remote-tracking branch 'upstream/3.0.x' into 2.30.x-merge-up-in…

…to-3.0.x_Ako44Mwc # Conflicts: # src/Helper/Gravatar.php
laminas · Aug 17, 2023 · 877d77b · 877d77b
2 parents 055623f + 320f867
commit 877d77b
Show file tree

Hide file tree

Showing 43 changed files with 255 additions and 2,842 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,22 @@
 
 [![Build Status](https://github.com/laminas/laminas-view/workflows/Continuous%20Integration/badge.svg)](https://github.com/laminas/laminas-view/actions?query=workflow%3A"Continuous+Integration")
 
+> ## 🇷🇺 Русским гражданам
+>
+> Мы, участники Laminas, родились и живем в разных странах. У многих из нас есть друзья, родственники и коллеги как в России, так и в Украине. Некоторые из нас родились в России. Некоторые из нас живут в России. У некоторых бабушки и дедушки сражались с фашистами во Второй мировой войне. Здесь никто не поддерживает фашизм.
+>
+> У одного из нас есть украинская родственница, которая спаслась из дома вместе с сыном. Поезд задержался из-за бомбежки на дороге впереди. У нас есть друзья, которые прячутся в бомбоубежищах. Мы с тревогой ждем весточки от них после воздушных налетов, которые беспорядочно наносят удары и попадают по больницам, школам, детским садам и домам. Мы не берем это из каких-либо СМИ. Мы наблюдаем это напрямую.
+>
+> Вы доверяете нам достаточно, чтоб использовать наши программы, и мы просим вас довериться нам вновь. Мы нуждаемся в помощи. Выходите и протестуйте против этой бесполезной войны. Остановите кровопролитие. Скажите "Нет войне!"
+>
+> ## 🇺🇸 To Citizens of Russia
+>
+> We at Laminas come from all over the world. Many of us have friends, family and colleagues in both Russia and Ukraine. Some of us were born in Russia. Some of us currently live in Russia. Some have grandparents who fought Nazis in World War II. Nobody here supports fascism.
+>
+> One team member has a Ukrainian relative who fled her home with her son. The train was delayed due to bombing on the road ahead. We have friends who are hiding in bomb shelters. We anxiously follow up on them after the air raids, which indiscriminately fire at hospitals, schools, kindergartens and houses. We're not taking this from any media. These are our actual experiences.
+>
+> You trust us enough to use our software. We ask that you trust us to say the truth on this. We need your help. Go out and protest this unnecessary war. Stop the bloodshed. Say "stop the war!"
+
 laminas-view provides the “View” layer of the Laminas MVC system. It is a
 multi-tiered system allowing a variety of mechanisms for extension,
 substitution, and more.

diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
             "php": "8.1.99"
         },
         "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "composer/package-versions-deprecated": true
         }
     },
     "require": {
@@ -46,7 +47,6 @@
         "laminas/laminas-modulemanager": "^2.14",
         "laminas/laminas-mvc": "^3.6.1",
         "laminas/laminas-mvc-i18n": "^1.7",
-        "laminas/laminas-mvc-plugin-flashmessenger": "^1.9",
         "laminas/laminas-navigation": "^2.18.1",
         "laminas/laminas-paginator": "^2.17",
         "laminas/laminas-permissions-acl": "^2.15",

diff --git a/composer.lock b/composer.lock
diff --git a/docs/book/helpers/flash-messenger.md b/docs/book/helpers/flash-messenger.md
diff --git a/docs/book/helpers/html-object.md b/docs/book/helpers/html-object.md
@@ -2,12 +2,10 @@
 
 The [HTML `<object>` element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/object) is used for embedding external media in web pages. The object view helpers take care of embedding media with minimum effort.
 
-There are four initial Object helpers:
+There are two initial Object helpers:
 
 - `htmlObject()` Generates markup for embedding a custom Object.
 - `htmlPage()` Generates markup for embedding other (X)HTML pages.
-- `htmlFlash()` Generates markup for embedding Flash files. _**Deprecated**_
-- `htmlQuicktime()` Generates markup for embedding QuickTime files. _**Deprecated**_
 
 All of these helpers share a similar interface. For this reason, this
 documentation will only contain examples of two of these helpers.

diff --git a/docs/book/helpers/intro.md b/docs/book/helpers/intro.md
@@ -60,7 +60,6 @@ for, and rendering, the various HTML `<head>` tags, such as `HeadTitle`,
 - [BasePath](base-path.md)
 - [Cycle](cycle.md)
 - [Doctype](doctype.md)
-- [FlashMessenger](flash-messenger.md)
 - [Gravatar](gravatar.md) _(Deprecated)_
 - [GravatarImage](gravatar-image.md)
 - [HeadLink](head-link.md)
@@ -110,6 +109,12 @@ for, and rendering, the various HTML `<head>` tags, such as `HeadTitle`,
 > [Paginator Usage](https://docs.laminas.dev/laminas-paginator/usage/#rendering-pages-with-view-scripts)
 > documentation.
 
+> ### FlashMessenger helper
+>
+> View helper related to **Flash Messenger** is documented in the
+> [FLash Messenger View Helper](https://docs.laminas.dev/laminas-mvc-plugin-flashmessenger/view-helper/)
+> documentation.
+
 > ### Custom Helpers
 >
 > For documentation on writing **custom view helpers** see the