[Pkg-nagios-changes] [pkg-icinga-web] 02/03: Add patches 21_php7_doctrine and 22_php7_session for PHP 7

[Markus Frosch (old DM Account)]

This is an automated email from the git hooks/post-receive script.

lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga-web.

commit 37c5f29c2dd58327b137307bbda22c2bc1d8bf5b
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Mon Jul 18 15:44:36 2016 +0200

    Add patches 21_php7_doctrine and 22_php7_session for PHP 7
---
 debian/patches/21_php7_doctrine | 49 ++++++++++++++++++++++++++++++++++++++
 debian/patches/22_php7_session  | 52 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  2 ++
 3 files changed, 103 insertions(+)

diff --git a/debian/patches/21_php7_doctrine b/debian/patches/21_php7_doctrine
new file mode 100644
index 0000000..62e425c
--- /dev/null
+++ b/debian/patches/21_php7_doctrine
@@ -0,0 +1,49 @@
+From e8dfebb9c9a6201413df0fccb6707d0a7453483d Mon Sep 17 00:00:00 2001
+From: Marius Hein <marius.hein at netways.de>
+Date: Fri, 8 Jan 2016 10:01:41 +0100
+Subject: [PATCH] Doctrine compatibillity with php 7
+
+fixes #10252
+---
+ lib/doctrine/lib/Doctrine/Collection.php     |    4 ++--
+ lib/doctrine/lib/Doctrine/Query/Abstract.php |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/doctrine/lib/Doctrine/Collection.php b/lib/doctrine/lib/Doctrine/Collection.php
+index 4f82c58..951097e 100644
+--- a/lib/doctrine/lib/Doctrine/Collection.php
++++ b/lib/doctrine/lib/Doctrine/Collection.php
+@@ -460,7 +460,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
+             $relations = $this->relation['table']->getRelations();
+             foreach ($relations as $relation) {
+                 if ($this->relation['class'] == $relation['localTable']->getOption('name') && $relation->getLocal() == $this->relation->getForeignFieldName()) {
+-                    $record->$relation['alias'] = $this->reference;
++                    $record->{$relation['alias']} = $this->reference;
+                     break;
+                 }
+             }
+@@ -1067,4 +1067,4 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
+         } 
+         return $dirty; 
+     }
+-}
+\ No newline at end of file
++}
+diff --git a/lib/doctrine/lib/Doctrine/Query/Abstract.php b/lib/doctrine/lib/Doctrine/Query/Abstract.php
+index 26a0b61..8f6d833 100644
+--- a/lib/doctrine/lib/Doctrine/Query/Abstract.php
++++ b/lib/doctrine/lib/Doctrine/Query/Abstract.php
+@@ -1111,8 +1111,8 @@ abstract class Doctrine_Query_Abstract
+                 $params = array('component' => $component, 'alias' => $alias);
+                 $event = new Doctrine_Event($record, $callback['const'], $this, $params);
+ 
+-                $record->$callback['callback']($event);
+-                $table->getRecordListener()->$callback['callback']($event);
++                $record->{$callback['callback']}($event);
++                $table->getRecordListener()->{$callback['callback']}($event);
+             }
+         }
+ 
+-- 
+1.7.10.4
+
diff --git a/debian/patches/22_php7_session b/debian/patches/22_php7_session
new file mode 100644
index 0000000..e5b280e
--- /dev/null
+++ b/debian/patches/22_php7_session
@@ -0,0 +1,52 @@
+Description: Fix problems with session_set_handler interfaces in PHP 7
+Author: Markus Frosch <lazyfrosch at debian.org>
+Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
+Last-Update: 2016-07-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/app/modules/AppKit/lib/storage/AppKitDoctrineSessionStorage.class.php
++++ b/app/modules/AppKit/lib/storage/AppKitDoctrineSessionStorage.class.php
+@@ -53,7 +53,7 @@
+ 
+     public function sessionClose() {
+         // Hm, the same as sessionOpen?!
+-
++        return true;
+     }
+ 
+     /**
+@@ -116,6 +116,7 @@
+      */
+     public function sessionOpen($path, $name) {
+         // Hm should we do anything here?
++        return true;
+     }
+ 
+     /**
+@@ -169,7 +170,7 @@
+      * @param string $id
+      * @param mixed $data
+      */
+-    public function sessionWrite($id, &$data) {
++    public function sessionWrite($id, $data) {
+         $max = ini_get('session.gc_maxlifetime');
+         $update = false;
+ 
+@@ -185,7 +186,7 @@
+         }
+ 
+         if (! $update && $this->NsmSession->session_checksum === $m) {
+-            return;
++            return true;
+         }
+ 
+         AppKitLogger::verbose("Writing new session information (checksum=%s)", $m);
+@@ -199,6 +200,8 @@
+         AppKitLogger::debug("Write session update: %s", $id);
+ 
+         AppKitLogger::verbose("Writing new session information successful");
++
++        return true;
+     }
+ 
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 7d8371c..3111ee7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@
 02_docs_urls
 03_access_include
 11_lintian_confusion
+21_php7_doctrine
+22_php7_session

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga-web.git