[Pkg-owncloud-commits] [php-sabre-vobject] 95/341: Defaul value is 0, not null.

[David Prévot]

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

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit e05ed251c296f01fb34d1d980493ff631fb0138a
Author: Ivan Enderlin <ivan.enderlin at hoa-project.net>
Date:   Mon Nov 24 18:29:19 2014 +0100

    Defaul value is 0, not null.
---
 lib/Parser/Json.php    | 4 ++--
 lib/Parser/MimeDir.php | 4 ++--
 lib/Parser/Parser.php  | 4 ++--
 lib/Parser/XML.php     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Parser/Json.php b/lib/Parser/Json.php
index b50bb3c..1510e2c 100644
--- a/lib/Parser/Json.php
+++ b/lib/Parser/Json.php
@@ -42,10 +42,10 @@ class Json extends Parser {
      * If either input or options are not supplied, the defaults will be used.
      *
      * @param resource|string|array|null $input
-     * @param int|null $options
+     * @param int $options
      * @return Sabre\VObject\Document
      */
-    public function parse($input = null, $options = null) {
+    public function parse($input = null, $options = 0) {
 
         if (!is_null($input)) {
             $this->setInput($input);
diff --git a/lib/Parser/MimeDir.php b/lib/Parser/MimeDir.php
index 677145a..e09a886 100644
--- a/lib/Parser/MimeDir.php
+++ b/lib/Parser/MimeDir.php
@@ -45,10 +45,10 @@ class MimeDir extends Parser {
      * used.
      *
      * @param string|resource|null $input
-     * @param int|null $options
+     * @param int $options
      * @return Sabre\VObject\Document
      */
-    public function parse($input = null, $options = null) {
+    public function parse($input = null, $options = 0) {
 
         $this->root = null;
         if (!is_null($input)) {
diff --git a/lib/Parser/Parser.php b/lib/Parser/Parser.php
index 0685829..4dcddad 100644
--- a/lib/Parser/Parser.php
+++ b/lib/Parser/Parser.php
@@ -61,10 +61,10 @@ abstract class Parser {
      * If either input or options are not supplied, the defaults will be used.
      *
      * @param mixed $input
-     * @param int|null $options
+     * @param int $options
      * @return array
      */
-    abstract public function parse($input = null, $options = null);
+    abstract public function parse($input = null, $options = 0);
 
     /**
      * Sets the input data.
diff --git a/lib/Parser/XML.php b/lib/Parser/XML.php
index 3e6e106..d8c3163 100644
--- a/lib/Parser/XML.php
+++ b/lib/Parser/XML.php
@@ -47,11 +47,11 @@ class XML extends Parser {
      * Parse xCal or xCard.
      *
      * @param resource|string $input
-     * @param int|null $options
+     * @param int $options
      * @throws \Exception
      * @return Sabre\VObject\Document
      */
-    public function parse ( $input = null, $options = null ) {
+    public function parse ( $input = null, $options = 0 ) {
 
         if(!is_null($input))
             $this->setInput($input);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git