search

laminas / laminas-view

Flexible view layer supporting and providing multiple view layers, helpers, and more
https://docs.laminas.dev/laminas-view/
BSD 3-Clause "New" or "Revised" License
74 stars 45 forks source link

2.24.x branch contains 3.0.x commits #177

Closed Ocramius closed 2 years ago

gsteel commented 2 years ago

@Ocramius Can I cut a new 2.24.x branch from 2.23.x - we'd only lose a couple of renovate commits?

Ocramius commented 2 years ago

@gsteel I think resetting 2.24.x to 2.23.x would suffice: lemme check :)

Ocramius commented 2 years ago

Here's the full log of 2.24.x before I force-push it back:

commit 44fd3ac808dc65ffafb5533c5c83ba272fcd71cd
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Sat Oct 1 00:06:05 2022 +0000

    Lock file maintenance

    Signed-off-by: Renovate Bot <bot@renovateapp.com>

commit 3f0f2ec021a49d9a6002e5c79f2dac3292d230f5
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Sep 26 00:55:15 2022 +0000

    Lock file maintenance

    Signed-off-by: Renovate Bot <bot@renovateapp.com>

commit 7e977447263b8376bd21b002a61f152f5325028d
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Sat Sep 24 00:33:00 2022 +0000

    Lock file maintenance

    Signed-off-by: Renovate Bot <bot@renovateapp.com>

commit 7be627ff1babb8532b9adfa93d9c326f5cfc96c7
Merge: 620774e9 daa56ec8
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Tue Sep 20 17:13:35 2022 +0200

    Merge pull request #169 from laminas/renovate/lock-file-maintenance

    Lock file maintenance

commit daa56ec8717ab74ce9e61adeb543ccfe9f89f361
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Sep 20 13:19:51 2022 +0000

    Lock file maintenance

    Signed-off-by: Renovate Bot <bot@renovateapp.com>

commit 620774e9da667d23f39d8d2f70961f739c6d095e
Merge: abc0d58c 54bf1bf6
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Thu Aug 25 02:17:50 2022 +0200

    Merge pull request #175 from laminas/renovate/laminas

    Update dependency laminas/laminas-coding-standard to ~2.4.0

commit 54bf1bf6e1a1c3b50814c1220447ab9d4b8b5379
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Thu Aug 25 02:16:12 2022 +0200

    Upgraded PHPUnit, laminas/laminas-coding-standard and removed prophecy transitive dependency

commit f4e55c7f36dbf5db47c208f52196516ea7706c7c
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Aug 24 23:06:37 2022 +0000

    Update dependency laminas/laminas-coding-standard to ~2.4.0

    | datasource | package                         | from  | to    |
    | ---------- | ------------------------------- | ----- | ----- |
    | packagist  | laminas/laminas-coding-standard | 2.3.0 | 2.4.0 |

    Signed-off-by: Renovate Bot <bot@renovateapp.com>

commit abc0d58c08d555f8a316be01e47a90625dcb6376
Merge: f53ffc22 43ac9bb3
Author: George Steel <george@net-glue.co.uk>
Date:   Tue Jul 19 11:34:31 2022 +0100

    Merge pull request #171 from laminas/2.22.x-merge-up-into-3.0.x_PMzPyNu7

    Merge release 2.22.0 into 3.0.x

commit 43ac9bb3bd7e181341f634ce95f465eab6181a28
Merge: ae32391b f53ffc22
Author: George Steel <george@net-glue.co.uk>
Date:   Tue Jul 19 11:00:48 2022 +0100

    Resolve composer.lock conflict

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit f53ffc224372c922e20875301a9c9d71500a31ce
Merge: 3b5a1617 70c450bc
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Mon Jul 11 00:03:07 2022 +0200

    Merge pull request #167 from gsteel/2.21-mergeup

    2.21 mergeup

