The String class is not suported in PHP 7.

Refactor String Class to Str Class to prevent conflict with reserve keys in PHP 7
LearningLocker · Jun 18, 2016 · 0ff5d82 · 0ff5d82
1 parent a239144
commit 0ff5d82
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/src/Account.php b/src/Account.php
@@ -3,7 +3,7 @@
 class Account extends Element {
   protected $props = [
     'homePage' => 'Locker\XApi\IRI',
-    'name' => 'Locker\XApi\String',
+    'name' => 'Locker\XApi\Str',
   ];
   protected $required_props = ['homePage', 'name'];
 }
diff --git a/src/Agent.php b/src/Agent.php
@@ -6,7 +6,7 @@ class Agent extends Element {
   use TypedElement;
 
   protected $props = [
-    'name' => 'Locker\XApi\String',
+    'name' => 'Locker\XApi\Str',
     'mbox' => 'Locker\XApi\Mailto',
     'mbox_sha1sum' => 'Locker\XApi\Sha1',
     'openid' => 'Locker\XApi\IRI',

diff --git a/src/Attachment.php b/src/Attachment.php
@@ -7,7 +7,7 @@ class Attachment extends Element {
     'description' => 'Locker\XApi\LanguageMap',
     'contentType' => 'Locker\XApi\IMT',
     'length' => 'Locker\XApi\Integer',
-    'sha2' => 'Locker\XApi\String',
+    'sha2' => 'Locker\XApi\Str',
     'fileUrl' => 'Locker\XApi\IRI'
   ];
   protected $required_props = ['usageType', 'display', 'contentType', 'length', 'sha2'];

diff --git a/src/Context.php b/src/Context.php
@@ -6,8 +6,8 @@ class Context extends Element {
     'instructor' => 'Locker\XApi\Actor',
     'team' => 'Locker\XApi\Group',
     'contextActivities' => 'Locker\XApi\ContextActivities',
-    'revision' => 'Locker\XApi\String',
-    'platform' => 'Locker\XApi\String',
+    'revision' => 'Locker\XApi\Str',
+    'platform' => 'Locker\XApi\Str',
     'language' => 'Locker\XApi\Language',
     'statement' => 'Locker\XApi\StatementRef',
     'extensions' => 'Locker\XApi\Extensions'

diff --git a/src/InteractionComponent.php b/src/InteractionComponent.php
@@ -2,7 +2,7 @@
 
 class InteractionComponent extends Element {
   protected $props = [
-    'id' => 'Locker\XApi\String',
+    'id' => 'Locker\XApi\Str',
     'description' => 'Locker\XApi\LanguageMap'
   ];
 }
diff --git a/src/LanguageMap.php b/src/LanguageMap.php
@@ -11,7 +11,7 @@ public function validate() {
       $errors = array_merge($errors, (new Language($set_prop))->validate());
       $errors = array_merge($errors, array_map(function ($error) use ($set_prop) {
         return $error->addTrace($set_prop);
-      }, (new String($this->value->{$set_prop}))->validate()));
+      }, (new Str($this->value->{$set_prop}))->validate()));
     }
     return array_merge($errors, parent::validate());
   }

diff --git a/src/ObjectDefinition.php b/src/ObjectDefinition.php
@@ -3,7 +3,7 @@
 class ObjectDefinition extends Definition {
   protected $props = [
     'interactionType' => 'Locker\XApi\InteractionType',
-    'correctResponsesPattern' => 'Locker\XApi\Strings',
+    'correctResponsesPattern' => 'Locker\XApi\Strs',
     'choices' => 'Locker\XApi\InteractionComponents',
     'scale' => 'Locker\XApi\InteractionComponents',
     'source' => 'Locker\XApi\InteractionComponents',

diff --git a/src/Result.php b/src/Result.php
@@ -5,7 +5,7 @@ class Result extends Element {
     'score' => 'Locker\XApi\Score',
     'success' => 'Locker\XApi\Boolean',
     'completion' => 'Locker\XApi\Boolean',
-    'response' => 'Locker\XApi\String',
+    'response' => 'Locker\XApi\Str',
     'duration' => 'Locker\XApi\Duration',
     'extensions' => 'Locker\XApi\Extensions',
   ];

diff --git a/src/String.php → src/Str.php b/src/String.php → src/Str.php
@@ -1,5 +1,5 @@
 <?php namespace Locker\XApi;
 
-class String extends TypedAtom {
+class Str extends TypedAtom {
   protected static $expected_types = ['string'];
 }
diff --git a/src/Strings.php b/src/Strings.php
@@ -1,5 +1,5 @@
 <?php namespace Locker\XApi;
 
 class Strings extends Collection {
-  protected $member_type = 'Locker\XApi\String';
+  protected $member_type = 'Locker\XApi\Str';
 }