Skip to content

Commit

Permalink
fix: return statements (#7104)
Browse files Browse the repository at this point in the history
Adding return statements to subroutines without them
  • Loading branch information
dipietroR authored and LandonPattison committed Jul 25, 2022
1 parent 64f7ac9 commit 63dbbf6
Show file tree
Hide file tree
Showing 15 changed files with 28 additions and 4 deletions.
2 changes: 2 additions & 0 deletions lib/ProductOpener/APITest.pm
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ sub wait_dynamic_front() {
print("Wainting for dynamicfront to be ready since $count seconds...\n");
}
}
return;
}

=head2 new_client()
Expand Down Expand Up @@ -120,6 +121,7 @@ sub create_user ($ua, $args_ref) {
}
my $response = $ua->post("http://world.openfoodfacts.localhost/cgi/user.pl", Content => \%fields,);
$response->is_success or die("Couldn't create user with " . dump(\%fields) . "\n");
return;
}

1;
4 changes: 4 additions & 0 deletions lib/ProductOpener/Display.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4583,6 +4583,7 @@ sub add_params_to_query($request_ref, $query_ref) {
}
}
}
return;
}


Expand All @@ -4598,6 +4599,7 @@ sub initialize_knowledge_panels_options($knowledge_panels_options_ref) {
if (param("activate_knowledge_panel_physical_activities")) {
$knowledge_panels_options_ref->{activate_knowledge_panel_physical_activities} = 1;
}
return;
}

=head2 customize_response_for_product ( $request_ref, $product_ref )
Expand Down Expand Up @@ -5544,6 +5546,7 @@ sub search_and_export_products($request_ref, $query_ref, $sort_by) {
$request_ref->{title} = lang("search_results");
$request_ref->{content_ref} = \$html;
display_page($request_ref);
return;
}


Expand Down Expand Up @@ -10990,6 +10993,7 @@ sub display_properties($request_ref) {
$request_ref->{page_type} = "properties";

display_page($request_ref);
return;
}

1;
1 change: 1 addition & 0 deletions lib/ProductOpener/Food.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2804,6 +2804,7 @@ sub assign_nutriments_values_from_request_parameters($$) {
delete $product_ref->{nutriments}{$key . "_serving"};
}
}
return;
}


Expand Down
3 changes: 3 additions & 0 deletions lib/ProductOpener/FoodGroups.pm
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ sub compute_pnns_groups($product_ref) {
$product_ref->{pnns_groups_1} = "unknown";
$product_ref->{pnns_groups_1_tags} = ["unknown", "missing-association"];
}
return;
}


Expand Down Expand Up @@ -259,6 +260,7 @@ sub compute_food_groups($product_ref) {
$product_ref->{categories_tags} = [@{$product_ref->{original_categories_tags}}];
delete $product_ref->{original_categories_tags};
}
return;
}


Expand Down Expand Up @@ -451,6 +453,7 @@ sub temporarily_change_categories_for_food_groups_computation($product_ref) {
remove_tag($product_ref, "categories", "en:unsweetened-beverages");
}
}
return;
}

1;
2 changes: 1 addition & 1 deletion lib/ProductOpener/Import.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2286,7 +2286,7 @@ sub update_export_status_for_csv_file($) {
$log->debug("update export status done", { products => $i }) if $log->is_debug();

print STDERR "\n\nupdate export status done\n\n";

return;
}