commit 70c450bcd990e59fb60e4dbde6e5fc5856e3b46a
Author: George Steel <george@net-glue.co.uk>
Date:   Sun Jul 10 22:56:01 2022 +0100

    Resolves merge conflicts from 2.21.x, updating locked dependencies

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit c57a90abed53f8e0480ffa15887f60325adafacf
Merge: 3b5a1617 4145f10d
Author: George Steel <george@net-glue.co.uk>
Date:   Sun Jul 10 22:46:31 2022 +0100

    Merge branch '2.21.x' into 2.21-mergeup

    # Conflicts:
    #       composer.lock
    #       docs/book/helpers/intro.md
    #       psalm-baseline.xml
    #       src/Helper/Json.php
    #       src/Helper/Service/AssetFactory.php
    #       src/Helper/Service/FlashMessengerFactory.php
    #       src/Helper/Service/IdentityFactory.php
    #       src/HelperPluginManager.php

commit 3b5a1617128bb913d12fd10a29f3854ee563b2fc
Merge: 63d66683 3439bb62
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Thu Mar 24 02:09:19 2022 +0100

    Merge pull request #153 from gsteel/fix-7-placeholder-view-helper-return-value

    Fix #7 - placeholder view helper return value should be given also with `null` input

commit 63d66683ec9ae6c2118d04e109982dc0dabcb34e
Merge: 5ac961ba 06ad4e9c
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Thu Mar 24 02:07:07 2022 +0100

    Merge pull request #135 from gsteel/remove-flashmessenger-view-helper

    Remove flashmessenger view helper

commit 5ac961ba384b78719f6d6306b79bb579e89d42d5
Merge: 01f330b9 ad1a3901
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Thu Mar 24 02:05:09 2022 +0100

    Merge pull request #152 from gsteel/remove-deprecated-eol-abstracthtmlelement

    Remove deprecated const EOL in AbstractHtmlElement

commit 01f330b9f9c56c71f103f9c0fa2bad6667199c06
Merge: 29dea7dc 7686f1c1
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Thu Mar 24 02:03:12 2022 +0100

    Merge pull request #155 from gsteel/deprecations/identity-helper

    Resolve deprecations in Identity view helper

commit 29dea7dce13e10fde6fb6944165a9d36bce992ab
Merge: dceb7b6a d9232e6f
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Thu Mar 24 02:02:04 2022 +0100

    Merge pull request #154 from gsteel/deprecations/asset-helper

    Resolve deprecations in Asset view helper

commit 7686f1c182523f81ebf0ba72549f46f746da6b9c
Author: George Steel <george@net-glue.co.uk>
Date:   Wed Mar 23 22:54:12 2022 +0000

    Resolve deprecations in Identity view helper

    Removes deprecated methods and inheritance in the Identity helper, marking it final.
    Removes factory interface inheritance and swaps service manager for container interface
    Fixes factory tests to test helper behaviour instead of calling removed service getter.

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit d9232e6f4a0c784ee832f1608dbca0cf3a32249d
Author: George Steel <george@net-glue.co.uk>
Date:   Wed Mar 23 22:39:22 2022 +0000

    Resolve deprecations in Asset view helper

    Removes deprecated methods and inheritance in the Asset helper, marking it final.
    Removes factory interface inheritance and swaps service manager for container interface
    Removes deprecated/obsolete tests

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit 3439bb62a61b281a0ffa062def434828bb846101
Author: George Steel <george@net-glue.co.uk>
Date:   Wed Mar 23 20:34:13 2022 +0000

    Fixes psalm errors for argument dependent return type

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit 4ad9ca5fca12c28bd1ebbb7b7d280c60af53ace6
Author: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date:   Fri Jul 17 10:46:52 2020 +0700

    Fixes #7 Fix Placeholder view helper return value

    Signed-off-by: Abdul Malik Ikhsan <samsonasik@gmail.com>

commit ad1a3901dd7aa49fc8518f76fc3785a3bb629951
Author: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date:   Tue Jun 2 22:12:38 2020 +0700

    remove deprecated const EOL in AbstractHtmlElement

    Signed-off-by: Abdul Malik Ikhsan <samsonasik@gmail.com>

