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

Feature/merge zf1 future master #4

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
ea063ea
Add EOL templates
Xerkus Jan 8, 2018
d31af76
Fix eol url
Xerkus Feb 5, 2018
136735e
EOL! Archived!
weierophinney May 16, 2018
5279352
Update composer.json
Shardj Jul 23, 2018
8850fc0
Update composer.json
Shardj Jul 23, 2018
ff438d0
Update composer.json
Shardj Jul 23, 2018
47e5c23
Update Abstract.php
Shardj Jul 23, 2018
1409c15
added null case to php 7.2 patch
Shardj Jul 23, 2018
3e9b26c
removed usages of depricated each()
Shardj Jul 23, 2018
52b27cb
removed another bad usage of count()
Shardj Jul 23, 2018
b137704
removing uses of depricated function create_function()
Shardj Jul 23, 2018
41af1c2
fixed occasion where counting null value
Shardj Jul 24, 2018
a78c240
Update README.md
Shardj Jan 2, 2019
b503151
fix(Form.php): PHP7.3 warning
jacekkarczmarczyk Feb 13, 2019
ef8b3e0
fix(Form.php): PHP 7.3. warning
jacekkarczmarczyk Feb 13, 2019
c23376a
Merge pull request #2 from jacekkarczmarczyk/patch-2
Shardj Feb 13, 2019
ddd6249
Update README.md
marcmittag Feb 26, 2019
a162cbf
Update README.md
Shardj Feb 26, 2019
70893e2
Update composer.json
Shardj Feb 26, 2019
e640b1b
handling variables
ipAtMittagQI Feb 28, 2019
e4ab049
fix for error with session_set_cookie_params()
ipAtMittagQI Feb 28, 2019
c5106b8
Update README.md
Shardj Mar 11, 2019
278a768
Merge remote-tracking branch 'MittagQI/master'
Shardj Mar 11, 2019
82a4367
fixed session warning
Shardj Mar 11, 2019
a443732
Add replace in composer.json for zf1 dependencies
dzoeteman Apr 12, 2019
280dc4e
Merge pull request #5 from dzoeteman/patch-1
Shardj Apr 12, 2019
e42e06f
update File Reflection: replace continue by break in switch context
warhole9 Apr 18, 2019
c4fe107
Merge pull request #6 from warhole9/master
Shardj Apr 18, 2019
e84c471
Update README.md
Shardj May 17, 2019
2ad936d
Update README.md
Shardj May 17, 2019
4c70923
issue#8 - fixes php7.3 warning continue in switch statement
Shardj Jul 15, 2019
7b15f33
fixes countable error
Shardj Aug 1, 2019
58a9fb0
Allow unit testing with PHP 7.2
AndreasMalecki Aug 5, 2019
5c0857b
Count all keys with strictly non-null values
davejennings Aug 6, 2019
cdb7521
Merge pull request #12 from davejennings/master
Shardj Aug 8, 2019
3f24279
Merge pull request #11 from AndreasMalecki/master
Shardj Aug 9, 2019
b74aef3
Update README.md
Shardj Sep 11, 2019
2bceb8c
Update README.md
Shardj Sep 11, 2019
e9f3dd8
Update Date::setOptions() -> fix phpdoc
DavidGoodwin Sep 21, 2019
66cbd6f
Fix count() Warnings during bin/zf create
martin-dufka Sep 23, 2019
4c6585a
Merge pull request #18 from martin-dufka/martin-dufka-zf-create-patch-1
Shardj Sep 23, 2019
75dc288
Fixes typo causing yaml.php to break
Shardj Sep 23, 2019
1d67d30
Merge branch 'master' of https://github.com/Shardj/zf1-future
Shardj Sep 23, 2019
cf0f01f
Merge pull request #17 from DavidGoodwin/patch-1
Shardj Sep 23, 2019
b74c432
Fixes yaml.php
Shardj Oct 4, 2019
c50baa0
Merge branch 'master' of https://github.com/Shardj/zf1-future
Shardj Oct 4, 2019
25ab01b
Zend_Config_Yaml now handles multiple subkeys
blinktag Oct 4, 2019
4d9d7ed
Merge pull request #21 from blinktag/bug/zend_config_yaml
Shardj Oct 4, 2019
ce4d3e6
Mute warning Zend_Session_SaveHandler_DbTable
Dringho Oct 21, 2019
17416b2
Revert
Dringho Oct 21, 2019
9175301
Fix when the date is the same as stored
Dringho Oct 21, 2019
62628f6
Merge pull request #23 from Dringho/master
Shardj Oct 22, 2019
29c2e4b
Fixed return value for isValid() method in Zend_Validate_File_FilesSi…
Nov 7, 2019
81c2446
Merge pull request #25 from jimmy4o4/master
Shardj Nov 11, 2019
6a5534f
Fixes relative url check failing for uppercase url schemas
Shardj Nov 11, 2019
a518b23
Update Atom.php
HellFirePvP Nov 13, 2019
abb3827
Delete PULL_REQUEST_TEMPLATE
Shardj Nov 15, 2019
870eaed
Merge pull request #27 from HellFirePvP/master
Shardj Nov 15, 2019
d222077
Replace d.adsrc that it's removed into postgresql 12 #28
Nov 27, 2019
1468632
Merge pull request #31 from francesco-loreti/undefined-column-adsrc
Shardj Nov 29, 2019
9f49d09
Bump version to 1.15.2
Bloafer Dec 2, 2019
160c13f
Merge pull request #32 from Bloafer/patch-1
Shardj Dec 2, 2019
c488fa1
Fix php 7.4 deprecation curly brakets access on strings
TuningYourCode Dec 3, 2019
1d2a28e
Merge pull request #33 from TuningYourCode/php-7.4-fixes
Shardj Dec 4, 2019
f5fd9dd
Restores php 5 compatibility to count.php
Shardj Dec 4, 2019
fe71532
Bumping version for new release of first php 7.4 compatibility patches
Shardj Dec 4, 2019
da7cc64
Changes descriptions to be less specific about the currently supporte…
Shardj Dec 4, 2019
59fa1a8
Remove offsetExists from Zend_Registry to silence array_key_exists on…
andrewcforster Dec 6, 2019
1403a5d
Updated the minimum version to 5.4
Shardj Dec 6, 2019
8d3097d
Merge pull request #35 from acfo/fix/array-key-exists-on-object-in-re…
Shardj Dec 6, 2019
3c230c8
Delete ISSUE_TEMPLATE
Shardj Dec 16, 2019
efca2e2
feat: pdo_sqlsrv by Akrabat
gspadilha Dec 16, 2019
3f50cd7
Merge pull request #38 from gspadilha/master
Shardj Dec 17, 2019
5f6ddec
version bump to 1.16.1
Shardj Dec 19, 2019
f7d48ee
Replace curly brakets for PHP 7.4 compatibility
martijngastkemper Jan 8, 2020
e7707b1
fixup! Replace curly brakets for PHP 7.4 compatibility
martijngastkemper Jan 9, 2020
71f4fcc
Merge pull request #41 from martijngastkemper/fix-curly-brakets-on-st…
Shardj Jan 13, 2020
86da9b5
corrects docblock return typehint
Shardj Jan 13, 2020
5621e19
version bump
Shardj Jan 13, 2020
943f136
Address iconv_substr incompatibility between php 5.x and 7.x
gdiamantg Feb 3, 2020
8365c1a
Merge pull request #46 from gdiamantg/master
Shardj Feb 4, 2020
73107b4
Merge branch 'master' of https://github.com/Shardj/zf1-future into fe…
RayZR Feb 10, 2020
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
10 changes: 3 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
# CONTRIBUTING

