Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ISLANDORA-1042 -- DESTROY ALL DEPRECATED CODE! #545

Merged
merged 9 commits into from
Feb 5, 2015
Merged

ISLANDORA-1042 -- DESTROY ALL DEPRECATED CODE! #545

merged 9 commits into from
Feb 5, 2015

Conversation

ruebot
Copy link
Member

@ruebot ruebot commented Sep 5, 2014

No description provided.

* @return NewFedoraObject
* The new object.
*/
function islandora_ingest_form_prepare_new_object(array $configuration) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't delete it yet as it's still in use in the same module:

https://github.com/ruebot/islandora/blob/7.x-ISLANDORA-1042/includes/ingest.form.inc#L85

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put it back with 690fb4c.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that use is for the deprecated 'object' entry and should be removed, which would let this removal go through.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so and maybe cleaning up $objects initialization.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

innocently asks what's wrong with $object initialization

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think the ternary is necessary anymore.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@willtp87
Copy link
Member

Just so this isn't missed (it's in a closed diff): #545 (comment)

@ruebot
Copy link
Member Author

ruebot commented Sep 15, 2014

Re-removed function and the other call to it.

@ruebot
Copy link
Member Author

ruebot commented Jan 27, 2015

Looks like this is going to pass Travis. So, if you (speaking to anybody who reviews this, not a specific you) check out the two recent commits, if the ternary is removed, we have problems downstream on ingest that I noticed on a smoke test:

PHP Fatal error:  Call to a member function remove() on a non-object in /var/www/drupal/htdocs/sites/all/modules/islandora_solution_pack_collection/includes/ingest.form.inc on line 181, referer: http://localhost:8181/islandora/object/islandora%3Asp_basic_image_collection

Putting it back in seems to make everything happy.

@manez
Copy link
Member

manez commented Feb 3, 2015

Just gathering stuff for the Committers Call this week. Is this still a thing? Why is this still a thing?

@ruebot
Copy link
Member Author

ruebot commented Feb 3, 2015

Just needs to be merged.

@nigelgbanks
Copy link
Member

This looks good to me.

nigelgbanks added a commit that referenced this pull request Feb 5, 2015
ISLANDORA-1042 -- DESTROY ALL DEPRECATED CODE!
@nigelgbanks nigelgbanks merged commit 9ac1eed into Islandora:7.x Feb 5, 2015
@ruebot ruebot deleted the 7.x-ISLANDORA-1042 branch February 5, 2015 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants