ensured Object to Obj switch for php 7.2+ compatibility

phonetworks · Sep 8, 2018 · e251edd · e251edd
1 parent 108d77c
commit e251edd
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -18,8 +18,7 @@
         "monolog/monolog": "^1.22",
 	    "zendframework/zend-config": "*",
         "pimple/pimple": "^1.1",
-        "phonetworks/pho-lib-graph": "^7.3",
-        "phonetworks/pho-framework": "^10.0",
+        "phonetworks/pho-framework": "^11.0",
         "webmozart/assert": "^1.2",
         "danielstjules/stringy": "^3.0",
         "vlucas/phpdotenv": "^2.4",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,7 +13,7 @@
       <env name="STORAGE_TYPE" value="filesystem" />
       <env name="STORAGE_URI" value="/tmp/pho" />
       <env name="INDEX_TYPE" value="neo4j" />
-      <env name="INDEX_URI" value="bolt://neo4j:password@localhost:7687" />
+      <env name="INDEX_URI" value="bolt://neo4j:password@127.0.0.1:7687" />
     </php>
 
     <testsuites>

diff --git a/src/Pho/Kernel/Acl/README.md b/src/Pho/Kernel/Acl/README.md
@@ -57,5 +57,5 @@ So for example, if this $node was a group (like a Facebook Group), this means:
 |           | Admin            | Read               | Write          | Execute (Subscribe)
 | --------- | ---------------- | ------------------ | -------------- | --------------------
 | Actor     | Manage profile   | See full profile.  | Edit profile   | Follow/become friends (or if friends already, react)
-| Object    | Manage reactions | Read               | Edit           | Subscribe/*react*
+| Obj       | Manage reactions | Read               | Edit           | Subscribe/*react*
 | Graph     | Moderate/profile | Read contents      | Post content   | Subscribe
diff --git a/src/Pho/Kernel/Foundation/AbstractObject.php b/src/Pho/Kernel/Foundation/AbstractObject.php
@@ -6,7 +6,7 @@
 use Pho\Kernel\Kernel;
 use Pho\Kernel\Standards;
 
-abstract class AbstractObject extends Framework\Object implements ParticleInterface {
+abstract class AbstractObject extends Framework\Obj implements ParticleInterface {
 
     use ParticleTrait;
 

diff --git a/src/Pho/Kernel/Foundation/ObjectOut/Mention.php b/src/Pho/Kernel/Foundation/ObjectOut/Mention.php
@@ -5,7 +5,7 @@
 use Pho\Lib\Graph\NodeInterface;
 use Pho\Lib\Graph\PredicateInterface;
 
-class Mention extends \Pho\Framework\ObjectOut\Mention
+class Mention extends \Pho\Framework\ObjOut\Mention
 {
     //use \Pho\Kernel\Traits\Edge\PersistentTrait;
 

diff --git a/src/Pho/Kernel/Foundation/ObjectOut/MentionNotification.php b/src/Pho/Kernel/Foundation/ObjectOut/MentionNotification.php
@@ -2,6 +2,6 @@
 
 namespace Pho\Kernel\Foundation\ObjectOut;
 
-class MentionNotification extends \Pho\Framework\ObjectOut\MentionNotification {
+class MentionNotification extends \Pho\Framework\ObjOut\MentionNotification {
 
 }
diff --git a/src/Pho/Kernel/Foundation/ObjectOut/MentionPredicate.php b/src/Pho/Kernel/Foundation/ObjectOut/MentionPredicate.php
@@ -2,6 +2,6 @@
 
 namespace Pho\Kernel\Foundation\ObjectOut;
 
-class MentionPredicate extends \Pho\Framework\ObjectOut\MentionPredicate {
+class MentionPredicate extends \Pho\Framework\ObjOut\MentionPredicate {
 
 }
diff --git a/tests/Pho/Kernel/Services/Storage/S3Test.php b/tests/Pho/Kernel/Services/Storage/S3Test.php
@@ -16,7 +16,7 @@
 use Pho\Kernel\Services\Storage\Adapters\S3;
 use Pho\Kernel\Services\Storage\Exceptions\InaccessiblePathException;
 
-class FilesystemTest extends TestCase {
+class S3Test extends TestCase {
 
   const BUS_GIF_BASE64 = "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";