mirror of
https://github.com/Icinga/icinga-php-thirdparty.git
synced 2025-12-18 11:15:57 +01:00
Remove patch for shardj/zf1-future
The patch has been merged to master.
This commit is contained in:
Sukhwinder Dhillon
parent
7bcbc8aa51
commit
95acc02b3f
@ -35,7 +35,7 @@
|
||||
"react/http": "^1.11",
|
||||
"react/promise": "^3.3",
|
||||
"react/socket": "^1.17",
|
||||
"shardj/zf1-future": "dev-master",
|
||||
"shardj/zf1-future": "dev-master#9eabd56",
|
||||
"simshaun/recurr": "^5.0",
|
||||
"tedivm/jshrink": "^1.8",
|
||||
"wikimedia/less.php": "^3.2.1",
|
||||
@ -51,17 +51,5 @@
|
||||
"post-update-cmd": [
|
||||
"AssetLoader::update"
|
||||
]
|
||||
},
|
||||
"extra": {
|
||||
"composer-exit-on-patch-failure": true,
|
||||
"patches": {
|
||||
"shardj/zf1-future": [
|
||||
{
|
||||
"description": "ZF1-Future: PHP8.5: Fix still missing non-canonical cast",
|
||||
"url": "patches/PHP85-fix-missing-non-canonical-cast.patch",
|
||||
"depth": 1
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
10
composer.lock
generated
10
composer.lock
generated
@ -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": "3fc103d6993f990c63ce9c2ef3ea3df6",
|
||||
"content-hash": "ba68c7ef1ddced97293f6e66aa7eb887",
|
||||
"packages": [
|
||||
{
|
||||
"name": "brick/math",
|
||||
@ -2813,12 +2813,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Shardj/zf1-future.git",
|
||||
"reference": "68aaa82251d630b78a97910e6fdd71736a0273a4"
|
||||
"reference": "9eabd56"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Shardj/zf1-future/zipball/68aaa82251d630b78a97910e6fdd71736a0273a4",
|
||||
"reference": "68aaa82251d630b78a97910e6fdd71736a0273a4",
|
||||
"url": "https://api.github.com/repos/Shardj/zf1-future/zipball/9eabd56",
|
||||
"reference": "9eabd56",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2872,7 +2872,7 @@
|
||||
"issues": "https://github.com/Shardj/zf1-future/issues",
|
||||
"source": "https://github.com/Shardj/zf1-future/tree/master"
|
||||
},
|
||||
"time": "2025-11-16T11:45:20+00:00"
|
||||
"time": "2025-12-06T12:26:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "simshaun/recurr",
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
diff --git a/library/Zend/Form/Element/File.php b/library/Zend/Form/Element/File.php
|
||||
index 0b81b18ac..11764a3f7 100644
|
||||
--- a/library/Zend/Form/Element/File.php
|
||||
+++ b/library/Zend/Form/Element/File.php
|
||||
@@ -643,7 +643,7 @@ class Zend_Form_Element_File extends Zend_Form_Element_Xhtml
|
||||
{
|
||||
if (!is_numeric($setting)) {
|
||||
$type = strtoupper(substr($setting, -1));
|
||||
- $setting = (integer) substr($setting, 0, -1);
|
||||
+ $setting = (int) substr($setting, 0, -1);
|
||||
|
||||
switch ($type) {
|
||||
case 'K' :
|
||||
diff --git a/library/Zend/Memory/Manager.php b/library/Zend/Memory/Manager.php
|
||||
index aa10ab43e..0947ab1d2 100644
|
||||
--- a/library/Zend/Memory/Manager.php
|
||||
+++ b/library/Zend/Memory/Manager.php
|
||||
@@ -169,7 +169,7 @@ class Zend_Memory_Manager
|
||||
|
||||
$memoryLimitStr = trim(ini_get('memory_limit'));
|
||||
if ($memoryLimitStr != '' && $memoryLimitStr != -1) {
|
||||
- $this->_memoryLimit = (integer)$memoryLimitStr;
|
||||
+ $this->_memoryLimit = (int)$memoryLimitStr;
|
||||
switch (strtolower($memoryLimitStr[strlen($memoryLimitStr)-1])) {
|
||||
case 'g':
|
||||
$this->_memoryLimit *= 1024;
|
||||
diff --git a/library/Zend/Paginator.php b/library/Zend/Paginator.php
|
||||
index b0b9df7ff..563dd6a11 100644
|
||||
--- a/library/Zend/Paginator.php
|
||||
+++ b/library/Zend/Paginator.php
|
||||
@@ -1077,7 +1077,7 @@ class Zend_Paginator implements Countable, IteratorAggregate
|
||||
*/
|
||||
protected function _calculatePageCount()
|
||||
{
|
||||
- return (integer) ceil($this->getTotalItemCount() / $this->getItemCountPerPage());
|
||||
+ return (int) ceil($this->getTotalItemCount() / $this->getItemCountPerPage());
|
||||
}
|
||||
|
||||
/**
|
||||
8
vendor/composer/installed.json
vendored
8
vendor/composer/installed.json
vendored
@ -2937,12 +2937,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Shardj/zf1-future.git",
|
||||
"reference": "68aaa82251d630b78a97910e6fdd71736a0273a4"
|
||||
"reference": "9eabd56"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Shardj/zf1-future/zipball/68aaa82251d630b78a97910e6fdd71736a0273a4",
|
||||
"reference": "68aaa82251d630b78a97910e6fdd71736a0273a4",
|
||||
"url": "https://api.github.com/repos/Shardj/zf1-future/zipball/9eabd56",
|
||||
"reference": "9eabd56",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2967,7 +2967,7 @@
|
||||
"suggest": {
|
||||
"ext-mbstring": "Multibyte strings handling"
|
||||
},
|
||||
"time": "2025-11-16T11:45:20+00:00",
|
||||
"time": "2025-12-06T12:26:11+00:00",
|
||||
"default-branch": true,
|
||||
"type": "library",
|
||||
"extra": {
|
||||
|
||||
2
vendor/composer/installed.php
vendored
2
vendor/composer/installed.php
vendored
@ -441,7 +441,7 @@
|
||||
'shardj/zf1-future' => array(
|
||||
'pretty_version' => 'dev-master',
|
||||
'version' => 'dev-master',
|
||||
'reference' => '68aaa82251d630b78a97910e6fdd71736a0273a4',
|
||||
'reference' => '9eabd56',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../shardj/zf1-future',
|
||||
'aliases' => array(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user