Merge branch 'develop' into fix/static-front-page

* develop: (127 commits)
  Fix merge issues in `class-taxonomy.php`
  More test coverage for post and term translations.
  Correctly flush term translation caches.
  Switch to using transids for term translation cache keys.
  Travis config: Travis config: Added `sudo: false` to use modern infrastructure
  Correct a test name.
  Travis config: Added `sudo: false` to use modern infrastructure
  Babble_Locale: Use an exploit priority, rather than null
  Babble_Taxonomies: Change from add_action method to core function
  Babble_Languages: Change from add_action method to core function
  Remove the reliance on `$lang.php` and use our static list of RTL languages. See #216.
  Introduce a static list of RTL languages from GlotPress and Wikipedia.
  Add tests to check post and term translations after adding a new translation.
  Use database query numbers as tests to ensure our post and term translation caching is working as expected.
  Add caching to `Babble_Taxonomies::get_term_translations()`. Avoids a call to `get_objects_in_term()`. See #246.
  Tests for term translations, and change `Babble_Taxonomies::get_term_translations()` so it returns real term objects.
  Tests for post translations. See #236.
  Remove a bunch of unused code.
  Remove empty post IDs from the `$post_ids` array.
  Remove unnecessary use of global API functions, use current object methods instead.
  ...

Author: simonwheatley

.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+.idea
+vendor
+composer.lock

.travis.yml

@@ -0,0 +1,30 @@
+language: php
+sudo: false # Use modern Travis builds – http://docs.travis-ci.com/user/migrating-from-legacy/
+
+notifications:
+    on_success: never
+    on_failure: change
+
+php:
+    - 5.6
+    - 5.3
+    - 5.2
+    - hhvm
+
+env:
+    # latest stable:
+    - WP_VERSION=latest WP_MULTISITE=0
+    - WP_VERSION=latest WP_MULTISITE=1
+    # previous stable:
+    - WP_VERSION=4.1 WP_MULTISITE=0
+    - WP_VERSION=4.1 WP_MULTISITE=1
+    # earliest supported:
+    - WP_VERSION=4.0 WP_MULTISITE=0
+    - WP_VERSION=4.0 WP_MULTISITE=1
+
+before_script:
+    - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
+
+script:
+    - if [[ "$WP_VERSION" == "latest" ]]; then if find . -not \( -path ./vendor -prune \) -not \( -path ./features -prune \) -name "*.php" -exec php -l {} \; | grep "^[Parse error|Fatal error]"; then exit 1; fi; fi;
+    - phpunit

api.php