Expand Down
1 change: 1 addition & 0 deletions lib/ProductOpener/ImportConvert.pm
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,7 @@ sub remove_quantity_from_field($$) {
$product_ref->{$field} = $`;
}
}
return;
}


Expand Down
1 change: 1 addition & 0 deletions lib/ProductOpener/ImportConvertCarrefourFrance.pm
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@ sub convert_carrefour_france_files($$) {
foreach my $nutrient (sort { $nutrients{$b} <=> $nutrients{$a} } keys %nutrients) {
#print STDERR $nutrient . "\t" . $nutrients{$nutrient} . "\n";
}
return;
}


Expand Down
2 changes: 2 additions & 0 deletions lib/ProductOpener/MainCountries.pm
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ my $all_products_scans_ref;
sub load_scans_data() {

$all_products_scans_ref = retrieve_json("$data_root/products/all_products_scans.json");
return;
}


Expand Down Expand Up @@ -246,6 +247,7 @@ sub compute_main_countries($) {
push @{$product_ref->{misc_tags}}, "en:main-countries-new-product";
}
}
return;
}

1;
Expand Down
1 change: 1 addition & 0 deletions lib/ProductOpener/Orgs.pm
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ sub set_org_gs1_gln($$) {
}
}
store("$data_root/orgs/orgs_glns.sto", $glns_ref);
return;
}


Expand Down
4 changes: 2 additions & 2 deletions lib/ProductOpener/PackagerCodes.pm
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ sub init_packager_codes() {
my $packager_codes_ref = retrieve("$data_root/packager-codes/packager_codes.sto");
%packager_codes = %{$packager_codes_ref};
}

return;
}

sub init_geocode_addresses() {
Expand All @@ -266,7 +266,7 @@ sub init_geocode_addresses() {
my $geocode_addresses_ref = retrieve("$data_root/packager-codes/geocode_addresses.sto");
%geocode_addresses = %{$geocode_addresses_ref};
}

return;
}

# Slow, so only run these when actually executing, not just checking syntax. See also startup_apache2.pl.
Expand Down
2 changes: 2 additions & 0 deletions lib/ProductOpener/Packaging.pm
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ sub init_packaging_taxonomies_regexps() {

# used only for debugging
#store("packaging_taxonomies_regexps.sto", \%packaging_taxonomies_regexps);
return;
}


Expand Down Expand Up @@ -522,6 +523,7 @@ sub analyze_and_combine_packaging_data($) {
}

$log->debug("analyze_and_combine_packaging_data - done", { packagings => $product_ref->{packagings} }) if $log->is_debug();
return;
}

1;
Expand Down
4 changes: 3 additions & 1 deletion lib/ProductOpener/PerlStandards.pm
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ sub import {
strict->import;
feature->import(qw/signatures :5.24/);
utf8->import;
return;
}

sub unimport {
warnings->unimport;
strict->unimport;
feature->unimport;
utf8->unimport;
return;
}

1;
Expand Down Expand Up @@ -69,4 +71,4 @@ available on http://blogs.perl.org/users/ovid/2019/03/enforcing-simple-standards
Notes:
- the motivation for that module is to enable Perl's signatures that are experimental since Perl 5.24 and non-experimental in Perl 5.34
- we cannot use "use Modern::Perl '2022'" to activate signatures as we run Perl 5.24 in production today (July 2022)
- we cannot use "use Modern::Perl '2022'" to activate signatures as we run Perl 5.24 in production today (July 2022)
1 change: 1 addition & 0 deletions lib/ProductOpener/Recipes.pm
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ sub add_product_recipe_to_set($recipes_ref, $product_ref, $recipe_ref) {
recipe => $recipe_ref,
};
}
return;
}


Expand Down
3 changes: 3 additions & 0 deletions lib/ProductOpener/Test.pm
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ sub create_sto_from_json ($json_path, $sto_path) {

my $data = decode_json(path($json_path)->slurp_raw());
store($sto_path, $data);
return;
}


Expand Down Expand Up @@ -415,6 +416,7 @@ sub normalize_product_for_test_comparison($product) {
deep_set($product, @key, \@sorted);
}
}
return;
}


Expand All @@ -434,6 +436,7 @@ sub normalize_products_for_test_comparison($array_ref) {
for my $product_ref (@$array_ref) {
normalize_product_for_test_comparison($product_ref);
}
return;
}

1;
1 change: 1 addition & 0 deletions lib/ProductOpener/Users.pm
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ sub delete_user($user_ref) {

# re-assign product edits to openfoodfacts-contributors-[random number]
find_and_replace_user_id_in_products($userid, $new_userid);
return;
}

=head2 is_admin_user()
Expand Down

0 comments on commit 63dbbf6

Please sign in to comment.