[Pkg-owncloud-commits] [php-sabre-vobject] 316/341: PHP 7 support

[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 5af711b0bf1aa9886854fba78a039aa74b394765
Author: Evert Pot <me at evertpot.com>
Date:   Wed Jul 8 18:06:36 2015 -0400

    PHP 7 support
---
 .travis.yml                                    |  1 -
 lib/Component/VCalendar.php                    | 14 +++++++-------
 lib/Component/VCard.php                        |  4 ++--
 lib/Property/{Float.php => FloatValue.php}     |  2 +-
 lib/Property/{Integer.php => IntegerValue.php} |  2 +-
 tests/VObject/Property/FloatTest.php           |  2 +-
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 56f89f8..6f86578 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ matrix:
   fast_finish: true
   allow_failures:
     - php: hhvm
-    - php: 7
 
 script:
   - phpunit --configuration tests/phpunit.xml
diff --git a/lib/Component/VCalendar.php b/lib/Component/VCalendar.php
index 61938f4..d1cd308 100644
--- a/lib/Component/VCalendar.php
+++ b/lib/Component/VCalendar.php
@@ -57,8 +57,8 @@ class VCalendar extends VObject\Document {
         'DATE'             => 'Sabre\\VObject\\Property\\ICalendar\\Date',
         'DATE-TIME'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
         'DURATION'         => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
-        'FLOAT'            => 'Sabre\\VObject\\Property\\Float',
-        'INTEGER'          => 'Sabre\\VObject\\Property\\Integer',
+        'FLOAT'            => 'Sabre\\VObject\\Property\\FloatValue',
+        'INTEGER'          => 'Sabre\\VObject\\Property\\IntegerValue',
         'PERIOD'           => 'Sabre\\VObject\\Property\\ICalendar\\Period',
         'RECUR'            => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
         'TEXT'             => 'Sabre\\VObject\\Property\\Text',
@@ -86,10 +86,10 @@ class VCalendar extends VObject\Document {
         'CLASS'             => 'Sabre\\VObject\\Property\\FlatText',
         'COMMENT'           => 'Sabre\\VObject\\Property\\FlatText',
         'DESCRIPTION'       => 'Sabre\\VObject\\Property\\FlatText',
-        'GEO'               => 'Sabre\\VObject\\Property\\Float',
+        'GEO'               => 'Sabre\\VObject\\Property\\FloatValue',
         'LOCATION'          => 'Sabre\\VObject\\Property\\FlatText',
-        'PERCENT-COMPLETE'  => 'Sabre\\VObject\\Property\\Integer',
-        'PRIORITY'          => 'Sabre\\VObject\\Property\\Integer',
+        'PERCENT-COMPLETE'  => 'Sabre\\VObject\\Property\\IntegerValue',
+        'PRIORITY'          => 'Sabre\\VObject\\Property\\IntegerValue',
         'RESOURCES'         => 'Sabre\\VObject\\Property\\Text',
         'STATUS'            => 'Sabre\\VObject\\Property\\FlatText',
         'SUMMARY'           => 'Sabre\\VObject\\Property\\FlatText',
@@ -127,14 +127,14 @@ class VCalendar extends VObject\Document {
 
         // Alarm Component Properties
         'ACTION'        => 'Sabre\\VObject\\Property\\FlatText',
-        'REPEAT'        => 'Sabre\\VObject\\Property\\Integer',
+        'REPEAT'        => 'Sabre\\VObject\\Property\\IntegerValue',
         'TRIGGER'       => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
 
         // Change Management Component Properties
         'CREATED'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
         'DTSTAMP'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
         'LAST-MODIFIED' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'SEQUENCE'      => 'Sabre\\VObject\\Property\\Integer',
+        'SEQUENCE'      => 'Sabre\\VObject\\Property\\IntegerValue',
 
         // Request Status
         'REQUEST-STATUS' => 'Sabre\\VObject\\Property\\Text',
diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php
index 87baaa3..1b651f3 100644
--- a/lib/Component/VCard.php
+++ b/lib/Component/VCard.php
@@ -45,8 +45,8 @@ class VCard extends VObject\Document {
         'DATE'             => 'Sabre\\VObject\\Property\\VCard\\Date',
         'DATE-TIME'        => 'Sabre\\VObject\\Property\\VCard\\DateTime',
         'DATE-AND-OR-TIME' => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime', // vCard only
-        'FLOAT'            => 'Sabre\\VObject\\Property\\Float',
-        'INTEGER'          => 'Sabre\\VObject\\Property\\Integer',
+        'FLOAT'            => 'Sabre\\VObject\\Property\\FloatValue',
+        'INTEGER'          => 'Sabre\\VObject\\Property\\IntegerValue',
         'LANGUAGE-TAG'     => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
         'TIMESTAMP'        => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
         'TEXT'             => 'Sabre\\VObject\\Property\\Text',
diff --git a/lib/Property/Float.php b/lib/Property/FloatValue.php
similarity index 98%
rename from lib/Property/Float.php
rename to lib/Property/FloatValue.php
index 3d8ad0b..6d544f4 100644
--- a/lib/Property/Float.php
+++ b/lib/Property/FloatValue.php
@@ -15,7 +15,7 @@ use Sabre\Xml;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Float extends Property {
+class FloatValue extends Property {
 
     /**
      * In case this is a multi-value property. This string will be used as a
diff --git a/lib/Property/Integer.php b/lib/Property/IntegerValue.php
similarity index 97%
rename from lib/Property/Integer.php
rename to lib/Property/IntegerValue.php
index 459040f..294d443 100644
--- a/lib/Property/Integer.php
+++ b/lib/Property/IntegerValue.php
@@ -15,7 +15,7 @@ use
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Integer extends Property {
+class IntegerValue extends Property {
 
     /**
      * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
diff --git a/tests/VObject/Property/FloatTest.php b/tests/VObject/Property/FloatTest.php
index 7a9918a..f463651 100644
--- a/tests/VObject/Property/FloatTest.php
+++ b/tests/VObject/Property/FloatTest.php
@@ -13,7 +13,7 @@ class FloatTest extends \PHPUnit_Framework_TestCase {
 
         $result = $mimeDir->parse($input);
 
-        $this->assertInstanceOf('Sabre\VObject\Property\Float', $result->{'X-FLOAT'});
+        $this->assertInstanceOf('Sabre\VObject\Property\FloatValue', $result->{'X-FLOAT'});
 
         $this->assertEquals([
             0.234,

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