@@ -66,7 +66,7 @@ function bbl_get_current_lang_code() {
  * Given a lang object or lang code, this checks whether the
  * language is public or not.
  *
- * @param string $lang_code A language code
+ * @param string|object $lang_code A language code or a language object
  * @return boolean True if public
  * @access public
  **/
@@ -77,21 +77,21 @@ function bbl_is_public_lang( $lang_code ) {
 
 /**
  * Set the current (content) lang.
- * 
+ *
  * @uses Babble_Locale::switch_to_lang to do the actual work
  * @see switch_to_blog for similarities
  *
  * @param string $lang The language code to switch to 
- * @return void
+ * @return bool Whether the switch was successful
  **/
 function bbl_switch_to_lang( $lang ) {
 	global $bbl_locale;
-	$bbl_locale->switch_to_lang( $lang );
+	return $bbl_locale->switch_to_lang( $lang );
 }
 
 /**
  * Restore the previous lang.
- * 
+ *
  * @uses Babble_Locale::restore_lang to do the actual work
  * @see restore_current_blog for similarities
  *
@@ -103,11 +103,11 @@ function bbl_restore_lang() {
 }
 
 /**
- * Get the terms which are the translations for the provided 
- * term ID. N.B. The returned array of term objects (and false 
+ * Get the terms which are the translations for the provided
+ * term ID. N.B. The returned array of term objects (and false
  * values) will include the term for the term ID passed.
- * 
- * @param int|object $term Either a WP Term object, or a term_id 
+ *
+ * @param int|object $term Either a WP Term object, or a term_id
  * @return array Either an array keyed by the site languages, each key containing false (if no translation) or a WP Post object
  * @access public
  **/
@@ -117,10 +117,10 @@ function bbl_get_term_translations( $term, $taxonomy ) {
 }
 
 /**
- * Get the posts which are the translation jobs for the provided 
+ * Get the posts which are the translation jobs for the provided
  * term ID.
- * 
- * @param int|object $term Either a WP Term object, or a term_id 
+ *
+ * @param int|object $term Either a WP Term object, or a term_id
  * @return array An array keyed by the site languages, each key containing a WP Post object
  * @access public
  **/
@@ -134,9 +134,9 @@ function bbl_get_term_jobs( $term, $taxonomy ) {
  * particular language.
  *
  * @param int|object $default_term The term in the default language to create a new translation for, either WP Post object or post ID
- * @param string $lang The language code 
+ * @param string $lang The language code
  * @param string $taxonomy The taxonomy
- * @return string The admin URL to create the new translation
+ * @return string|WP_Error The admin URL to create the new translation, a `WP_Error` object on failure
  * @access public
  **/
 function bbl_get_new_term_translation_url( $default_term, $lang, $taxonomy = null ) {
@@ -147,7 +147,7 @@ function bbl_get_new_term_translation_url( $default_term, $lang, $taxonomy = nul
 /**
  * Returns the language code associated with a particular taxonomy.
  *
- * @param string $taxonomy The taxonomy to get the language for 
+ * @param string $taxonomy The taxonomy to get the language for
  * @return string The lang code
  **/
 function bbl_get_taxonomy_lang_code( $taxonomy ) {
@@ -156,10 +156,10 @@ function bbl_get_taxonomy_lang_code( $taxonomy ) {
 }
 
 /**
- * Return the base taxonomy (in the default language) for a 
+ * Return the base taxonomy (in the default language) for a
  * provided taxonomy.
  *
- * @param string $taxonomy The name of a taxonomy 
+ * @param string $taxonomy The name of a taxonomy
  * @return string The name of the base taxonomy
  **/
 function bbl_get_base_taxonomy( $taxonomy ) {
@@ -181,7 +181,7 @@ function bbl_get_taxonomy_in_lang( $taxonomy, $lang_code = null ) {
 
 /**
  * Test whether a particular taxonomy is translated or not.
- * 
+ *
  * @param string $taxonomy The name of the taxonomy to check
  * @return bool True if this is a translated taxonomy
  */
@@ -191,7 +191,7 @@ function bbl_is_translated_taxonomy( $taxonomy ) {
 
 /**
  * Test whether a particular post type is translated or not.
- * 
+ *
  * @param string $post_type The name of the post type to check
  * @return bool True if this is a translated post type
  */
@@ -212,11 +212,11 @@ function bbl_get_taxonomy_slug_in_lang( $slug, $lang_code = null ) {
 }
 
 /**
- * Get the posts which are the translations for the provided 
- * post ID. N.B. The returned array of post objects (and false 
+ * Get the posts which are the translations for the provided
+ * post ID. N.B. The returned array of post objects (and false
  * values) will include the post for the post ID passed.
- * 
- * @param int|object $post Either a WP Post object, or a post ID 
+ *
+ * @param int|object $post Either a WP Post object, or a post ID
  * @return array Either an array keyed by the site languages, each key containing false (if no translation) or a WP Post object
  * @access public
  **/
@@ -226,10 +226,10 @@ function bbl_get_post_translations( $post ) {
 }
 
 /**
- * Get the posts which are the translation jobs for the provided 
+ * Get the posts which are the translation jobs for the provided
  * post ID.
- * 
- * @param int|object $post Either a WP Post object, or a post ID 
+ *
+ * @param int|object $post Either a WP Post object, or a post ID
  * @return array Either an array keyed by the site languages, each key containing a WP Post object
  * @access public
  **/
@@ -239,10 +239,10 @@ function bbl_get_incomplete_post_jobs( $post ) {
 }
 
 /**
- * Returns the post ID for the post in the default language from which 
+ * Returns the post ID for the post in the default language from which
  * this post was translated.
  *
- * @param int|object $post Either a WP Post object, or a post ID 
+ * @param int|object $post Either a WP Post object, or a post ID
  * @return int The ID of the default language equivalent post
  * @access public
  **/
@@ -254,7 +254,7 @@ function bbl_get_default_lang_post( $post ) {
 /**
  * Return the language code for the language a given post is written for/in.
  *
- * @param int|object $post Either a WP Post object, or a post ID 
+ * @param int|object $post Either a WP Post object, or a post ID
  * @return string|object Either a language code, or a WP_Error object
  * @access public
  **/
@@ -268,7 +268,7 @@ function bbl_get_post_lang_code( $post ) {
  * particular language.
  *
  * @param int|object $default_post The post in the default language to create a new translation for, either WP Post object or post ID
- * @param string $lang The language code 
+ * @param string $lang The language code
  * @return string The admin URL to create the new translation
  * @access public
  **/
@@ -278,7 +278,7 @@ function bbl_get_new_post_translation_url( $default_post, $lang ) {
 }
 
 /**
- * Return the post type name for the equivalent post type for the 
+ * Return the post type name for the equivalent post type for the
  * supplied original post type in the requested language.
  *
  * @param string $post_type The originating post type
@@ -323,8 +323,8 @@ function bbl_is_page( $page = '' ) {
 /**
  * Returns the post in a particular language
  *
- * @param int|object $post Either a WP Post object, or a post ID 
- * @param string $lang_code The language code for the required language 
+ * @param int|object $post Either a WP Post object, or a post ID
+ * @param string $lang_code The language code for the required language
  * @param boolean $fallback If true: if a post is not available, fallback to the default language content (defaults to true)
  * @return object|boolean The WP Post object, or if $fallback was false and no post then returns false
  **/
@@ -336,9 +336,9 @@ function bbl_get_post_in_lang( $post, $lang_code, $fallback = true ) {
 /**
  * Returns the term in a particular language
  *
- * @param int|object $term Either a term object, or a term ID 
+ * @param int|object $term Either a term object, or a term ID
  * @param string $taxonomy The term taxonomy
- * @param string $lang_code The language code for the required language 
+ * @param string $lang_code The language code for the required language
  * @param boolean $fallback If true: if a term is not available, fallback to the default language content (defaults to true)
  * @return object|boolean The term object, or if $fallback was false and no term then returns false
  **/
@@ -363,7 +363,7 @@ function bbl_get_post_type_slug_in_lang( $slug, $lang_code = null ) {
 /**
  * Echoes the title of a post, in the requested language (if available).
  *
- * @param int|object $post Either a WP Post object, or a post ID 
+ * @param int|object $post Either a WP Post object, or a post ID
  * @param string $lang_code The code for the language the title is requested in
  * @param bool $fallback Whether to provide a fallback title in the default language if the requested language is unavailable (defaults to false)
  * @return void
@@ -375,7 +375,7 @@ function bbl_the_title_in_lang( $post = null, $lang_code = null, $fallback = fal
 /**
  * Returns the title of a post, in the requested language (if available).
  *
- * @param int|object $post Either a WP Post object, or a post ID 
+ * @param int|object $post Either a WP Post object, or a post ID
  * @param string $lang_code The code for the language the title is requested in
  * @param bool $fallback Whether to provide a fallback title in the default language if the requested language is unavailable (defaults to false)
  * @return void
@@ -396,7 +396,7 @@ function bbl_get_the_title_in_lang( $post = null, $lang_code = null, $fallback =
 /**
  * Echoes the permalink of a post, in the requested language (if available).
  *
- * @param int|object $post Either a WP Post object, or a post ID 
+ * @param int|object $post Either a WP Post object, or a post ID
  * @param string $lang_code The code for the language the title is requested in
  * @param bool $fallback Whether to provide a fallback title in the default language if the requested language is unavailable (defaults to false)
  * @return void
@@ -408,7 +408,7 @@ function bbl_the_permalink_in_lang( $post = null, $lang_code = null, $fallback =
 /**
  * Returns the permalink of a post, in the requested language (if available).
  *
- * @param int|object $post Either a WP Post object, or a post ID 
+ * @param int|object $post Either a WP Post object, or a post ID
  * @param string $lang_code The code for the language the title is requested in
  * @param bool $fallback Whether to provide a fallback title in the default language if the requested language is unavailable (defaults to false)
  * @return void
@@ -444,10 +444,10 @@ function bbl_get_post_type_archive_link_in_lang( $post_type, $lang_code = null )
 }
 
 /**
- * Return the base post type (in the default language) for a 
+ * Return the base post type (in the default language) for a
  * provided post type.
  *
- * @param string $post_type The name of a post type 
+ * @param string $post_type The name of a post type
  * @return string The name of the base post type
  **/
 function bbl_get_base_post_type( $post_type ) {
@@ -469,7 +469,7 @@ function bbl_get_base_post_types() {
  * Returns an array of all the shadow post types associated with
  * this post type.
  *
- * @param string $base_post_type The post type to look up shadow post types for 
+ * @param string $base_post_type The post type to look up shadow post types for
  * @return array The names of all the related shadow post types
  **/
 function bbl_get_shadow_post_types( $base_post_type ) {
@@ -480,14 +480,14 @@ function bbl_get_shadow_post_types( $base_post_type ) {
 /**
  * Return the active language objects for the current site. A
  * language object looks like:
- * 'ar' => 
+ * 'ar' =>
  * 		object(stdClass)
  * 			public 'name' => string 'Arabic'
  * 			public 'code' => string 'ar'
  * 			public 'url_prefix' => string 'ar'
  * 			public 'text_direction' => string 'rtl'
  * 			public 'display_name' => string 'Arabic'
- * 
+ *
  * @uses Babble_Languages::get_active_langs to do the actual work
  *
  * @return array An array of Babble language objects
@@ -500,7 +500,7 @@ function bbl_get_active_langs() {
 /**
  * Returns the requested language object.
  *
- * @param string $code A language code, e.g. "fr_BE" 
+ * @param string $code A language code, e.g. "fr_BE"
  * @return object|boolean A Babble language object
  **/
 function bbl_get_lang( $lang_code ) {
@@ -542,16 +542,16 @@ function bbl_get_default_lang() {
 }
 
 /**
- * Checks whether either the provided language code, 
+ * Checks whether either the provided language code,
  * if provided, or the current language code are
  * the default language.
- * 
+ *
  * i.e. is this language the default language
  *
  * n.b. the current language could have been switched
  * using bbl_switch_to_lang
  *
- * @param string $lang_code The language code to check (optional) 
+ * @param string $lang_code The language code to check (optional)
  * @return bool True if the default language
  **/
 function bbl_is_default_lang( $lang_code = null ) {
@@ -576,7 +576,7 @@ function bbl_get_default_lang_url_prefix() {
 /**
  * Returns the language code for the provided URL prefix.
  *
- * @param string $url_prefix The URL prefix to find the language code for 
+ * @param string $url_prefix The URL prefix to find the language code for
  * @return string The language code, or false
  **/
 function bbl_get_lang_from_prefix( $url_prefix ) {
@@ -629,15 +629,15 @@ function bbl_stop_logging() {
 /**
  * Log a message.
  *
- * @param string $msg Log this message 
+ * @param string $msg Log this message
+ * @param bool $force If false, logging must have been initiated with bbl_start_logging
  * @return void
  **/
-function bbl_log( $msg ) {
+function bbl_log( $msg, $force = false ) {
 	global $bbl_log;
-	if ( $bbl_log )
+	if ( $bbl_log || $force ) {
 		$bbl_log->log( $msg );
-	else
-		error_log( "Full Babble logging unavailable: $msg" );
+	}
 }
 
 /**
@@ -649,5 +649,3 @@ function bbl_is_logging() {
 	global $bbl_log;
 	return $bbl_log->logging;
 }
-
-?>