Merge pull request #16 from nath99/php-8-1-upgrade

nyeholt · web-flow · commit f03e6472ea94 · 2023-03-06T10:36:57.000+11:00
mod (PHP 8.1 support)
diff --git a/src/ElasticaSearchEngine.php b/src/ElasticaSearchEngine.php
@@ -334,7 +334,7 @@ public function getSearchResults($data = null, $form = null, $page = null)
             $results->setPageStart($offset);
 
             if (count($resultSet->toArray())) {
-                $results->setTotalItems($resultSet->totalItems());
+                $results->setTotalItems($resultSet->getTotalItems());
             }
 
             if (!$resultSet->getResults()) {
diff --git a/src/ExtensibleElasticService.php b/src/ExtensibleElasticService.php
@@ -88,7 +88,7 @@ public function getIndexedClasses()
         $classes = array();
         foreach (ClassInfo::subclassesFor('SilverStripe\ORM\DataObject') as $candidate) {
             $candidateInstance = singleton($candidate);
-            if (Extensible::has_extension($candidate, 'Heyday\\Elastica\\Searchable')) {
+            if ($candidateInstance->hasExtension('Heyday\\Elastica\\Searchable')) {
                 $classes[] = $candidate;
             }
         }
diff --git a/src/VersionedReindexTask.php b/src/VersionedReindexTask.php
@@ -88,7 +88,8 @@ public function run($request) {
                             $record->reIndex('Stage');
                         }
 
-                        if (Extensible::has_extension($class, Versioned::class)) {
+                        $classInstance = singleton($class);
+                        if ($classInstance->hasExtension(Versioned::class)) {
                             Versioned::set_stage('Live');
                             $live = Versioned::get_by_stage($class, 'Live');
                             foreach ($live as $liveRecord) {

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ public function getSearchResults($data = null, $form = null, $page = null)`
`334`	`334`	`$results->setPageStart($offset);`
`335`	`335`
`336`	`336`	`if (count($resultSet->toArray())) {`
`337`		`- $results->setTotalItems($resultSet->totalItems());`
	`337`	`+ $results->setTotalItems($resultSet->getTotalItems());`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`if (!$resultSet->getResults()) {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function getIndexedClasses()`
`88`	`88`	`$classes = array();`
`89`	`89`	`foreach (ClassInfo::subclassesFor('SilverStripe\ORM\DataObject') as $candidate) {`
`90`	`90`	`$candidateInstance = singleton($candidate);`
`91`		`- if (Extensible::has_extension($candidate, 'Heyday\\Elastica\\Searchable')) {`
	`91`	`+ if ($candidateInstance->hasExtension('Heyday\\Elastica\\Searchable')) {`
`92`	`92`	`$classes[] = $candidate;`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@ public function run($request) {`
`88`	`88`	`$record->reIndex('Stage');`
`89`	`89`	`}`
`90`	`90`
`91`		`- if (Extensible::has_extension($class, Versioned::class)) {`
	`91`	`+ $classInstance = singleton($class);`
	`92`	`+ if ($classInstance->hasExtension(Versioned::class)) {`
`92`	`93`	`Versioned::set_stage('Live');`
`93`	`94`	`$live = Versioned::get_by_stage($class, 'Live');`
`94`	`95`	`foreach ($live as $liveRecord) {`