Meta framework package

.gitignore

@@ -9,9 +9,6 @@ composer.lock
 # Required composer dependencies
 /vendor/*
 
-# But keep packages shipped with Framework
-!/vendor/psr/cache/
-
 
 # Test Related Files #
 phpunit.xml

.travis.yml

@@ -20,12 +20,11 @@ before_script:
   - pyrus install -f pear/PHP_CodeSniffer
   - phpenv rehash
   - mysql -e 'create database joomla_ut;'
-  - mysql joomla_ut < src/Joomla/Database/Tests/Stubs/mysql.sql
+  - mysql joomla_ut < vendor/joomla/database/Tests/Stubs/mysql.sql
   - psql -c 'create database joomla_ut;' -U postgres
-  - psql -d joomla_ut -a -f src/Joomla/Database/Tests/Stubs/postgresql.sql
+  - psql -d joomla_ut -a -f vendor/joomla/database/Tests/Stubs/postgresql.sql
   - phpenv config-add build/travis/phpenv/memcached.ini
 
 script:
   - ant composervalidate
-  - ant travis-phpcs
   - phpunit --configuration phpunit.travis.xml

CONTRIBUTING.markdown

@@ -28,7 +28,7 @@ that need to be competed to "catch up" on work that was missed out in previous v
 ## Joomla Contributor Agreement
 
 Ideally, everybody who contributes to the Joomla Framework, or any other Open Source Matters supported project for that
-matter, should sign a [Joomla Contributor Agreement](http://developer.joomla.org/contributor-agreements.htm) (JCA).
+matter, should sign a [Joomla Contributor Agreement](http://developer.joomla.org/contributor-agreements.html) (JCA).
 
 But, we are aware that some contributors will not want to take the extra effort, especially for one-time contributors of
 modest amounts of code.  As a compromise, the Joomla Project requires a JCA from anybody who makes a significant

README.markdown

@@ -5,7 +5,7 @@
 
 ## What is the Joomla! Framework ?
 
-The `Joomla! Framework` is a platform for writing web and command line applications in PHP.  It is free and open source software, distributed under the GNU General Public License version 2 or later.
+The `Joomla! Framework` is a collection of packages for writing web and command line applications in PHP.  It is free and open source software, distributed under the GNU General Public License version 2 or later.
 
 It is composed of code originally developed for the Joomla Content Management System (CMS). For more information about the Joomla CMS visit [http://www.joomla.org/about-joomla.html](http://www.joomla.org/about-joomla.html).
 

build.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project name="joomla-framework" default="build" basedir=".">
-	<property name="source" value="src" />
-	<property name="testsource" value="${basedir}/src/Joomla/*/Tests,${basedir}/src/Joomla/*/_Tests" />
+	<property name="source" value="${basedir}/vendor/joomla/*/src" />
+	<property name="testsource" value="${basedir}/vendor/joomla/*/Tests,${basedir}/vendor/joomla/*/_Tests" />
 
 	<condition property="script-suffix" value=".bat" else="">
 		<os family="windows" />
@@ -98,25 +98,25 @@
 			<arg value="--extensions=php" />
 			<arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
 			<arg value="--standard=${basedir}/build/phpcs/Joomla" />
-			<arg value="--ignore=${basedir}/src/Joomla/String/phputf8" />
-			<arg path="${source}" />
+			<arg value="--ignore=${basedir}/vendor/joomla/string/phputf8,${basedir}/vendor/joomla/*/Tests" />
+			<arg path="${basedir}/vendor/joomla" />
 		</exec>
 	</target>
 
 	<target name="travis-phpcs" description="Generate codestyle report using PHP_CodeSniffer for output on Travis-CI">
 		<exec executable="phpcs${script-suffix}">
 			<arg value="--report=full" />
 			<arg value="--extensions=php" />
-			<arg value="--ignore=${basedir}/src/Joomla/String/phputf8" />
+			<arg value="--ignore=${basedir}/vendor/joomla/string/phputf8,${basedir}/vendor/joomla/*/Tests" />
 			<arg value="--standard=${basedir}/build/phpcs/Joomla/ruleset.xml" />
-			<arg path="${source}" />
+			<arg path="${basedir}/vendor/joomla" />
 		</exec>
 	</target>
 
 	<target name="phpdoc" description="Generate API documentation using phpDocumentor">
 		<exec executable="phpdoc${script-suffix}">
 			<arg value="-i" />
-			<arg path="${source}/Joomla/String/phputf8/,${source}/Joomla/*/Tests/,${source}/Joomla/*/_Tests/" />
+			<arg path="${source}/vendor/joomla/string/phputf8/,${source}/vendor/joomla/*/Tests/,${source}/vendor/joomla/*/_Tests/" />
 			<arg value="-d" />
 			<arg path="${source}" />
 			<arg value="-t" />
@@ -162,7 +162,7 @@
 		<apply executable="composer" failonerror="true">
 			<arg value="validate" />
 
-			<fileset dir="${source}">
+			<fileset dir="${basedir}">
 				<include name="**/composer.json" />
 				<modified />
 			</fileset>