Merge branch 'staging' into improveReinstall

joomla · Aug 14, 2016 · fc49b24 · fc49b24
2 parents 52fc128 + e47e6e8
commit fc49b24
Show file tree

Hide file tree

Showing 61 changed files with 152 additions and 85 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -58,7 +58,7 @@ before_script:
   # JavaScript tests
   - if [[ $RUN_JAVASCRIPT_TESTS == "yes" ]]; then export DISPLAY=:99.0; bash tests/javascript/travis-tests.sh $PWD; fi
   # Make sure all dev dependencies are installed
-  - if [[ $RUN_UNIT_TESTS == "yes" ]]; then bash tests/unit/unit-tests.sh $PWD; fi
+  - if [[ $RUN_UNIT_TESTS == "yes" ]]; then bash build/travis/unit-tests.sh $PWD; fi
 
 script:
   - if [[ $RUN_UNIT_TESTS == "yes" ]]; then libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml; fi

diff --git a/administrator/components/com_users/views/users/view.html.php b/administrator/components/com_users/views/users/view.html.php
@@ -44,31 +44,31 @@ class UsersViewUsers extends JViewLegacy
 	 * A JForm instance with filter fields.
 	 *
 	 * @var    JForm
-	 * @since  3.6
+	 * @since  3.6.3
 	 */
 	 public $filterForm;
 
 	/**
 	 * An array with active filters.
 	 *
 	 * @var    array
-	 * @since  3.6
+	 * @since  3.6.3
 	 */
 	public $activeFilters;
 
 	/**
 	 * An ACL object to verify user rights.
 	 *
 	 * @var    JObject
-	 * @since  3.6
+	 * @since  3.6.3
 	 */
 	 protected $canDo;
 
 	/**
 	 * An instance of JDatabaseDriver.
 	 *
 	 * @var    JDatabaseDriver
-	 * @since  3.6
+	 * @since  3.6.3
 	 */
 	 protected $db;
 

diff --git a/tests/unit/unit-tests.sh → build/travis/unit-tests.sh b/tests/unit/unit-tests.sh → build/travis/unit-tests.sh
diff --git a/components/com_content/views/featured/view.html.php b/components/com_content/views/featured/view.html.php
@@ -36,7 +36,7 @@ class ContentViewFeatured extends JViewLegacy
 	 * An instance of JDatabaseDriver.
 	 *
 	 * @var    JDatabaseDriver
-	 * @since  3.6
+	 * @since  3.6.3
 	 */
 	 protected $db;
 

diff --git a/components/com_users/views/profile/view.html.php b/components/com_users/views/profile/view.html.php
@@ -28,7 +28,7 @@ class UsersViewProfile extends JViewLegacy
 	 * An instance of JDatabaseDriver.
 	 *
 	 * @var    JDatabaseDriver
-	 * @since  3.6
+	 * @since  3.6.3
 	 */
 	protected $db;
 