commit 06ad4e9c380b404886ab60bff85c461354a57c11
Author: George Steel <george@net-glue.co.uk>
Date:   Wed Mar 23 15:17:09 2022 +0000

    Remove phpspec/prophecy from dev dependencies

    Closes #133

    Tests removed in this branch contain the last remaining usage of Prophecy

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit db23fc8980bb30e6e0afdbd1fcf260303b94f271
Author: George Steel <george@net-glue.co.uk>
Date:   Wed Mar 23 14:57:09 2022 +0000

    Lock update post rebase.
    Remove escaper from dev deps - it crept back in during a merge and is already present in deps
    Remove flash messenger from dev deps. It is no longer referenced anywhere.

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit 2bff6d68f876686c361022b29fa8acc28951ec9f
Author: George Steel <george@net-glue.co.uk>
Date:   Tue Feb 1 16:05:09 2022 +0000

    Updates baseline after removal of flash messenger

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit e2fd333f7e22b35ef9e8d09c50baf3b5c6b200df
Author: George Steel <george@net-glue.co.uk>
Date:   Tue Feb 1 16:03:12 2022 +0000

    - Removes flash messenger from docs build
    - Removes magic method docs for removed helpers
    - Removes stray factory definition for removed helper

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit 7bdb2f7ec101f61c59caf7d41210677bb0a5a685
Author: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date:   Tue Jul 14 15:27:25 2020 +0700

    Fixes #16 remove FlashMessenger view helper

    Signed-off-by: Abdul Malik Ikhsan <samsonasik@gmail.com>

commit dceb7b6a6d8c28474f153c28c672ebbb76c847c2
Merge: 331a46b5 c9b36df4
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Wed Mar 23 15:47:31 2022 +0100

    Merge pull request #126 from gsteel/remove-console

    Remove laminas-console dependency

commit c9b36df402c5af2f237129c569ea5991d5442b58
Author: George Steel <george@net-glue.co.uk>
Date:   Wed Mar 23 14:40:15 2022 +0000

    Lock file rebase

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit c79d221036981208cf79a6768ebc519cb3c322a5
Author: George Steel <george@net-glue.co.uk>
Date:   Sat Jan 8 21:07:41 2022 +0000

    Console Removal WRT #101

    - Removes Console Model and Renderer
    - Removes laminas-console from dev dependencies

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit 331a46b5f6377d985024557025a75e11697695fb
Merge: 6e623cca c25b97e2
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Wed Mar 23 15:24:05 2022 +0100

    Merge pull request #151 from gsteel/Merge_release_2.20.0_into_3.0.x

    Merge release 2.20.0 into 3.0.x

commit c25b97e2fc7fa5b5fec720fd46f43fca11ceb397
Author: George Steel <george@net-glue.co.uk>
Date:   Wed Mar 23 14:11:03 2022 +0000

    Resets composer.lock after merge into 3.0.x

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit c08ed765340804d27d25819fe5ffee606bf52428
Merge: 3855f6ef 2cd6973a
Author: George Steel <george@net-glue.co.uk>
Date:   Wed Mar 23 14:05:59 2022 +0000

    Merge branch '2.20.x' into Merge_release_2.20.0_into_3.0.x

    # Conflicts:
    #       composer.json
    #       composer.lock
    #       psalm-baseline.xml
    #       src/Helper/Service/IdentityFactory.php
    #       test/Helper/HtmlFlashTest.php
    #       test/Helper/HtmlQuicktimeTest.php
    #       test/Helper/JsonTest.php
    #       test/Helper/Service/IdentityFactoryTest.php

commit 6e623ccabfcd26999ce836990e5157125b58aede
Author: Michał Bundyra <contact@webimpress.com>
Date:   Tue Mar 8 15:58:45 2022 +0000

    Message against the war, in Russian and English

    🇷🇺 Русским гражданам

    Мы, участники 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. Were 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!"

    Signed-off-by: Michał Bundyra <contact@webimpress.com>

commit 3855f6ef2c7f5c514ba0c0e9a1876e4f42ec8384
Merge: 6eccdb04 ddb4884a
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Tue Feb 1 18:27:07 2022 +0100

    Merge pull request #136 from gsteel/dep-singleton-registry-removal

    remove E_USER_DEPRECATED deprecated methods