> ## End-of-Life occurs 28 Sep 2016
> ## End-of-Life occurred 28 Sep 2016
>
> Between now and 28 Sep 2016, we will only be accepting security patches to
> this repository; after that date, we will issue no more releases.
>
> For more information:
>
> - https://framework.zend.com/blog/2016-06-28-zf1-eol.html
> This project is no longer maintained, and reached its end of life on 28 Sep
> 2016; the last public release was 1.12.20.

---

Expand Down
9 changes: 8 additions & 1 deletion DEVELOPMENT_README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Development using a virtual machine

> ## End-of-Life occurred 28 Sep 2016
>
> This project is no longer maintained, and reached its end of life on 28 Sep
> 2016; the last public release was 1.12.20.
>
> At this time, the repository has been archived, and is read-only.

You can set up a development virtual machine for ZF1 unit testing and library
development following these simple instructions.

Expand Down Expand Up @@ -60,4 +67,4 @@ To stop the VM do one of the following:

Also, when any of of the Puppet manifests change (.pp files), it is a good idea to rerun them:

vagrant provision
vagrant provision
7 changes: 7 additions & 0 deletions README-GIT.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# USING THE GIT REPOSITORY

> ## End-of-Life occurred 28 Sep 2016
>
> This project is no longer maintained, and reached its end of life on 28 Sep
> 2016; the last public release was 1.12.20.
>
> At this time, the repository has been archived, and is read-only.

## Setup your own public repository

Your first step is to establish a public repository from which we can
Expand Down
186 changes: 4 additions & 182 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,185 +1,7 @@
![Logo](http://framework.zend.com/images/logos/ZendFramework-logo.png)
Post end of life changes for zf1 to allow compatibility with the latest PHP versions.

> ## End-of-Life occurs 28 Sep 2016
>
> Between now and 28 Sep 2016, we will only be accepting security patches to
> this repository; after that date, we will issue no more releases.
>
> For more information:
>
> - https://framework.zend.com/blog/2016-06-28-zf1-eol.html
If you have any requests for tags, releases, or anything else. Feel free to raise an issue and I'll get it sorted.

---
Installable through git clone or through `composer require shardj/zf1-future` https://packagist.org/packages/shardj/zf1-future

Welcome to the Zend Framework 1.12 Release!

Master: [![Build Status](https://api.travis-ci.org/zendframework/zf1.png?branch=master)](https://travis-ci.org/zendframework/zf1)

RELEASE INFORMATION
===================

Zend Framework 1.12.21dev Release.
Released on MMM DD, YYYY.

IMPORTANT FIXES FOR 1.12.21
---------------------------

See http://framework.zend.com/changelog for full details.

NEW FEATURES
============

Zend_Loader changes
-------------------

A number of autoloaders and autoloader facilities were back ported from
ZF2 to provide performant alternatives to those already available in the
1.X releases. These include: Zend_Loader_StandardAutoloader, which
improves on Zend_Loader_Autoloader by allowing the ability to specify a
specific path to associate with a vendor prefix or namespace;
Zend_Loader_ClassMapAutoloader, which provides the ability to use lookup
tables for autoloading (which are typically the fastest possible way to
autoload); and Zend_Loader_AutoloaderFactory, which can both create and
update autoloaders for you, as well as register them with
spl_autoload_register().

The Zend_Loader changes were back ported from ZF2 by Matthew Weier
O’Phinney

Zend_EventManager
-----------------

Zend_EventManager is a component that allows you to attach and detach
listeners to named events, both on a per-instance basis as well as via
shared collections; trigger events; and interrupt execution of
listeners.

Zend_EventManager was back ported from ZF2 by Matthew Weier O’Phinney

Zend_Http_UserAgent_Features_Adapter_Browscap
---------------------------------------------

This class provides a features adapter that calls get_browser() in order
to discover mobile device capabilities to inject into UserAgent device
instances.

Browscap (http://browsers.garykeith.com/) is an open project dedicated
to collecting an disseminating a “database” of browser capabilities. PHP
has built-in support for using these files via the get_browser()
function. This function requires that your php.ini provides a browscap
entry pointing to the PHP-specific php_browscap.ini file which is
available at http://browsers.garykeith.com/stream.asp?PHP_BrowsCapINI.

Zend_Http_UserAgent_Features_Adapter_Browscap was created by Matthew
Weier O’Phinney

Zend_Mobile_Push
----------------

Zend_Mobile_Push is a component for implementing push notifications for
the 3 major push notification platforms (Apple (Apns), Google (C2dm) and
Microsoft (Mpns).

Zend_Mobile_Push was contributed by Mike Willbanks.

Zend_Gdata_Analytics
--------------------

Zend_Gdata_Analytics is an extension to Zend_Gdata to allow interaction
with Google’s Analytics Data Export API. This extension does not
encompass any major changes in the overall operation of Zend_Gdata
components.

Zend_Gdata_Analytics was contributed by Daniel Hartmann.

Removed features
================

Zend_Http_UserAgent_Features_Adapter_WurflApi
---------------------------------------------

Due to the changes in licensing of WURFL, we have removed the WurflApi
adapter. We will be providing the WurflApi adapter to ScientiaMobile so
that users of WURFL will still have that option.

Bug Fixes
=========

In addition, over 200 reported issues in the tracker have been fixed.
We’d like to particularly thank Adam Lundrigan, Frank Brückner and
Martin Hujer for their efforts in making this happen. Thanks also to the
many people who ran the ZF1 unit tests and reported their results!

For a complete list of closed issues beginning with 1.12.3, visit:

* https://github.com/zendframework/zf1/issues?labels=&milestone=&page=1&state=closed
* http://framework.zend.com/changelog/

MIGRATION NOTES
===============

A detailed list of migration notes may be found at:

http://framework.zend.com/manual/en/migration.html

SYSTEM REQUIREMENTS
===================

Zend Framework requires PHP 5.2.11 or later. Please see our reference
guide for more detailed system requirements:

http://framework.zend.com/manual/en/requirements.html

INSTALLATION
============

Please see [INSTALL.md](INSTALL.md).

REPOSITORY HISTORY
==================

This repository was created based on the release-1.12 branch of a Subversion
repository, http://framework.zend.com/svn/framework/standard/. It contains a
subset of the project history, dating from between the 1.5.0 and 1.6.0 releases,
and only contains the tags for the 1.12 series. If you would like an older
version, you may access the subversion repository linked above, or download an
older version from http://framework.zend.com/downloads/archives.

CONTRIBUTING
============

Please see [README-GIT.md](README-GIT.md) and
[DEVELOPMENT_README.md](DEVELOPMENT_README.md).

QUESTIONS AND FEEDBACK
======================

Online documentation can be found at http://framework.zend.com/manual.
Questions that are not addressed in the manual should be directed to the
appropriate mailing list:

- http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists

If you find code in this release behaving in an unexpected manner or
contrary to its documented behavior, please create an issue in the Zend
Framework issue tracker at:

- https://github.com/zendframework/zf1/issues

If you would like to be notified of new releases, you can subscribe to
the fw-announce mailing list by sending a blank message to:

- [email protected].

LICENSE
=======

The files in this archive are released under the Zend Framework license.
You can find a copy of this license in [LICENSE.txt](LICENSE.txt).

ACKNOWLEDGEMENTS
================

The Zend Framework team would like to thank all the contributors to the Zend
Framework project, our corporate sponsor, and you, the Zend Framework user.
Please visit us sometime soon at http://framework.zend.com.
Recently https://github.com/Shardj/zf1-extras-future has been created for those who need it.
9 changes: 6 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zendframework/zendframework1",
"description": "Zend Framework 1",
"name": "shardj/zf1-future",
"description": "Zend Framework 1 PHP 5.4+ compatible. The aim is to keep ZF1 working with the latest PHP versions",
"type": "library",
"keywords": [
"framework",
Expand All @@ -9,7 +9,7 @@
"homepage": "http://framework.zend.com/",
"license": "BSD-3-Clause",
"require": {
"php": ">=5.2.11"
"php": ">=5.4"
},
"autoload": {
"psr-0": {
Expand All @@ -33,5 +33,8 @@
},
"archive": {
"exclude": ["/demos", "/documentation", "/tests"]
},
"replace": {
"zendframework/zendframework1": "1.*"
}
}
6 changes: 3 additions & 3 deletions demos/Zend/Mobile/Push/ApnsFeedback.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

$apns = new Zend_Mobile_Push_Apns();
$apns->setCertificate('/path/to/provisioning-certificate.pem');

try {
$apns->connect(Zend_Mobile_Push_Apns::SERVER_FEEDBACK_SANDBOX_URI);
} catch (Zend_Mobile_Push_Exception_ServerUnavailable $e) {
Expand All @@ -13,9 +13,9 @@
echo 'APNS Connection Error:' . $e->getMessage();
exit(1);
}

$tokens = $apns->feedback();
while(list($token, $time) = each($tokens)) {
foreach ($tokens as $token => $time) {
echo $time . "\t" . $token . PHP_EOL;
}
$apns->close();
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function randomString()

for ($i = 0; $i < $stringLen; $i ++) {
$pos = (rand() % $poolLen);
$ret .= $pool{$pos};
$ret .= $pool[$pos];
}

return $ret;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ echo $this->navigation()->breadcrumbs()

<programlisting language="php"><![CDATA[
echo implode(', ', array_map(
create_function('$a', 'return $a->getLabel();'),
function ($a) { return $a->getLabel(); },
$this->pages));
]]></programlisting>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ try {
}

$tokens = $apns->feedback();
while(list($token, $time) = each($tokens)) {
foreach ($tokens as $token => $time) {
echo $time . "\t" . $token . PHP_EOL;
}
$apns->close();
]]></programlisting>

</sect2>

<sect2 id="zend.mobile.push.apns.message">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ echo $this->navigation()->breadcrumbs()

<programlisting language="php"><![CDATA[
echo implode(', ', array_map(
create_function('$a', 'return $a->getLabel();'),
function ($a) { return $a->getLabel(); },
$this->pages));
]]></programlisting>

Expand Down Expand Up @@ -1261,10 +1261,10 @@ Output:
should be rendered.
</para>
</listitem>

<listitem>
<para>
<code>{get|set}ExpandSiblingNodesOfActiveBranch()</code>
<code>{get|set}ExpandSiblingNodesOfActiveBranch()</code>
gets/sets a flag specifying whether the sibling nodes of all
nodes in the active branch should also be expanded and rendered.
</para>
Expand Down Expand Up @@ -1380,8 +1380,8 @@ Output:

<listitem>
<para>
<code>expandSiblingNodesOfActiveBranch</code>;
whether the sibling nodes of nodes in the active
<code>expandSiblingNodesOfActiveBranch</code>;
whether the sibling nodes of nodes in the active
branch should be expanded and rendered. Expects
a <type>Boolean</type> value.
</para>
Expand Down Expand Up @@ -1823,7 +1823,7 @@ Output:
</ul>
]]></programlisting>
</example>

<example id="zend.view.helpers.initial.navigation.menu.example10">
<title>Rendering a custom menu using a partial view script</title>

Expand Down Expand Up @@ -1862,10 +1862,10 @@ foreach ($this->container as $page) {
<a href="/community">Community</a>
]]></programlisting>
</example>

<example id="zend.view.helpers.initial.navigation.menu.example11">
<title>
Rendering only the active branch and all siblings of the active branch
Rendering only the active branch and all siblings of the active branch
</title>

<programlisting language="php"><![CDATA[
Expand Down Expand Up @@ -1911,7 +1911,7 @@ echo $this->navigation()
</li>
</ul>
]]></programlisting>
</example>
</example>
</sect4>

<sect4 id="zend.view.helpers.initial.navigation.sitemap">
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Amf/Util/BinaryStream.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public function readByte()
);
}

return ord($this->_stream{$this->_needle++});
return ord($this->_stream[$this->_needle++]);
}

/**
Expand Down
Loading