Merge pull request #80 from Yoast/stories/handle-acf-downgrade

Get ACF version in reliable manner.

Author: kraftner

.travis.yml

@@ -9,18 +9,11 @@ branches:
     - /^release\/\d+\.\d+(\.\d+)?(-\S*)?$/
     - /^hotfix\/\d+\.\d+(\.\d+)?(-\S*)?$/
 
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
-
 jobs:
   fast_finish: true
   include:
     - php: 7.1
-      env: WP_VERSION=4.8 WP_MULTISITE=1 PHPLINT=1 PHPCS=1 CHECKJS=1 PHPUNIT=1 TRAVIS_NODE_VERSION=node CXX=g++-4.8
+      env: WP_VERSION=4.8 WP_MULTISITE=1 PHPLINT=1 PHPCS=1 CHECKJS=1 PHPUNIT=1 TRAVIS_NODE_VERSION=node
     - php: 5.2
       # As 'trusty' is not supporting PHP 5.2/5.3 anymore, we need to force using 'precise'.
       dist: precise

inc/class-ac-yoast-seo-acf-content-analysis.php

@@ -80,7 +80,14 @@ public function boot() {
 	 * Boots the plugin for dev environment.
 	 */
 	public function boot_dev() {
-		$version = ( -1 === version_compare( get_option( 'acf_version' ), 5 ) ) ? '4' : '5';
+		$registry = Yoast_ACF_Analysis_Facade::get_registry();
+		$configuration = $registry->get( 'config' );
+
+		$version = 4;
+		if ( version_compare( $configuration->get_acf_version(), 5, '>=' ) ) {
+			$version = 5;
+		}
+
 		require_once AC_SEO_ACF_ANALYSIS_PLUGIN_PATH . '/tests/js/system/data/acf' . $version . '.php';
 	}
 

inc/configuration/class-yoast-acf-analysis-configuration.php

@@ -48,7 +48,13 @@ public function __construct(
 	 * @return string The ACF version.
 	 */
 	public function get_acf_version() {
-		return get_option( 'acf_version' );
+		// ACF 5 introduces `acf_get_setting`, so this might not always be available.
+		if ( function_exists( 'acf_get_setting' ) ) {
+			return acf_get_setting( 'version' );
+		}
+
+		// Fall back on filter use.
+		return apply_filters( 'acf/get_info', 'version' );
 	}
 
 	/**

tests/php/unit/Configuration/ConfigurationTest.php

@@ -3,8 +3,8 @@
 namespace Yoast\AcfAnalysis\Tests\Configuration;
 
 use Brain\Monkey;
-use Brain\Monkey\Functions;
 use Brain\Monkey\Filters;
+use Brain\Monkey\Functions;
 
 class ConfigurationTest extends \PHPUnit_Framework_TestCase {
 
@@ -15,13 +15,6 @@ protected function setUp() {
 
 	public function testEmpty() {
 
-		$version = '4.0.0';
-
-		Functions\expect( 'get_option' )
-			->once()
-			->with( 'acf_version' )
-			->andReturn( $version );
-
 		$configuration = new \Yoast_ACF_Analysis_Configuration(
 			new \Yoast_ACF_Analysis_String_Store(),
 			new \Yoast_ACF_Analysis_String_Store(),
@@ -31,7 +24,7 @@ public function testEmpty() {
 		$this->assertSame(
 			[
 				'pluginName'     => \Yoast_ACF_Analysis_Facade::get_plugin_name(),
-				'acfVersion'     => $version,
+				'acfVersion'     => 'version',
 				'scraper'        => [],
 				'refreshRate'    => 1000,
 				'blacklistType'  => [],
@@ -42,6 +35,21 @@ public function testEmpty() {
 			$configuration->to_array()
 		);
 
+		$this->assertEquals( Filters\applied( 'acf/get_info' ), 1 );
+	}
+
+	public function testACF5VersionFunction() {
+		$acf_version = '5.0.0';
+		Functions\when( 'acf_get_setting' )->justReturn( $acf_version );
+
+		$configuration = new \Yoast_ACF_Analysis_Configuration(
+			new \Yoast_ACF_Analysis_String_Store(),
+			new \Yoast_ACF_Analysis_String_Store(),
+			new \Yoast_ACF_Analysis_String_Store()
+		);
+		$config        = $configuration->to_array();
+
+		$this->assertEquals( $acf_version, $config['acfVersion'] );
 	}
 
 	public function testBlacklistTypeFilter() {
@@ -180,8 +188,8 @@ public function testBlacklistNameFilterInvalid() {
 		$this->assertSame( $store, $configuration->get_blacklist_name() );
 	}
 
-	public function testScraperConfigFilter(){
-		$config = array();
+	public function testScraperConfigFilter() {
+		$config    = array();
 		$blacklist = new \Yoast_ACF_Analysis_String_Store();
 
 		$configuration = new \Yoast_ACF_Analysis_Configuration(
@@ -198,7 +206,7 @@ public function testScraperConfigFilter(){
 		$this->assertSame( $config, $configuration->get_scraper_config() );
 	}
 
-	public function testInvalidScraperConfigFilter(){
+	public function testInvalidScraperConfigFilter() {
 		$blacklist = new \Yoast_ACF_Analysis_String_Store();
 
 		$configuration = new \Yoast_ACF_Analysis_Configuration(
@@ -245,8 +253,8 @@ public function testRefreshRateMinimumValueFilter() {
 		$this->assertSame( 200, $configuration->get_refresh_rate() );
 	}
 
-	public function testFieldSelectorsFilter(){
-		$custom_store = new \Yoast_ACF_Analysis_String_Store();
+	public function testFieldSelectorsFilter() {
+		$custom_store   = new \Yoast_ACF_Analysis_String_Store();
 		$field_selector = new \Yoast_ACF_Analysis_String_Store();
 
 		$configuration = new \Yoast_ACF_Analysis_Configuration(

tests/php/unit/MainTest.php

@@ -3,7 +3,6 @@
 namespace Yoast\AcfAnalysis\Tests;
 
 use Brain\Monkey;
-use Brain\Monkey\Functions;
 
 class MainTest extends \PHPUnit_Framework_TestCase {
 
@@ -13,7 +12,6 @@ protected function setUp() {
 	}
 
 	public function testInvalidConfig() {
-
 		$registry = \Yoast_ACF_Analysis_Facade::get_registry();
 
 		$registry->add( 'config', 'Invalid Config' );
@@ -22,7 +20,7 @@ public function testInvalidConfig() {
 		$testee->boot();
 
 		$this->assertNotSame( 'Invalid Config', $registry->get( 'config' ) );
-		$this->assertInstanceOf('\Yoast_ACF_Analysis_Configuration', $registry->get( 'config' ) );
+		$this->assertInstanceOf( \Yoast_ACF_Analysis_Configuration::class, $registry->get( 'config' ) );
 
 	}