Skip to content
This repository has been archived by the owner on Feb 6, 2020. It is now read-only.

remove redundant isset(s) #262

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from

Conversation

pine3ree
Copy link
Contributor

@pine3ree pine3ree commented Mar 4, 2018

when we are also testing with ! empty() I believe we can skip isset() checks, as the execution speed is nearly the same (but it will double for positive isset)

@Ocramius
Copy link
Member

Ocramius commented Mar 5, 2018

@pine3ree as this is an improvement, please target develop

@Ocramius Ocramius added this to the 3.4.0 milestone Mar 5, 2018
@pine3ree pine3ree changed the base branch from master to develop March 5, 2018 02:30
@Ocramius
Copy link
Member

Ocramius commented Mar 5, 2018

@pine3ree please attempt a rebase - don't merge upstream into your dev branches :)

@pine3ree
Copy link
Contributor Author

pine3ree commented Mar 5, 2018

Hello @Ocramius, I had changed the target branch of the pr from master to develop and resolved a resulting conflict. The files changes tab is now showing the correct changes I previously made for master. Did I do something wrong? kind regards.

@Ocramius
Copy link
Member

Ocramius commented Mar 5, 2018

@pine3ree ah, that's alright. If you are not familiar with the rebase process, I'll just do it on merge :-)

@pine3ree
Copy link
Contributor Author

pine3ree commented Mar 5, 2018

ok, thank You @Ocramius ! kind regards!

@samsonasik
Copy link
Contributor

@pine3ree just in case you've other conflicted branch in other/next Pull Request, I made blog post about rebase conflicted branch https://samsonasik.wordpress.com/2015/09/16/practical-git-4-rebasing-conflicted-task-branch-against-primary-branch/

@pine3ree
Copy link
Contributor Author

pine3ree commented Mar 6, 2018

@samsonasik
Thank You! that's very kind of You, sir! Regards!

@weierophinney
Copy link
Member

This repository has been closed and moved to laminas/laminas-servicemanager; a new issue has been opened at laminas/laminas-servicemanager#12.

@weierophinney
Copy link
Member

This repository has been moved to laminas/laminas-servicemanager. If you feel that this patch is still relevant, please re-open against that repository, and reference this issue. To re-open, we suggest the following workflow:

  • Squash all commits in your branch (git rebase -i origin/{branch})
  • Make a note of all changed files (`git diff --name-only origin/{branch}...HEAD
  • Run the laminas/laminas-migration tool on the code.
  • Clone laminas/laminas-servicemanager to another directory.
  • Copy the files from the second bullet point to the clone of laminas/laminas-servicemanager.
  • In your clone of laminas/laminas-servicemanager, commit the files, push to your fork, and open the new PR.
    We will be providing tooling via laminas/laminas-migration soon to help automate the process.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants