@automattic/newspack-blocks 1.69.0 → 1.70.0

package/includes/class-newspack-blocks.php

@@ -202,6 +202,49 @@ class Newspack_Blocks {
 		}
 	}
 
+	/**
+	 * Gets the list of custom taxonomies that will be available for filtering in the blocks
+	 *
+	 * @return array Array of custom taxonomies where each taxonomy is an array with slug and label keys.
+	 */
+	public static function get_custom_taxonomies() {
+		$custom_taxonomies = array_map(
+			function( $tax ) {
+				if ( ! empty( array_intersect( [ 'post', 'page' ], $tax->object_type ) ) ) {
+					return [
+						'slug'  => $tax->name,
+						'label' => $tax->label,
+					];
+				};
+			},
+			get_taxonomies(
+				[
+					'public'       => true,
+					'_builtin'     => false,
+					'show_in_rest' => true,
+				],
+				'objects'
+			)
+		);
+		$custom_taxonomies = array_values(
+			array_filter(
+				$custom_taxonomies,
+				function( $tax ) {
+					return ! empty( $tax );
+				}
+			)
+		);
+
+		/**
+		 * Filters the custom taxonomies that will be available in the Home Page block.
+		 *
+		 * By default, on the top of category and tags, will display any public taxonomy applied to post or pages
+		 *
+		 * @param array $custom_taxonomies Array of custom taxonomies where each taxonomy is an array with slug and label keys.
+		 */
+		return apply_filters( 'newspack_blocks_home_page_block_custom_taxonomies', $custom_taxonomies );
+	}
+
 	/**
 	 * Enqueue block scripts and styles for editor.
 	 */
