Merge branch 'main' into fix-be-consistent-in-tag-check

openfoodfacts · Jul 23, 2024 · c43455a · c43455a
2 parents f113c83 + 7205277
commit c43455a
Show file tree

Hide file tree

Showing 191 changed files with 176,910 additions and 173,075 deletions.
diff --git a/.gitignore b/.gitignore
@@ -109,3 +109,4 @@ taxonomies/*.all.txt
 
 # Shared services and other dependencies
 /deps
+/deps/*
diff --git a/cgi/auth.pl b/cgi/auth.pl
@@ -37,7 +37,7 @@
 use URI::Escape::XS;
 use Encode;
 use Log::Any qw($log);
-use JSON::PP;
+use JSON::MaybeXS;
 
 $log->info('start') if $log->is_info();
 
@@ -84,7 +84,7 @@
 	};
 }
 
-my $json = JSON::PP->new->allow_nonref->canonical->utf8->encode($response_ref);
+my $json = JSON::MaybeXS->new->allow_nonref->canonical->utf8->encode($response_ref);
 
 # We need to send the header Access-Control-Allow-Credentials=true so that websites
 # such has hunger.openfoodfacts.org that send a query to world.openfoodfacts.org/cgi/auth.pl

diff --git a/cgi/countries.pl b/cgi/countries.pl
@@ -35,7 +35,7 @@
 use CGI qw/:cgi :form escapeHTML/;
 use URI::Escape::XS;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 
 # This script returns a list of countries in the language of the interface in a JSON format
 # it is used to display the dropdown list of countries

diff --git a/cgi/import_file_upload.pl b/cgi/import_file_upload.pl
@@ -43,7 +43,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/import_photos_upload.pl b/cgi/import_photos_upload.pl
@@ -42,7 +42,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/ingredients.pl b/cgi/ingredients.pl
@@ -39,7 +39,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/manifest.pl b/cgi/manifest.pl
@@ -37,7 +37,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 
 my $request_ref = ProductOpener::Display::init_request();
 
@@ -64,7 +64,7 @@
 	start_url => format_subdomain($subdomain),
 	scope => '/',
 	display => 'standalone',
-	prefer_related_applications => $JSON::PP::true,
+	prefer_related_applications => $JSON::MaybeXS::true,
 );
 
 my @keys = qw(theme_color icons related_applications background_color);

diff --git a/cgi/nutrients.pl b/cgi/nutrients.pl
@@ -33,7 +33,7 @@
 
 use Log::Any qw($log);
 use CGI qw/:cgi :form escapeHTML/;
-use JSON::PP;
+use JSON::MaybeXS;
 
 my $request_ref = ProductOpener::Display::init_request();
 
@@ -51,9 +51,9 @@
 	my $nid = $_;    # Copy instead of alias
 
 	$nid =~ /^#/ and next;
-	my $important = ($nid =~ /^!/) ? JSON::PP::true : JSON::PP::false;
+	my $important = ($nid =~ /^!/) ? JSON::MaybeXS::true : JSON::MaybeXS::false;
 	$nid =~ s/!//g;
-	my $default_edit_form = $nid =~ /-$/ ? JSON::PP::false : JSON::PP::true;
+	my $default_edit_form = $nid =~ /-$/ ? JSON::MaybeXS::false : JSON::MaybeXS::true;
 	$nid =~ s/-$//g;
 
 	my $onid = $nid =~ s/^(\-+)//gr;

diff --git a/cgi/nutrition.pl b/cgi/nutrition.pl
@@ -39,7 +39,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/opensearch.pl b/cgi/opensearch.pl
@@ -40,7 +40,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 
 use ProductOpener::Lang qw/$lc lang/;
 

diff --git a/cgi/packaging.pl b/cgi/packaging.pl
@@ -39,7 +39,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/product_image.pl b/cgi/product_image.pl
@@ -40,7 +40,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/product_image_crop.pl b/cgi/product_image_crop.pl
@@ -38,7 +38,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/product_image_move.pl b/cgi/product_image_move.pl
@@ -38,7 +38,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $type = single_param('type') || 'add';

diff --git a/cgi/product_image_unselect.pl b/cgi/product_image_unselect.pl
@@ -37,7 +37,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/product_image_upload.pl b/cgi/product_image_upload.pl
@@ -42,7 +42,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $type = single_param('type') || 'add';

diff --git a/cgi/product_jqm_multilingual.pl b/cgi/product_jqm_multilingual.pl
@@ -66,7 +66,7 @@ =head1 DESCRIPTION
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/product_multilingual.pl b/cgi/product_multilingual.pl
@@ -64,7 +64,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 use File::Copy qw(move);
 use Data::Dumper;

diff --git a/cgi/recent_changes.pl b/cgi/recent_changes.pl
@@ -38,7 +38,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 
 use ProductOpener::Lang qw/:all/;
 

diff --git a/cgi/search.pl b/cgi/search.pl
@@ -44,7 +44,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/session.pl b/cgi/session.pl
@@ -36,7 +36,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Log::Any qw($log);
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/sso.pl b/cgi/sso.pl
@@ -33,7 +33,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 
 use ProductOpener::Lang qw/:all/;
 

diff --git a/cgi/sugar_check.pl b/cgi/sugar_check.pl
@@ -25,7 +25,7 @@
 use CGI::Carp qw(fatalsToBrowser);
 use CGI qw/:cgi :form escapeHTML/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Digest::SHA1 qw(sha1_hex);
 
 use ProductOpener::Display qw/single_param/;

diff --git a/cgi/sugar_random.pl b/cgi/sugar_random.pl
@@ -25,7 +25,7 @@
 use CGI::Carp qw(fatalsToBrowser);
 use CGI qw/:cgi :form escapeHTML/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Storable qw(lock_store lock_nstore lock_retrieve);
 use Apache2::RequestRec ();
 use Apache2::Const ();

diff --git a/cgi/suggest.pl b/cgi/suggest.pl
@@ -34,7 +34,7 @@
 use CGI qw/:cgi :form escapeHTML/;
 use URI::Escape::XS;
 use Storable qw/dclone/;
-use JSON::PP;
+use JSON::MaybeXS;
 use Encode;
 
 my $request_ref = ProductOpener::Display::init_request();

diff --git a/cgi/test_ingredients_analysis.pl b/cgi/test_ingredients_analysis.pl
@@ -39,7 +39,7 @@
 use URI::Escape::XS;
 use Storable qw/dclone/;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 
 use Log::Any qw($log);
 
@@ -83,7 +83,7 @@
 	$template_data_ref->{product_ref} = $product_ref;
 	$template_data_ref->{preparsed_ingredients_text} = preparse_ingredients_text($lc, $ingredients_text);
 
-	my $json = JSON::PP->new->pretty->encode($product_ref->{ingredients});
+	my $json = JSON::MaybeXS->new->pretty->encode($product_ref->{ingredients});
 	$template_data_ref->{json} = $json;
 }
 

diff --git a/cgi/translate_taxonomy.pl b/cgi/translate_taxonomy.pl
@@ -35,7 +35,7 @@
 use Encode;
 use CGI qw/:cgi :form escapeHTML/;
 use Log::Any qw($log);
-use JSON::PP;
+use JSON::MaybeXS;
 
 my $request_ref = ProductOpener::Display::init_request();
 

diff --git a/cpanfile b/cpanfile
@@ -129,6 +129,7 @@ on 'test' => sub {
   requires 'Test::File::Contents';
   requires 'FindBin';
   requires 'Test::Pod';
+  requires 'UUID';
 };
 
 on 'develop' => sub {

diff --git a/deps/openfoodfacts-shared-services b/deps/openfoodfacts-shared-services
diff --git a/icons/upload_file.svg b/icons/upload_file.svg
diff --git a/lib/ProductOpener/API.pm b/lib/ProductOpener/API.pm
@@ -84,7 +84,7 @@ use ProductOpener::APITaxonomySuggestions qw/taxonomy_suggestions_api/;
 use CGI qw(header);
 use Apache2::RequestIO();
 use Apache2::RequestRec();
-use JSON::PP;
+use JSON::MaybeXS;
 use Data::DeepAccess qw(deep_get);
 use Storable qw(dclone);
 use Encode;
@@ -346,7 +346,7 @@ sub send_api_response ($request_ref) {
 	my $status_code = $request_ref->{api_response}{status_code} || $request_ref->{status_code} || "200";
 	delete $request_ref->{api_response}{status_code};
 
-	my $json = JSON::PP->new->allow_nonref->canonical->utf8->encode($request_ref->{api_response});
+	my $json = JSON::MaybeXS->new->allow_nonref->canonical->utf8->encode($request_ref->{api_response});
 
 	# add headers
 	# We need to send the header Access-Control-Allow-Credentials=true so that websites

diff --git a/lib/ProductOpener/APITaxonomySuggestions.pm b/lib/ProductOpener/APITaxonomySuggestions.pm
@@ -138,7 +138,7 @@ sub taxonomy_suggestions_api ($request_ref) {
 				$matched_synonyms{$_->{tag}} = ucfirst($_->{matched_synonym});
 			}
 			$response_ref->{matched_synonyms} = \%matched_synonyms;
-			# Note: this does not seem to work with JSON::PP, even though the "canonical" option
+			# Note: this does not seem to work with JSON::MaybeXS, even though the "canonical" option
 			# should preserve the order of the keys of tied hashes.
 			# As JSON hashes are unordered, we will use the "suggestions" array on the client side to get the right order.
 			# It would have been nice to order the matched synonyms anyway, but it is not a huge issue.

diff --git a/lib/ProductOpener/APITest.pm b/lib/ProductOpener/APITest.pm
@@ -72,7 +72,7 @@ use LWP::UserAgent;
 use HTTP::CookieJar::LWP;
 use HTTP::Request::Common;
 use Encode;
-use JSON::PP;
+use JSON::MaybeXS;
 use Carp qw/confess/;
 use Clone qw/clone/;
 use File::Tail;

diff --git a/lib/ProductOpener/Data.pm b/lib/ProductOpener/Data.pm
@@ -64,7 +64,7 @@ use experimental 'smartmatch';
 use ProductOpener::Config qw/:all/;
 
 use MongoDB;
-use JSON::PP;
+use JSON::MaybeXS;
 use CGI ':cgi-lib';
 use Log::Any qw($log);
 

diff --git a/lib/ProductOpener/Display.pm b/lib/ProductOpener/Display.pm
@@ -185,7 +185,7 @@ use DateTime::Locale;
 use experimental 'smartmatch';
 use MongoDB;
 use Tie::IxHash;
-use JSON::PP;
+use JSON::MaybeXS;
 use Text::CSV;
 use XML::Simple;
 use CLDR::Number;
@@ -226,9 +226,9 @@ my $uri_finder = URI::Find->new(
 
 # Sort keys of JSON output
 # $json has utf8 disabled: it encodes to Perl Unicode strings
-my $json = JSON::PP->new->utf8(0)->allow_nonref->canonical;
+my $json = JSON::MaybeXS->new->utf8(0)->allow_nonref->canonical;
 # $json_utf8 has utf8 enabled: it encodes to UTF-8 bytes
-my $json_utf8 = JSON::PP->new->utf8(1)->allow_nonref->canonical;
+my $json_utf8 = JSON::MaybeXS->new->utf8(1)->allow_nonref->canonical;
 
 =head1 VARIABLES
 
@@ -5321,7 +5321,7 @@ sub search_and_display_products ($request_ref, $query_ref, $sort_by, $limit, $pa
 		}
 	}
 
-	# tied hashes can't be encoded directly by JSON::PP, freeze the sort tied hash
+	# tied hashes can't be encoded directly by JSON::MaybeXS, freeze the sort tied hash
 	my $mongodb_query_ref = [
 		lc => $lc,
 		query => $query_ref,
@@ -6203,7 +6203,7 @@ sub display_scatter_plot ($graph_ref, $products_ref, $request_ref) {
 
 		# create data entry for series
 		defined $series{$seriesid} or $series{$seriesid} = '';
-		$series{$seriesid} .= JSON::PP->new->encode(\%data) . ',';
+		$series{$seriesid} .= JSON::MaybeXS->new->encode(\%data) . ',';
 		# count entries / series
 		defined $series_n{$seriesid} or $series_n{$seriesid} = 0;
 		$series_n{$seriesid}++;
@@ -11505,10 +11505,10 @@ sub search_and_analyze_recipes ($request_ref, $query_ref) {
 			if (single_param("debug")) {
 				$debug
 					.= "product: "
-					. JSON::PP->new->utf8->canonical->encode($product_ref)
+					. JSON::MaybeXS->new->utf8->canonical->encode($product_ref)
 					. "<br><br>\n\n"
 					. "recipe: "
-					. JSON::PP->new->utf8->canonical->encode($recipe_ref)
+					. JSON::MaybeXS->new->utf8->canonical->encode($recipe_ref)
 					. "<br><br><br>\n\n\n";
 			}
 		}