diff --git a/libraries/joomla/facebook/album.php b/libraries/joomla/facebook/album.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API Album class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/album/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/album/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookAlbum extends JFacebookObject
 {

diff --git a/libraries/joomla/facebook/checkin.php b/libraries/joomla/facebook/checkin.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API Checkin class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/checkin/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/checkin/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookCheckin extends JFacebookObject
 {

diff --git a/libraries/joomla/facebook/comment.php b/libraries/joomla/facebook/comment.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API Comment class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/Comment/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/Comment/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookComment extends JFacebookObject
 {

diff --git a/libraries/joomla/facebook/event.php b/libraries/joomla/facebook/event.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API User class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/event/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/event/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookEvent extends JFacebookObject
 {

diff --git a/libraries/joomla/facebook/facebook.php b/libraries/joomla/facebook/facebook.php
@@ -14,7 +14,8 @@
 /**
  * Joomla Platform class for interacting with a Facebook API instance.
  *
- * @since  13.1
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebook
 {

diff --git a/libraries/joomla/facebook/group.php b/libraries/joomla/facebook/group.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API Group class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/group/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/group/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookGroup extends JFacebookObject
 {

diff --git a/libraries/joomla/facebook/link.php b/libraries/joomla/facebook/link.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API Link class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/link/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/link/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookLink extends JFacebookObject
 {

diff --git a/libraries/joomla/facebook/note.php b/libraries/joomla/facebook/note.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API Note class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/note/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/note/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookNote extends JFacebookObject
 {

diff --git a/libraries/joomla/facebook/oauth.php b/libraries/joomla/facebook/oauth.php
@@ -14,7 +14,8 @@
 /**
  * Joomla Platform class for generating Facebook API access token.
  *
- * @since  13.1
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookOAuth extends JOAuth2Client
 {

diff --git a/libraries/joomla/facebook/object.php b/libraries/joomla/facebook/object.php
@@ -14,7 +14,8 @@
 /**
  * Facebook API object class for the Joomla Platform.
  *
- * @since  13.1
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 abstract class JFacebookObject
 {

diff --git a/libraries/joomla/facebook/photo.php b/libraries/joomla/facebook/photo.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API Photo class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/photo/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/photo/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookPhoto extends JFacebookObject
 {

diff --git a/libraries/joomla/facebook/post.php b/libraries/joomla/facebook/post.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API Post class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/post/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/post/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookPost extends JFacebookObject
 {

diff --git a/libraries/joomla/facebook/status.php b/libraries/joomla/facebook/status.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API Status class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/status/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/status/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookStatus extends JFacebookObject
 {

diff --git a/libraries/joomla/facebook/user.php b/libraries/joomla/facebook/user.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API User class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/user/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/user/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookUser extends JFacebookObject
 {

diff --git a/libraries/joomla/facebook/video.php b/libraries/joomla/facebook/video.php
@@ -12,8 +12,9 @@
 /**
  * Facebook API Video class for the Joomla Platform.
  *
- * @see    http://developers.facebook.com/docs/reference/api/video/
- * @since  13.1
+ * @see         http://developers.facebook.com/docs/reference/api/video/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
  */
 class JFacebookVideo extends JFacebookObject
 {

diff --git a/libraries/joomla/google/auth.php b/libraries/joomla/google/auth.php
@@ -12,7 +12,8 @@
 /**
  * Google authentication class abstract
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 abstract class JGoogleAuth
 {

diff --git a/libraries/joomla/google/auth/oauth2.php b/libraries/joomla/google/auth/oauth2.php
@@ -11,12 +11,11 @@
 
 use Joomla\Registry\Registry;
 
-jimport('joomla.oauth.v2client');
-
 /**
  * Google OAuth authentication class
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleAuthOauth2 extends JGoogleAuth
 {

diff --git a/libraries/joomla/google/data.php b/libraries/joomla/google/data.php
@@ -14,7 +14,8 @@
 /**
  * Google API data class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 abstract class JGoogleData
 {

diff --git a/libraries/joomla/google/data/adsense.php b/libraries/joomla/google/data/adsense.php
@@ -14,7 +14,8 @@
 /**
  * Google Adsense data class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleDataAdsense extends JGoogleData
 {

diff --git a/libraries/joomla/google/data/calendar.php b/libraries/joomla/google/data/calendar.php
@@ -14,7 +14,8 @@
 /**
  * Google Calendar data class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleDataCalendar extends JGoogleData
 {

diff --git a/libraries/joomla/google/data/picasa.php b/libraries/joomla/google/data/picasa.php
@@ -14,7 +14,8 @@
 /**
  * Google Picasa data class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleDataPicasa extends JGoogleData
 {

diff --git a/libraries/joomla/google/data/picasa/album.php b/libraries/joomla/google/data/picasa/album.php
@@ -14,7 +14,8 @@
 /**
  * Google Picasa data class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleDataPicasaAlbum extends JGoogleData
 {

diff --git a/libraries/joomla/google/data/picasa/photo.php b/libraries/joomla/google/data/picasa/photo.php
@@ -14,7 +14,8 @@
 /**
  * Google Picasa data class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleDataPicasaPhoto extends JGoogleData
 {

diff --git a/libraries/joomla/google/data/plus.php b/libraries/joomla/google/data/plus.php
@@ -14,7 +14,8 @@
 /**
  * Google+ data class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleDataPlus extends JGoogleData
 {

diff --git a/libraries/joomla/google/data/plus/activities.php b/libraries/joomla/google/data/plus/activities.php
@@ -14,7 +14,8 @@
 /**
  * Google+ data class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleDataPlusActivities extends JGoogleData
 {

diff --git a/libraries/joomla/google/data/plus/comments.php b/libraries/joomla/google/data/plus/comments.php
@@ -14,7 +14,8 @@
 /**
  * Google+ data class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleDataPlusComments extends JGoogleData
 {

diff --git a/libraries/joomla/google/data/plus/people.php b/libraries/joomla/google/data/plus/people.php
@@ -14,7 +14,8 @@
 /**
  * Google+ data class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleDataPlusPeople extends JGoogleData
 {

diff --git a/libraries/joomla/google/embed.php b/libraries/joomla/google/embed.php
@@ -11,12 +11,11 @@
 
 use Joomla\Registry\Registry;
 
-jimport('joomla.environment.uri');
-
 /**
  * Google API object class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 abstract class JGoogleEmbed
 {

diff --git a/libraries/joomla/google/embed/analytics.php b/libraries/joomla/google/embed/analytics.php
@@ -12,7 +12,8 @@
 /**
  * Google Analytics embed class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleEmbedAnalytics extends JGoogleEmbed
 {

diff --git a/libraries/joomla/google/embed/maps.php b/libraries/joomla/google/embed/maps.php
@@ -14,7 +14,8 @@
 /**
  * Google Maps embed class for the Joomla Platform.
  *
- * @since  12.3
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
  */
 class JGoogleEmbedMaps extends JGoogleEmbed
 {