Make syntax compatible with older PHP-versions.

gabordemooij · Sep 17, 2022 · ee59fd1 · ee59fd1
1 parent f15116f
commit ee59fd1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/RedBeanPHP/Util/Either.php b/RedBeanPHP/Util/Either.php
@@ -145,7 +145,7 @@ public function index( $key = 0 ) {
 	 *
 	 * @return mixed
 	 */
-	public function or( $value ) {
+	public function _or( $value ) {
 		$reference = (is_null($this->result)) ? $value : $this->result;
 		return $reference;
 	}

diff --git a/testing/RedUNIT/Base/Either.php b/testing/RedUNIT/Base/Either.php
@@ -46,16 +46,16 @@ public function testEitherWithBeans()
 			)
 		)));
 		$book = R::load('book', $id);
-		asrt($book->either()->title->or('nothing'),'Socratic Questions');
+		asrt($book->either()->title->_or('nothing'),'Socratic Questions');
 		$pageId = R::findOne('page')->id;
-		asrt($book->either()->ownPageList->index($pageId)->id->or(0), $pageId);
-		asrt($book->either()->ownPageList->index($pageId+1)->ownTextList->index(1)->or(0), 0);
-		$textId = $book->either()->ownPageList->first()->ownParagraphList->last()->id->or(0);
+		asrt($book->either()->ownPageList->index($pageId)->id->_or(0), $pageId);
+		asrt($book->either()->ownPageList->index($pageId+1)->ownTextList->index(1)->_or(0), 0);
+		$textId = $book->either()->ownPageList->first()->ownParagraphList->last()->id->_or(0);
 		asrt($textId > 0, TRUE);
 		$text = R::load('paragraph', $textId);
-		asrt($text->either()->page->book->title->or('nothing'), 'Socratic Questions');
-		asrt($book->either()->ownPageList->last()->id->or(-1),$pageId);
-		asrt($book->either()->ownPageList->id->or(-1),-1);
-		asrt($book->either()->ownPageList->first()->ownQuoteList->first()->or('?'),'?');
+		asrt($text->either()->page->book->title->_or('nothing'), 'Socratic Questions');
+		asrt($book->either()->ownPageList->last()->id->_or(-1),$pageId);
+		asrt($book->either()->ownPageList->id->_or(-1),-1);
+		asrt($book->either()->ownPageList->first()->ownQuoteList->first()->_or('?'),'?');
 	}
 }