Skip to content

Added support for Composer, Images Wrapping, Unit Testing and started re-writing code to be PSR-2 compliant #40

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 13 commits into from
Dec 16, 2013
Merged

Added support for Composer, Images Wrapping, Unit Testing and started re-writing code to be PSR-2 compliant #40

merged 13 commits into from
Dec 16, 2013

Conversation

gabrielbull
Copy link
Member

No description provided.

@gabrielbull
Copy link
Member Author

Also, while merging my pull request ;-), this is a TODO list that needs be done:

Moved TODO to other comment

@Progi1984
Copy link
Member

I enable the repo on Travis-CI (https://travis-ci.org/PHPOffice/PHPWord)
I can't add the repo on packagist.org. Your package prevent the PHPOffice one to be declared.

Merge branch 'refs/heads/develop'
b6a5bf2 
Conflicts:
	.travis.yml
	composer.json
	src/PHPWord/Writer/Word2007/Base.php
@gabrielbull
Copy link
Member Author

I'll delete it right after you merged my pull request into the master branch and added tags in order not to break my current application using it.

This is what I think the tags should look like: https://github.com/gavroche/PHPWord/releases

@Progi1984
Copy link
Member

I must firstly merge the develop in master branch. And I will treat all pull requests after that.

@Progi1984
Copy link
Member

I just merge the develop branch in master branch.

Merge branch 'master' of https://github.com/PHPOffice/PHPWord
39e4dd2 
Conflicts:
	.gitignore
	Classes/PHPWord.php
	Classes/PHPWord/Section.php
	Classes/PHPWord/Section/Footer.php
	Classes/PHPWord/Section/Header.php
	Classes/PHPWord/Section/Table/Cell.php
	Classes/PHPWord/Section/TextRun.php
	Classes/PHPWord/Shared/String.php
	Classes/PHPWord/Style/Cell.php
	Classes/PHPWord/Style/Paragraph.php
	Classes/PHPWord/Template.php
	Classes/PHPWord/Writer/Word2007.php
	Classes/PHPWord/Writer/Word2007/Base.php
	Classes/PHPWord/Writer/Word2007/Document.php
	Examples/AdvancedTable.php
	Examples/BasicTable.php
	Examples/HeaderFooter.php
	Examples/Link.php
	Examples/ListItem.php
	Examples/Object.php
	Examples/Section.php
	Examples/Template.php
	Examples/Textrun.php
	Examples/TitleTOC.php
	Examples/Watermark.php
	Examples/_earth.JPG
	Examples/_mars.jpg
	Examples/_sheet.xls
	changelog.txt
	samples/old/AdvancedTable.php
	samples/old/BasicTable.php
	samples/old/Image.php
	samples/old/Link.php
	samples/old/ListItem.php
	samples/old/Object.php
	samples/old/Section.php
	samples/old/Template.php
	samples/old/Textrun.php
	samples/old/TitleTOC.php
	samples/old/Watermark.php
	samples/old/_earth.jpg
	samples/old/_mars.jpg
	samples/old/_sheet.xls
	src/Examples/AdvancedTable.php
	src/Examples/BasicTable.php
	src/Examples/Link.php
	src/Examples/ListItem.php
	src/Examples/Object.php
	src/Examples/Section.php
	src/Examples/Template.php
	src/Examples/Textrun.php
	src/Examples/TitleTOC.php
	src/Examples/Watermark.php
	src/Examples/_earth.JPG
	src/Examples/_mars.jpg
	src/Examples/_sheet.xls
@gabrielbull
Copy link
Member Author

Ok, I merged the master branch to my pull request, you should now be able to accept my pull request without any problems.

  • merge this pull request
  • start adding tags and making releases (start with v0.7.0 and v0.7.1, what I think the tags should look like)
  • make the master branch the HEAD branch (instead of develop, as it should be by default)
  • merge the master branch into the develop or delete the develop branch
  • activate repo on travis-ci
  • transfer ownership of the packagist.org repo to @Progi1984
  • change packagist.org repo to point to this one instead of @gavroche's fork
  • activate auto-update on packagist.org

@Progi1984
Copy link
Member

Could you move your source to Classes directory ?
All sources in @PHPOffice projects are in Classes directory.

@gabrielbull
Copy link
Member Author

Ok done, but maybe we should consider moving all repos to more standard src or lib directory.

Progi1984 added a commit that referenced this pull request Dec 16, 2013
@Progi1984
Merge pull request #40 from gavroche/master
a4b6b84 
PR40 - Added support for Composer, Images Wrapping, Unit Testing and started re-writing code to be PSR-2 compliant
@Progi1984 Progi1984 merged commit a4b6b84 into PHPOffice:master Dec 16, 2013
@Progi1984
Copy link
Member

Merge done.

And for moving the directory, open an issue to PHPExcel project. It's our reference.

PS : I will release a version before the end of 2013.

@Progi1984 Progi1984 mentioned this pull request Dec 16, 2013
Closed
@gabrielbull
Copy link
Member Author

Ok I deleted the repo from packagist it's now up to you to re add it. Don't forget to enable auto update.

@gabrielbull
Copy link
Member Author

As for directory naming, we should not use PHPExcel as a reference but rather use PSR-* standards.

@Progi1984
Copy link
Member

Added : https://packagist.org/packages/phpoffice/phpword
Done for auto-update

Could you open a issue for discuting about the directory naming in PHPExcel ? PHPExcel is the reference for PHPOffice projects.

@gabrielbull
Copy link
Member Author

Here is is if you'd like to contribute.

@Progi1984 Progi1984 mentioned this pull request Jan 20, 2014
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
0.7.0
Development

Successfully merging this pull request may close these issues.
2 participants
@gabrielbull @Progi1984