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

Update readme + composer requirements; move license file and drop bui… #43

Merged
merged 1 commit into from
Sep 3, 2015
Merged

Update readme + composer requirements; move license file and drop bui… #43

merged 1 commit into from
Sep 3, 2015

Conversation

usox
Copy link
Contributor

@usox usox commented Sep 1, 2015

I updated the readme and the composer.json according to #41. Also, I removed the build.xml and the phing targets from the Makefile due to dependency problems to PEAR-Packages (FileManager at least). The only used phing target was tar which (from what I understand) is/was used to build a release package. Any thoughts about that?

@@ -1,64 +1,55 @@

# PHPTAL - Template Attribute Language for PHP

Master: [![Build Status](https://secure.travis-ci.org/pornel/PHPTAL.png?branch=master)](http://travis-ci.org/pornel/PHPTAL)
[![Monthly Downloads](https://poser.pugx.org/phptal/phptal/d/monthly)](https://packagist.org/packages/phptal/phptal)
[![License](https://poser.pugx.org/phptal/phptal/license)](https://packagist.org/packages/phptal/phptal)
Copy link
Member

Choose a reason for hiding this comment

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

should be LICENSE

Master: [![Build Status](https://secure.travis-ci.org/pornel/PHPTAL.png?branch=master)](http://travis-ci.org/pornel/PHPTAL)
[![Monthly Downloads](https://poser.pugx.org/phptal/phptal/d/monthly)](https://packagist.org/packages/phptal/phptal)
[![License](https://poser.pugx.org/phptal/phptal/license)](LICENSE)
[![Build Status](https://secure.travis-ci.org/pornel/PHPTAL.png?branch=master)](http://travis-ci.org/pornel/PHPTAL)
Copy link
Member

Choose a reason for hiding this comment

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

The link to Pornel's travis is broken.. I've set up a new one: https://travis-ci.org/phptal/PHPTAL
New code is:
[![Build Status](https://travis-ci.org/phptal/PHPTAL.svg?branch=master)](https://travis-ci.org/phptal/PHPTAL)

@Potherca
Copy link
Member

Potherca commented Sep 3, 2015

First of all: thank you for the work thus far @usox !

Other than a few minor pointers this looks good to me. I feel inclined to merge this.

@Ocramius / @pornel ?

(Also, do we want this to go on master or a v2 branch and integrate later? I think we need to start making that CONTRIBUTING file...)

@Ocramius Ocramius merged commit 6c4dfb2 into phptal:master Sep 3, 2015
Ocramius added a commit that referenced this pull request Sep 3, 2015
Ocramius added a commit that referenced this pull request Sep 3, 2015
Ocramius added a commit that referenced this pull request Sep 3, 2015
@Ocramius
Copy link
Member

Ocramius commented Sep 3, 2015

@usox @Potherca merged and created branch 1.3.x off of tag 1.3.0.

master is 2.x if you want (we can alias it in a different PR if you prefer so)

@Ocramius
Copy link
Member

Ocramius commented Sep 3, 2015

Also applied the review comments

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

Successfully merging this pull request may close these issues.

None yet

3 participants