Description
Jared Camins-Esakov
2012-11-01 19:09:13 UTC
Created attachment 37417 [details] [review] Bug 9006: Remove AUTOLOAD in C4::Context Happily this was only used for intranetdir. It's time to remove it and replace existing calls. I used the following commands to catch calls to C4::Context: git grep 'C4::Context\->' | grep -v 'C4::Context->preference' | grep -v 'C4::Context->config' | grep -v 'C4::Context->userenv' | grep -v 'C4::Context->IsSuperLibrarian' | grep -v 'C4::Context->dbh' | grep -v 'C4::Context->set_preference' | grep -v '_syspref_cache' | grep -v _userenv | grep -v 'C4::Context->interface' | grep -v 'C4::Context->Zconn' | grep -v 'C4::Context->queryparser' | grep -v 'C4::Context->tz' | grep -v 'C4::Context->boolean_preference' | grep -v 'C4::Context->memcached' $ grep "^sub " C4/Context.pm | cut -f2 -d' ' > ~/subs $ vi ~/subs :%s/^/C4::Context->/g :wq $ git grep 'C4::Context\->' | grep -v -f ~/subs Yes, intranetdir, but also: 1 perldoc line IsSuperlibrarian typo something ugly in C4/Input.pm typo in 3.07.00.030 updatedatabase.pl upgrade Perhaps those deserve a bug report? Koha::FrameworkPlugin needs tweaking, and is the reason a lot of the other stuff doesn't apply. Please rebase, amend, test, and reattach for signoff. :) Created attachment 40349 [details] [review] Bug 9006: Remove AUTOLOAD in C4::Context Happily this was only used for intranetdir. It's time to remove it and replace existing calls. I used the following commands to catch calls to C4::Context: git grep 'C4::Context\->' | grep -v 'C4::Context->preference' | grep -v 'C4::Context->config' | grep -v 'C4::Context->userenv' | grep -v 'C4::Context->IsSuperLibrarian' | grep -v 'C4::Context->dbh' | grep -v 'C4::Context->set_preference' | grep -v '_syspref_cache' | grep -v _userenv | grep -v 'C4::Context->interface' | grep -v 'C4::Context->Zconn' | grep -v 'C4::Context->queryparser' | grep -v 'C4::Context->tz' | grep -v 'C4::Context->boolean_preference' | grep -v 'C4::Context->memcached' I re-ran my commands in comment #2 $ grep "^sub " C4/Context.pm | cut -f2 -d' ' > ~/subs $ vi ~/subs :%s/^/C4::Context->/g :wq $ git grep 'C4::Context\->' | grep -v -f ~/subs Yes, intranetdir, but also: 1 perldoc line IsSuperlibrarian typo (see also bug 14425) something ugly in C4/Input.pm (patch to come on this bug) typo in 3.07.00.030 updatedatabase.pl upgrade (see also bug 14422) But I discovered that bug 13876 introduced C4::Context->KOHAVERSION. I think it should 'use Koha;' and then be 'Koha::version'; Also, this likely should be a patch on this bug. (In reply to M. Tompsett from comment #5) > something ugly in C4/Input.pm (patch to come on 14428, though perhaps C4::Input should be removed) ... > But I discovered that bug 13876 introduced C4::Context->KOHAVERSION. > I think it should 'use Koha;' and then be 'Koha::version'; This is on bug 14427. Setting this to depends on 14428, because 14428 removes the one non-intranetdir autoload by removing C4::Input (good bye, crud!). (In reply to M. Tompsett from comment #7) > Setting this to depends on 14428, because 14428 removes the one > non-intranetdir autoload by removing C4::Input (good bye, crud!). This cans still be signed off. Created attachment 40916 [details] [review] Bug 9006: Remove AUTOLOAD in C4::Context Happily this was only used for intranetdir. It's time to remove it and replace existing calls. I used the following commands to catch calls to C4::Context: git grep 'C4::Context\->' | grep -v 'C4::Context->preference' | grep -v 'C4::Context->config' | grep -v 'C4::Context->userenv' | grep -v 'C4::Context->IsSuperLibrarian' | grep -v 'C4::Context->dbh' | grep -v 'C4::Context->set_preference' | grep -v '_syspref_cache' | grep -v _userenv | grep -v 'C4::Context->interface' | grep -v 'C4::Context->Zconn' | grep -v 'C4::Context->queryparser' | grep -v 'C4::Context->tz' | grep -v 'C4::Context->boolean_preference' | grep -v 'C4::Context->memcached' NOTE: I applied 14428, and then did what I suggested in comment #2. Only intranetdir references appeared. I applied this patch, and repeated. Nothing appeared. This means the autoload references are properly removed. koha qa test tools complained about whitespace, I just fixed those. Though, we may wish to perltidy auth_fields_substructure.pl on another bug. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Created attachment 40924 [details] [review] [PASSED QA] Bug 9006: Remove AUTOLOAD in C4::Context Happily this was only used for intranetdir. It's time to remove it and replace existing calls. I used the following commands to catch calls to C4::Context: git grep 'C4::Context\->' | grep -v 'C4::Context->preference' | grep -v 'C4::Context->config' | grep -v 'C4::Context->userenv' | grep -v 'C4::Context->IsSuperLibrarian' | grep -v 'C4::Context->dbh' | grep -v 'C4::Context->set_preference' | grep -v '_syspref_cache' | grep -v _userenv | grep -v 'C4::Context->interface' | grep -v 'C4::Context->Zconn' | grep -v 'C4::Context->queryparser' | grep -v 'C4::Context->tz' | grep -v 'C4::Context->boolean_preference' | grep -v 'C4::Context->memcached' NOTE: I applied 14428, and then did what I suggested in comment #2. Only intranetdir references appeared. I applied this patch, and repeated. Nothing appeared. This means the autoload references are properly removed. koha qa test tools complained about whitespace, I just fixed those. Though, we may wish to perltidy auth_fields_substructure.pl on another bug. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Patch pushed to master. Thanks Jonathan! |