@@ -230,6 +273,7 @@ class Newspack_Blocks {
 				'supports_recaptcha'               => class_exists( 'Newspack\Recaptcha' ),
 				'has_recaptcha'                    => class_exists( 'Newspack\Recaptcha' ) && \Newspack\Recaptcha::can_use_captcha(),
 				'recaptcha_url'                    => admin_url( 'admin.php?page=newspack-connections-wizard' ),
+				'custom_taxonomies'                => self::get_custom_taxonomies(),
 			];
 
 			if ( class_exists( 'WP_REST_Newspack_Author_List_Controller' ) ) {
@@ -242,10 +286,6 @@ class Newspack_Blocks {
 				$localized_data['author_custom_fields'] = \Newspack\Authors_Custom_Fields::get_custom_fields();
 			}
 
-			if ( class_exists( 'Newspack_Multibranded_Site\Customizations\Theme_Colors' ) ) {
-				$localized_data['multibranded_sites_enabled'] = true;
-			}
-
 			wp_localize_script(
 				'newspack-blocks-editor',
 				'newspack_blocks_data',
@@ -591,7 +631,7 @@ class Newspack_Blocks {
 		$authors             = isset( $attributes['authors'] ) ? $attributes['authors'] : array();
 		$categories          = isset( $attributes['categories'] ) ? $attributes['categories'] : array();
 		$tags                = isset( $attributes['tags'] ) ? $attributes['tags'] : array();
-		$brands              = isset( $attributes['brands'] ) ? $attributes['brands'] : array();
+		$custom_taxonomies   = isset( $attributes['customTaxonomies'] ) ? $attributes['customTaxonomies'] : array();
 		$tag_exclusions      = isset( $attributes['tagExclusions'] ) ? $attributes['tagExclusions'] : array();
 		$category_exclusions = isset( $attributes['categoryExclusions'] ) ? $attributes['categoryExclusions'] : array();
 		$specific_posts      = isset( $attributes['specificPosts'] ) ? $attributes['specificPosts'] : array();
@@ -637,18 +677,19 @@ class Newspack_Blocks {
 			if ( $category_exclusions && count( $category_exclusions ) ) {
 				$args['category__not_in'] = $category_exclusions;
 			}
-			if ( class_exists( 'Newspack_Multibranded_Site\Customizations\Theme_Colors' ) ) {
-				if ( $brands && count( $brands ) ) {
-					$args['tax_query'] = [ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query
-						[
-							'taxonomy'         => 'brand',
+			if ( ! empty( $custom_taxonomies ) ) {
+				foreach ( $custom_taxonomies as $taxonomy ) {
+					if ( ! empty( $taxonomy['slug'] ) && ! empty( $taxonomy['terms'] ) ) {
+						$args['tax_query'][] = [
+							'taxonomy'         => $taxonomy['slug'],
 							'field'            => 'term_id',
-							'terms'            => $brands,
+							'terms'            => $taxonomy['terms'],
 							'include_children' => false,
-						],
-					];
+						];
+					}
 				}
 			}
+
 			$is_co_authors_plus_active = class_exists( 'CoAuthors_Guest_Authors' );
 
 			if ( $authors && count( $authors ) ) {
@@ -804,11 +845,11 @@ class Newspack_Blocks {
 			}
 		}
 
-		if ( class_exists( 'Newspack_Multibranded_Site\Customizations\Theme_Colors' ) ) {
-			$brands = get_the_terms( $post_id, 'brand' );
-			if ( ! empty( $brands ) ) {
-				foreach ( $brands as $brand ) {
-					$classes[] = 'brands-' . $brand->slug;
+		foreach ( self::get_custom_taxonomies() as $tax ) {
+			$terms = get_the_terms( $post_id, $tax['slug'] );
+			if ( ! empty( $terms ) ) {
+				foreach ( $terms as $term ) {
+					$classes[] = $term->taxonomy . '-' . $term->slug;
 				}
 			}
 		}

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.blog/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         1.69.0
+ * Version:         1.70.0
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '1.69.0' );
+define( 'NEWSPACK_BLOCKS__VERSION', '1.70.0' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,26 +1,26 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "1.69.0",
+	"version": "1.70.0",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.3.0",
 		"@testing-library/dom": "^8.20.0",
 		"@testing-library/user-event": "^14.4.3",
-		"@types/lodash": "^4.14.194",
+		"@types/lodash": "^4.14.195",
 		"@types/lodash.debounce": "^4.0.7",
 		"eslint": "^7.32.0",
 		"fetch-mock-jest": "^1.5.1",
-		"html-entities": "^2.3.3",
+		"html-entities": "^2.3.4",
 		"identity-obj-proxy": "^3.0.0",
 		"lint-staged": "^13.2.2",
 		"newspack-scripts": "^5.1.0",
 		"postcss-scss": "^4.0.6",
 		"prettier": "npm:wp-prettier@^2.6.2-beta-1",
-		"stylelint": "^15.6.2"
+		"stylelint": "^15.6.3"
 	},
 	"description": "=== Newspack Blocks === Contributors: (this should be a list of wordpress.org userid's) Donate link: https://example.com/ Tags: comments, spam Requires at least: 4.5 Tested up to: 5.1.1 Stable tag: 0.1.0 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html",
 	"dependencies": {
-		"@stripe/stripe-js": "^1.53.0",
+		"@stripe/stripe-js": "^1.54.0",
 		"classnames": "^2.3.2",
 		"lodash": "^4.17.21",
 		"newspack-components": "^2.1.0",

package/src/blocks/carousel/edit.js

@@ -48,16 +48,6 @@ import { postsBlockSelector, postsBlockDispatch, shouldReflow } from '../homepag
 // Max number of slides that can be shown at once.
 const MAX_NUMBER_OF_SLIDES = 6;
 
-// Check if multi-branded site
-let IS_MULTIBRANDED_SITE;
-if (
-	typeof window === 'object' &&
-	window.newspack_blocks_data &&
-	window.newspack_blocks_data.multibranded_sites_enabled
-) {
-	IS_MULTIBRANDED_SITE = true;
-}
-
 class Edit extends Component {
 	constructor( props ) {
 		super( props );
@@ -160,7 +150,7 @@ class Edit extends Component {
 			authors,
 			autoplay,
 			categories,
-			brands,
+			customTaxonomies,
 			delay,
 			hideControls,
 			imageFit,
@@ -244,13 +234,6 @@ class Edit extends Component {
 			},
 		];
 
-		const brandProps = IS_MULTIBRANDED_SITE
-			? {
-					brands,
-					onBrandsChange: value => setAttributes( { brands: value } ),
-			  }
-			: '';
-
 		return (
 			<Fragment>
 				<div className={ classes } ref={ this.carouselRef }>
@@ -393,7 +376,8 @@ class Edit extends Component {
 								onCategoriesChange={ value => setAttributes( { categories: value } ) }
 								tags={ tags }
 								onTagsChange={ value => setAttributes( { tags: value } ) }
-								{ ...brandProps }
+								onCustomTaxonomiesChange={ value => setAttributes( { customTaxonomies: value } ) }
+								customTaxonomies={ customTaxonomies }
 								specificMode={ specificMode }
 								onSpecificModeChange={ _specificMode =>
 									setAttributes( { specificMode: _specificMode } )

package/src/blocks/carousel/index.js

@@ -67,7 +67,7 @@ export const settings = {
 		tags: {
 			type: 'array',
 		},
-		brands: {
+		customTaxonomies: {
 			type: 'array',
 		},
 		showDate: {

package/src/blocks/carousel/view.php

@@ -382,82 +382,93 @@ function newspack_blocks_register_carousel() {
 			'newspack_blocks_block_args',
 			array(
 				'attributes'      => array(
-					'className'     => array(
+					'className'        => array(
 						'type' => 'string',
 					),
-					'postsToShow'   => array(
+					'postsToShow'      => array(
 						'type'    => 'integer',
 						'default' => 3,
 					),
-					'authors'       => array(
+					'authors'          => array(
 						'type'    => 'array',
 						'default' => array(),
 						'items'   => array(
 							'type' => 'integer',
 						),
 					),
-					'categories'    => array(
+					'categories'       => array(
 						'type'    => 'array',
 						'default' => array(),
 						'items'   => array(
 							'type' => 'integer',
 						),
 					),
-					'tags'          => array(
+					'tags'             => array(
 						'type'    => 'array',
 						'default' => array(),
 						'items'   => array(
 							'type' => 'integer',
 						),
 					),
-					'brands'        => array(
+					'customTaxonomies' => array(
 						'type'    => 'array',
 						'default' => array(),
 						'items'   => array(
-							'type' => 'integer',
+							'type'       => 'object',
+							'properties' => array(
+								'slug'  => array(
+									'type' => 'string',
+								),
+								'terms' => array(
+									'type'  => 'array',
+									'items' => array(
+										'type' => 'integer',
+									),
+								),
+							),
 						),
 					),
-					'autoplay'      => array(
+					'autoplay'         => array(
 						'type'    => 'boolean',
 						'default' => false,
 					),
-					'delay'         => array(
+					'delay'            => array(
 						'type'    => 'integer',
 						'default' => 5,
 					),
-					'showAuthor'    => array(
+					'showAuthor'       => array(
 						'type'    => 'boolean',
 						'default' => true,
 					),
-					'showAvatar'    => array(
+					'showAvatar'       => array(
 						'type'    => 'boolean',
 						'default' => true,
 					),
-					'showCategory'  => array(
+					'showCategory'     => array(
 						'type'    => 'boolean',
 						'default' => false,
 					),
-					'showDate'      => array(
+					'showDate'         => array(
 						'type'    => 'boolean',
 						'default' => true,
 					),
-					'imageFit'      => array(
+					'imageFit'         => array(
 						'type'    => 'string',
 						'default' => 'cover',
 					),
-					'showTitle'     => array(
+					'showTitle'        => array(
 						'type'    => 'boolean',
 						'default' => true,
 					),
-					'slidesPerView' => array(
+					'slidesPerView'    => array(
 						'type'    => 'number',
 						'default' => 1,
 					),
-					'hideControls'  => array(
+					'hideControls'     => array(
 						'type'    => 'boolean',
 						'default' => false,
 					),
-					'aspectRatio'   => array(
+					'aspectRatio'      => array(
 						'type'    => 'number',
 						'default' => 0.75,
 					),

package/src/blocks/homepage-articles/block.json

@@ -105,10 +105,23 @@
 			"default": [],
 			"items": { "type": "integer" }
 		},
-		"brands": {
+		"customTaxonomies": {
 			"type": "array",
 			"default": [],
-			"items": { "type": "integer" }
+			"items": {
+				"type": "object",
+				"properties": {
+					"slug": {
+						"type": "string"
+					},
+					"terms": {
+						"type": "array",
+						"items": {
+							"type": "integer"
+						}
+					}
+				}
+			}
 		},
 		"tagExclusions": {
 			"type": "array",

package/src/blocks/homepage-articles/edit.js

@@ -72,15 +72,6 @@ if (
 	IS_SUBTITLE_SUPPORTED_IN_THEME = true;
 }
 
-let IS_MULTIBRANDED_SITE;
-if (
-	typeof window === 'object' &&
-	window.newspack_blocks_data &&
-	window.newspack_blocks_data.multibranded_sites_enabled
-) {
-	IS_MULTIBRANDED_SITE = true;
-}
-
 const landscapeIcon = (
 	<SVG xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
 		<Path
@@ -275,7 +266,7 @@ class Edit extends Component {
 			specificPosts,
 			postsToShow,
 			categories,
-			brands,
+			customTaxonomies,
 			columns,
 			colGap,
 			postType,
@@ -352,13 +343,6 @@ class Edit extends Component {
 
 		const handleAttributeChange = key => value => setAttributes( { [ key ]: value } );
 
-		const brandProps = IS_MULTIBRANDED_SITE
-			? {
-					brands,
-					onBrandsChange: handleAttributeChange( 'brands' ),
-			  }
-			: '';
-
 		return (
 			<Fragment>
 				<PanelBody title={ __( 'Display Settings', 'newspack-blocks' ) } initialOpen={ true }>
@@ -377,7 +361,8 @@ class Edit extends Component {
 						onCategoriesChange={ handleAttributeChange( 'categories' ) }
 						tags={ tags }
 						onTagsChange={ handleAttributeChange( 'tags' ) }
-						{ ...brandProps }
+						onCustomTaxonomiesChange={ handleAttributeChange( 'customTaxonomies' ) }
+						customTaxonomies={ customTaxonomies }
 						tagExclusions={ tagExclusions }
 						onTagExclusionsChange={ handleAttributeChange( 'tagExclusions' ) }
 						categoryExclusions={ categoryExclusions }

package/src/blocks/homepage-articles/utils.ts

@@ -29,7 +29,7 @@ const POST_QUERY_ATTRIBUTES = [
 	'categories',
 	'excerptLength',
 	'tags',
-	'brands',
+	'customTaxonomies',
 	'showExcerpt',
 	'specificPosts',
 	'specificMode',
@@ -47,7 +47,7 @@ type HomepageArticlesAttributes = {
 	postType: PostType[];
 	showExcerpt: boolean;
 	tags: TagId[];
-	brands: BrandId[];
+	customTaxonomies: Taxonomy[];
 	specificPosts: string[];
 	specificMode: boolean;
 	tagExclusions: TagId[];
@@ -91,7 +91,7 @@ export const queryCriteriaFromAttributes = ( attributes: Block[ 'attributes' ] )
 		postType,
 		showExcerpt,
 		tags,
-		brands,
+		customTaxonomies,
 		specificPosts = [],
 		specificMode,
 		tagExclusions,
@@ -115,7 +115,7 @@ export const queryCriteriaFromAttributes = ( attributes: Block[ 'attributes' ] )
 					tags,
 					tagExclusions,
 					categoryExclusions,
-					brands,
+					customTaxonomies,
 					postType,
 					includedPostStatuses,
 			  },

package/src/blocks/homepage-articles/view.php

@@ -139,6 +139,20 @@ function newspack_blocks_render_block_homepage_articles( $attributes ) {
 	if ( '' !== $attributes['customTextColor'] ) {
 		$styles = 'color: ' . $attributes['customTextColor'] . ';';
 	}
+
+	// Handle custom taxonomies.
+	if ( isset( $attributes['customTaxonomies'] ) ) {
+		$custom_taxes = $attributes['customTaxonomies'];
+		unset( $attributes['customTaxonomies'] );
+		if ( is_array( $custom_taxes ) && ! empty( $custom_taxes ) ) {
+			foreach ( $custom_taxes as $tax ) {
+				if ( ! empty( $tax['slug'] ) && ! empty( $tax['terms'] ) ) {
+					$attributes[ $tax['slug'] ] = $tax['terms'];
+				}
+			}
+		}
+	}
+
 	$articles_rest_url = add_query_arg(
 		array_merge(
 			array_map(

package/src/components/query-controls.js

@@ -16,8 +16,7 @@ import AutocompleteTokenField from './autocomplete-tokenfield';
 const getCategoryTitle = category =>
 	decodeEntities( category.name ) || __( '(no title)', 'newspack-blocks' );
 
-const getBrandTitle = brand =>
-	decodeEntities( brand.name ) || __( '(no title)', 'newspack-blocks' );
+const getTermTitle = term => decodeEntities( term.name ) || __( '(no title)', 'newspack-blocks' );
 
 class QueryControls extends Component {
 	state = {
@@ -169,47 +168,47 @@ class QueryControls extends Component {
 		} );
 	};
 
-	fetchBrandSuggestions = search => {
+	fetchCustomTaxonomiesSuggestions = ( taxSlug, search ) => {
 		return apiFetch( {
-			path: addQueryArgs( '/wp/v2/brand', {
+			path: addQueryArgs( `/wp/v2/${ taxSlug }`, {
 				search,
 				per_page: 20,
 				_fields: 'id,name,parent',
 				orderby: 'count',
 				order: 'desc',
 			} ),
-		} ).then( brands =>
+		} ).then( terms =>
 			Promise.all(
-				brands.map( brand => {
-					if ( brand.parent > 0 ) {
+				terms.map( term => {
+					if ( term.parent > 0 ) {
 						return apiFetch( {
-							path: addQueryArgs( `/wp/v2/brand/${ brand.parent }`, {
+							path: addQueryArgs( `/wp/v2/${ taxSlug }/${ term.parent }`, {
 								_fields: 'name',
 							} ),
-						} ).then( parentBrand => ( {
-							value: brand.id,
-							label: `${ getBrandTitle( brand ) } – ${ getBrandTitle( parentBrand ) }`,
+						} ).then( parentTerm => ( {
+							value: term.id,
+							label: `${ getTermTitle( term ) } – ${ getTermTitle( parentTerm ) }`,
 						} ) );
 					}
 					return Promise.resolve( {
-						value: brand.id,
-						label: getBrandTitle( brand ),
+						value: term.id,
+						label: getTermTitle( term ),
 					} );
 				} )
 			)
 		);
 	};
-	fetchSavedBrands = brandIDs => {
+	fetchSavedCustomTaxonomies = ( taxSlug, termIDs ) => {
 		return apiFetch( {
-			path: addQueryArgs( '/wp/v2/brand', {
+			path: addQueryArgs( `/wp/v2/${ taxSlug }`, {
 				per_page: 100,
 				_fields: 'id,name',
-				include: brandIDs.join( ',' ),
+				include: termIDs.join( ',' ),
 			} ),
-		} ).then( function ( brands ) {
-			return brands.map( brand => ( {
-				value: brand.id,
-				label: decodeEntities( brand.name ) || __( '(no title)', 'newspack-blocks' ),
+		} ).then( function ( terms ) {
+			return terms.map( term => ( {
+				value: term.id,
+				label: decodeEntities( term.name ) || __( '(no title)', 'newspack-blocks' ),
 			} ) );
 		} );
 	};
@@ -226,8 +225,8 @@ class QueryControls extends Component {
 			onCategoriesChange,
 			tags,
 			onTagsChange,
-			brands,
-			onBrandsChange,
+			customTaxonomies,
+			onCustomTaxonomiesChange,
 			tagExclusions,
 			onTagExclusionsChange,
 			categoryExclusions,
@@ -236,6 +235,19 @@ class QueryControls extends Component {
 		} = this.props;
 		const { showAdvancedFilters } = this.state;
 
+		const registeredCustomTaxonomies = window.newspack_blocks_data?.custom_taxonomies;
+
+		const customTaxonomiesPrepareChange = ( taxSlug, value ) => {
+			let newValue = customTaxonomies.filter( tax => tax.slug !== taxSlug );
+			newValue = [ ...newValue, { slug: taxSlug, terms: value } ];
+			onCustomTaxonomiesChange( newValue );
+		};
+
+		const getTermsOfCustomTaxonomy = taxSlug => {
+			const tax = customTaxonomies.find( taxObj => taxObj.slug === taxSlug );
+			return tax ? tax.terms : [];
+		};
+
 		return (
 			<>
 				{ enableSpecific && (
@@ -287,15 +299,21 @@ class QueryControls extends Component {
 								label={ __( 'Tags', 'newspack-blocks' ) }
 							/>
 						) }
-						{ onBrandsChange && (
-							<AutocompleteTokenField
-								tokens={ brands || [] }
-								onChange={ onBrandsChange }
-								fetchSuggestions={ this.fetchBrandSuggestions }
-								fetchSavedInfo={ this.fetchSavedBrands }
-								label={ __( 'Brands', 'newspack-blocks' ) }
-							/>
-						) }
+						{ onCustomTaxonomiesChange &&
+							registeredCustomTaxonomies.map( tax => (
+								<AutocompleteTokenField
+									key={ `${ customTaxonomies[ tax.slug ] }-selector` }
+									tokens={ getTermsOfCustomTaxonomy( tax.slug ) }
+									onChange={ value => {
+										customTaxonomiesPrepareChange( tax.slug, value );
+									} }
+									fetchSuggestions={ search =>
+										this.fetchCustomTaxonomiesSuggestions( tax.slug, search )
+									}
+									fetchSavedInfo={ termIds => this.fetchSavedCustomTaxonomies( tax.slug, termIds ) }
+									label={ tax.label }
+								/>
+							) ) }
 						{ onTagExclusionsChange && (
 							<p>
 								<Button
@@ -343,7 +361,7 @@ QueryControls.defaultProps = {
 	authors: [],
 	categories: [],
 	tags: [],
-	brands: [],
+	customTaxonomies: [],
 	tagExclusions: [],
 };
 

package/src/types/index.d.ts

@@ -28,7 +28,7 @@ declare global {
 	type PostId = number;
 	type CategoryId = number;
 	type TagId = number;
-	type BrandId = number;
+	type Taxonomy = { slug: string, terms: number[] }[];
 	type AuthorId = number;
 
 	type PostType = { name: string; slug: string; supports: { newspack_blocks: boolean } };

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitf29693c46abc4c2490d10d0fd49977ef::getLoader();
+return ComposerAutoloaderInit38e1831bc3238b056046f21415de1ef9::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitf29693c46abc4c2490d10d0fd49977ef
+class ComposerAutoloaderInit38e1831bc3238b056046f21415de1ef9
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInitf29693c46abc4c2490d10d0fd49977ef
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitf29693c46abc4c2490d10d0fd49977ef', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit38e1831bc3238b056046f21415de1ef9', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitf29693c46abc4c2490d10d0fd49977ef', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit38e1831bc3238b056046f21415de1ef9', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitf29693c46abc4c2490d10d0fd49977ef::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit38e1831bc3238b056046f21415de1ef9::getInitializer($loader));
 
         $loader->register(true);