commit ddb4884aeb8d0092dc30ad8c689f19695c010d87
Author: George Steel <george@net-glue.co.uk>
Date:   Tue Feb 1 17:03:06 2022 +0000

    Applies CS Fixes

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit 3eebe5fe556b178ce6b84fa12d9079e2bb4114db
Author: George Steel <george@net-glue.co.uk>
Date:   Tue Feb 1 16:52:24 2022 +0000

    Removes tests targeting deprecated and removed methods

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit 6f5257739c19169cbd26015ee5a113c5cb63c6be
Author: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date:   Sat May 9 15:18:20 2020 +0700

    remove E_USER_DEPRECATED deprecated methods

    Signed-off-by: Abdul Malik Ikhsan <samsonasik@gmail.com>

commit 6eccdb0410a57b179de02150279bb2909b580525
Merge: 3e0d8db1 90a47947
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Tue Feb 1 14:24:07 2022 +0100

    Merge pull request #129 from gsteel/remove-stream-wrapper

    Remove Stream Wrapper Functionality

commit 90a47947d9a50f854c6614e14ca416676a32cff0
Author: George Steel <george@net-glue.co.uk>
Date:   Mon Jan 31 23:34:21 2022 +0000

    Remove Stream Wrapper Functionality

    - Updates the path stack template resolver removing deprecated methods related to stream wrapper
    - Removes the Stream wrapper class
    - Updates psalm baseline

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit 3e0d8db14a31bafd7b4cb16731d2602f811de499
Merge: 64f49b14 18f4cf6d
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Tue Feb 1 13:39:50 2022 +0100

    Merge pull request #128 from gsteel/bye-bye-zend

    Remove legacy Zend compatibility

commit 18f4cf6d5d86f6b29be117b39380a7d5393e6a66
Author: George Steel <george@net-glue.co.uk>
Date:   Mon Jan 31 23:10:49 2022 +0000

    Remove legacy Zend compatibility

    - Removes hard-coded, zend-related aliases from the various plugin managers
    - Removes code that searches the container for Zend\Authentication in the Identity helper factory
    - Cleans up the test for the identity helper factory to use regular PHP Unit mocks and also compatibility with ServiceManager 2.x which is long gone.
    - Updates psalm baseline

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit 64f49b14b3cb22234404a5c4e6b1edaa304f0aca
Merge: e0d37bf4 960d2d74
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Mon Jan 31 23:22:50 2022 +0100

    Merge pull request #127 from gsteel/remove-obsolete-helpers

    Removes deprecated/obsolete Flash and QuickTime helpers

commit e0d37bf438fea30360a24c2ca91fbfcb6fa44e8a
Merge: 9bf62592 d55a6767
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Mon Jan 31 23:20:33 2022 +0100

    Merge pull request #125 from gsteel/remove-laminas-json

    Remove dependency on laminas-json

commit 960d2d74e1a8e75a3ee8f69e6d5100f2b37f53c2
Author: George Steel <george@net-glue.co.uk>
Date:   Mon Jan 10 19:58:30 2022 +0000

    Removes deprecated/obsolete Flash and QuickTime helpers

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit d55a6767a5f7163e7bb75f3bfd6f19c5a9b1d63f
Author: George Steel <george@net-glue.co.uk>
Date:   Mon Jan 31 20:36:44 2022 +0000

    Remove dependency on laminas-json

    - Removes deprecated JSON Expr finder compatibility in view helper and related deprecation errors
    - Removes composer dependency on `laminas-json`
    - Removes outdated documentation for Json Epr finder
    - Replaces usage of `Laminas\Json` with calls to native `json_encode`
    - Update psalm baseline

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit 9bf62592b6ba43dcf9dc591e45010e0c8574d328
Merge: 30dba161 728b033a
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Mon Jan 31 20:21:52 2022 +0100

    Merge pull request #118 from gsteel/cyclic-deps-on-3

    Workaround for Cyclic Incompatible Dependencies on 3.0.x

