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

Added classmap for autoload #6

Closed
wants to merge 1 commit into from
Closed

Added classmap for autoload #6

wants to merge 1 commit into from

Conversation

ihortymoshenko
Copy link

No description provided.

@GromNaN
Copy link

GromNaN commented Aug 21, 2012

👍

@ezyang can you merge this pull request ?

@desarrolla2
Copy link

@ezyang can you merge this pull request ? +1

@rvdbogerd
Copy link

@ezyang Can you please merge this pull request? +2

@ezyang
Copy link
Owner

ezyang commented Sep 7, 2012

Hello, can you please add a Signed-off-by, use your real email address, and get rid of the gratuitous whitespace changes?

@ihortymoshenko
Copy link
Author

Hello, I added spaces for readability. Should I remove them?

@ezyang
Copy link
Owner

ezyang commented Sep 8, 2012

When making whitespace changes, you should separate them into a non-semantics changing whitespace change, and then a semantics change (with no whitespace changes). Sometimes it's not worth the trouble so you don't change whitespace. But diffs that touch all of the file make people sad.

I noticed you have a resubmit: HTML Purifier as a rule only accepts rebased patches on the tip of master, so you should run 'git rebase origin/master'

@ihortymoshenko
Copy link
Author

I've done.

@ezyang
Copy link
Owner

ezyang commented Sep 9, 2012

Hmm, it doesn't look like you pushed the rebase properly. What commands did you use?

@ihortymoshenko
Copy link
Author

git clone https://github.com/timoshenko/htmlpurifier.git
cd htmlpurifier
git remote add htmlpurifier https://github.com/ezyang/htmlpurifier.git
git fetch htmlpurifier
git rebase htmlpurifier/master
First, rewinding head to replay your work on top of it...
Applying: Added classmap for autoload
Applying: Added classmap for autoload
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Added classmap for autoload
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Added classmap for autoload
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.

@ezyang
Copy link
Owner

ezyang commented Sep 13, 2012

OK, and once you did that, what did you do to the new head? (Also, why are there so many copies of that patch on your copy?)

@ihortymoshenko
Copy link
Author

What should I do?

@GromNaN
Copy link

GromNaN commented Sep 14, 2012

@timoshenko create a new branch from @ezyang master ; add your 2 commits to this branch and create a new pull request...

@ihortymoshenko
Copy link
Author

I removed duplicated commits using by git rebase -i HEAD~10, @ezyang can you check?

@ezyang
Copy link
Owner

ezyang commented Sep 16, 2012

I merged Rob Loach's version.

@ezyang ezyang closed this Sep 16, 2012
@GromNaN
Copy link

GromNaN commented Dec 21, 2012

Is it required to declare the constant HTMLPURIFIER_PREFIX if the library is autoloaded with composer ?

@ezyang
Copy link
Owner

ezyang commented Dec 21, 2012

Does #12 resolve the issue for you?

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

5 participants