commit 728b033ab22e76a21e99363a2a140203291ec784
Author: George Steel <george@net-glue.co.uk>
Date:   Wed Jan 12 19:35:39 2022 +0000

    Adds a script to check out the current tree as a 2.99.x branch for CI runs so that composer will install cyclic incompatible dependencies.

    Signed-off-by: George Steel <george@net-glue.co.uk>

commit 30dba161f7f29a2d852036308dbe3425e1173615
Merge: bad31b0e 8ffe5d28
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Tue Jan 11 13:12:52 2022 +0100

    Merge pull request #109 from laminas/2.19.x-merge-up-into-3.0.x_XUD4vRwd

    Merge release 2.19.0 into 3.0.x

commit bad31b0e939b82f5cb9922105c5b0e44f1c0fab3
Merge: c0ee6b77 19658921
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Sun Jan 9 22:18:15 2022 +0100

    Merge pull request #105 from laminas/2.18.x-merge-up-into-3.0.x_7ITplKgP

    Merge release 2.18.0 into 3.0.x

commit c0ee6b7758ec1d7cae32b0f16e1b17584f4ae6ab
Merge: b4e6eeeb 826d4d6a
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Sun Jan 9 03:51:40 2022 +0100

    Merge pull request #103 from laminas/2.17.x-merge-up-into-3.0.x_phTPoQpk

    Merge release 2.17.0 into 3.0.x

commit b4e6eeeb8ca10a490e9bc735a7d0996fa5873cb2
Merge: d4b13645 cc803ea8
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Thu Dec 30 14:10:51 2021 +0100

    Merge pull request #98 from laminas/2.16.x-merge-up-into-3.0.x_t9Y4zMdG

    Merge release 2.16.0 into 3.0.x

commit d4b13645194193b66ea43c44c7dcee00e336d06d
Merge: 01cfed29 af2f714e
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Fri Dec 17 12:27:21 2021 +0100

    Merge pull request #94 from laminas/2.15.x-merge-up-into-3.0.x_ZhQTzgI0

    Merge release 2.15.0 into 3.0.x

commit 01cfed29007a26873a8b9d35f93bd7fbc0512804
Merge: ad78d280 3ccd2a74
Author: Marco Pivetta <ocramius@gmail.com>
Date:   Wed Oct 13 14:08:25 2021 +0200

    Merge pull request #86 from laminas/2.14.x-merge-up-into-3.0.x_uHS0IKzS

    Merge release 2.14.0 into 3.0.x

commit ad78d2804faaf4483d086539a64f09c494bc55ef
Merge: d0055a61 04587427
Author: Matthew Weier O'Phinney <matthew@weierophinney.net>
Date:   Tue Oct 12 13:32:05 2021 -0500

    Merge pull request #83 from laminas/2.13.x-merge-up-into-3.0.x_9MTghaQA

    Merge release 2.13.0 into 3.0.x

commit d0055a61e76cbfc4b443fb2386e2949e7d5a4971
Merge: c34b15f4 23fc8866
Author: Matthew Weier O'Phinney <matthew@weierophinney.net>
Date:   Tue Oct 12 11:50:47 2021 -0500

    Merge pull request #82 from laminas/2.12.x-merge-up-into-3.0.x_aLnWvS4q

    Merge release 2.12.1 into 3.0.x

commit c34b15f42cac410f35010163de169ab71c39bf73
Merge: 99737ebe 3ef103da
Author: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
Date:   Fri Jan 1 15:13:02 2021 +0100

    Merge pull request #62 from laminas/2.12.x-merge-up-into-3.0.x_5fef2cb3d5ed64.30089724

    Merge release 2.12.0 into 3.0.x

From what I can see, we probably messed up a couple merges there, especially the merge-up operations.

I pushed up 2.24.x-bkp-2022-10-11 as a backup, if needed: we can drop it after a while.

Ocramius commented 2 years ago

A git push -f origin 2.23.x:2.24.x fixed that for now

Ocramius commented 2 years ago

https://github.com/laminas/laminas-view/compare/2.23.x...2.24.x only contains #178 now :+1: