From 0b6b3369226d2dbeae72c537e1334aaa70dfd75a Mon Sep 17 00:00:00 2001 From: Edwin Smith Date: Thu, 1 Aug 2013 09:53:22 -0700 Subject: [PATCH] Rename _ to - in runtime/base, part 2 Differential Revision: D912410 --- hphp/compiler/analysis/emitter.cpp | 2 +- hphp/compiler/analysis/function_scope.cpp | 2 +- hphp/compiler/analysis/symbol_table.cpp | 2 +- hphp/runtime/base/array_data.cpp | 2 +- hphp/runtime/base/builtin_functions.cpp | 4 ++-- hphp/runtime/base/builtin_functions.h | 2 +- hphp/runtime/base/class_info.cpp | 4 ++-- hphp/runtime/base/concurrent_shared_store.cpp | 2 +- ...{file_stream_wrapper.cpp => file-stream-wrapper.cpp} | 11 +++++------ .../{file_stream_wrapper.h => file-stream-wrapper.h} | 11 +++++------ hphp/runtime/base/file.cpp | 2 +- hphp/runtime/base/file_repository.cpp | 4 ++-- hphp/runtime/base/hphp_array.cpp | 2 +- ...{http_stream_wrapper.cpp => http-stream-wrapper.cpp} | 11 +++++------ .../{http_stream_wrapper.h => http-stream-wrapper.h} | 13 ++++++------- hphp/runtime/base/object_data.cpp | 2 +- .../{php_stream_wrapper.cpp => php-stream-wrapper.cpp} | 11 +++++------ .../base/{php_stream_wrapper.h => php-stream-wrapper.h} | 11 +++++------ hphp/runtime/base/program_functions.cpp | 2 +- hphp/runtime/base/ref_data.cpp | 2 +- hphp/runtime/base/resource_data.cpp | 2 +- ...wrapper_registry.cpp => stream-wrapper-registry.cpp} | 17 ++++++++--------- ...eam_wrapper_registry.h => stream-wrapper-registry.h} | 11 +++++------ .../base/{stream_wrapper.cpp => stream-wrapper.cpp} | 13 ++++++------- .../runtime/base/{stream_wrapper.h => stream-wrapper.h} | 9 ++++----- hphp/runtime/base/string_buffer.cpp | 2 +- hphp/runtime/base/thrift_buffer.cpp | 2 +- hphp/runtime/base/thrift_buffer.h | 2 +- hphp/runtime/base/type_array.cpp | 4 ++-- hphp/runtime/base/type_object.cpp | 2 +- hphp/runtime/base/type_resource.cpp | 2 +- hphp/runtime/base/type_string.cpp | 2 +- hphp/runtime/base/type_variant.cpp | 4 ++-- ...{user_stream_wrapper.cpp => user-stream-wrapper.cpp} | 11 +++++------ .../{user_stream_wrapper.h => user-stream-wrapper.h} | 11 +++++------ hphp/runtime/base/{utf8_decode.cpp => utf8-decode.cpp} | 2 +- hphp/runtime/base/{utf8_decode.h => utf8-decode.h} | 0 ...{variable_serializer.cpp => variable-serializer.cpp} | 11 +++++------ .../{variable_serializer.h => variable-serializer.h} | 9 ++++----- ...iable_unserializer.cpp => variable-unserializer.cpp} | 11 +++++------ ...{variable_unserializer.h => variable-unserializer.h} | 9 ++++----- hphp/runtime/base/{zip_file.cpp => zip-file.cpp} | 11 +++++------ hphp/runtime/base/{zip_file.h => zip-file.h} | 9 ++++----- hphp/runtime/debugger/debugger_client.cpp | 2 +- hphp/runtime/debugger/debugger_thrift_buffer.cpp | 4 ++-- hphp/runtime/debugger/debugger_thrift_buffer.h | 2 +- hphp/runtime/ext/JSON_parser.cpp | 2 +- hphp/runtime/ext/ext_apc.cpp | 2 +- hphp/runtime/ext/ext_collections.cpp | 2 +- hphp/runtime/ext/ext_file.cpp | 4 ++-- hphp/runtime/ext/ext_ipc.cpp | 2 +- hphp/runtime/ext/ext_json.cpp | 4 ++-- hphp/runtime/ext/ext_phar.cpp | 4 ++-- hphp/runtime/ext/ext_session.cpp | 2 +- hphp/runtime/ext/ext_stream.cpp | 6 +++--- hphp/runtime/ext/ext_variable.cpp | 4 ++-- hphp/runtime/ext/ext_zlib.cpp | 8 ++++---- hphp/tools/license.php | 4 ++-- 58 files changed, 146 insertions(+), 164 deletions(-) rename hphp/runtime/base/{file_stream_wrapper.cpp => file-stream-wrapper.cpp} (83%) rename hphp/runtime/base/{file_stream_wrapper.h => file-stream-wrapper.h} (80%) rename hphp/runtime/base/{http_stream_wrapper.cpp => http-stream-wrapper.cpp} (89%) rename hphp/runtime/base/{http_stream_wrapper.h => http-stream-wrapper.h} (73%) rename hphp/runtime/base/{php_stream_wrapper.cpp => php-stream-wrapper.cpp} (88%) rename hphp/runtime/base/{php_stream_wrapper.h => php-stream-wrapper.h} (76%) rename hphp/runtime/base/{stream_wrapper_registry.cpp => stream-wrapper-registry.cpp} (91%) rename hphp/runtime/base/{stream_wrapper_registry.h => stream-wrapper-registry.h} (79%) rename hphp/runtime/base/{stream_wrapper.cpp => stream-wrapper.cpp} (68%) rename hphp/runtime/base/{stream_wrapper.h => stream-wrapper.h} (82%) rename hphp/runtime/base/{user_stream_wrapper.cpp => user-stream-wrapper.cpp} (79%) rename hphp/runtime/base/{user_stream_wrapper.h => user-stream-wrapper.h} (76%) rename hphp/runtime/base/{utf8_decode.cpp => utf8-decode.cpp} (99%) rename hphp/runtime/base/{utf8_decode.h => utf8-decode.h} (100%) rename hphp/runtime/base/{variable_serializer.cpp => variable-serializer.cpp} (98%) rename hphp/runtime/base/{variable_serializer.h => variable-serializer.h} (93%) rename hphp/runtime/base/{variable_unserializer.cpp => variable-unserializer.cpp} (86%) rename hphp/runtime/base/{variable_unserializer.h => variable-unserializer.h} (93%) rename hphp/runtime/base/{zip_file.cpp => zip-file.cpp} (88%) rename hphp/runtime/base/{zip_file.h => zip-file.h} (83%) diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp index 49bdfdda5be..5f99ce44f20 100644 --- a/hphp/compiler/analysis/emitter.cpp +++ b/hphp/compiler/analysis/emitter.cpp @@ -86,7 +86,7 @@ #include "hphp/runtime/base/zend-string.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/program_functions.h" #include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/ext_hhvm/ext_hhvm.h" diff --git a/hphp/compiler/analysis/function_scope.cpp b/hphp/compiler/analysis/function_scope.cpp index e8519761683..fb85021da4f 100644 --- a/hphp/compiler/analysis/function_scope.cpp +++ b/hphp/compiler/analysis/function_scope.cpp @@ -37,7 +37,7 @@ #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/util/parser/hphp.tab.hpp" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/zend-string.h" using namespace HPHP; diff --git a/hphp/compiler/analysis/symbol_table.cpp b/hphp/compiler/analysis/symbol_table.cpp index 4f32f012d55..e14f34804fc 100644 --- a/hphp/compiler/analysis/symbol_table.cpp +++ b/hphp/compiler/analysis/symbol_table.cpp @@ -29,7 +29,7 @@ #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/array_data.cpp b/hphp/runtime/base/array_data.cpp index 9611b5f690f..7e61acb73b1 100644 --- a/hphp/runtime/base/array_data.cpp +++ b/hphp/runtime/base/array_data.cpp @@ -24,7 +24,7 @@ #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/macros.h" #include "hphp/runtime/base/shared_map.h" diff --git a/hphp/runtime/base/builtin_functions.cpp b/hphp/runtime/base/builtin_functions.cpp index d6971f96629..0372eed2b26 100644 --- a/hphp/runtime/base/builtin_functions.cpp +++ b/hphp/runtime/base/builtin_functions.cpp @@ -20,8 +20,8 @@ #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/code_coverage.h" #include "hphp/runtime/base/externals.h" -#include "hphp/runtime/base/variable_serializer.h" -#include "hphp/runtime/base/variable_unserializer.h" +#include "hphp/runtime/base/variable-serializer.h" +#include "hphp/runtime/base/variable-unserializer.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/strings.h" diff --git a/hphp/runtime/base/builtin_functions.h b/hphp/runtime/base/builtin_functions.h index d56e4709936..5c558e0a2b0 100644 --- a/hphp/runtime/base/builtin_functions.h +++ b/hphp/runtime/base/builtin_functions.h @@ -24,7 +24,7 @@ #include "hphp/runtime/base/intercept.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/variable_unserializer.h" +#include "hphp/runtime/base/variable-unserializer.h" #include "hphp/runtime/base/request_local.h" #include "hphp/runtime/base/strings.h" #include "hphp/util/case_insensitive.h" diff --git a/hphp/runtime/base/class_info.cpp b/hphp/runtime/base/class_info.cpp index cdb69b2bea1..a8152a86ec1 100644 --- a/hphp/runtime/base/class_info.cpp +++ b/hphp/runtime/base/class_info.cpp @@ -20,8 +20,8 @@ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/hphp_system.h" -#include "hphp/runtime/base/variable_serializer.h" -#include "hphp/runtime/base/variable_unserializer.h" +#include "hphp/runtime/base/variable-serializer.h" +#include "hphp/runtime/base/variable-unserializer.h" #include "hphp/runtime/ext/extension.h" #include "hphp/util/util.h" #include "hphp/util/lock.h" diff --git a/hphp/runtime/base/concurrent_shared_store.cpp b/hphp/runtime/base/concurrent_shared_store.cpp index 463d75fc72d..c103b7bf9c6 100644 --- a/hphp/runtime/base/concurrent_shared_store.cpp +++ b/hphp/runtime/base/concurrent_shared_store.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/base/concurrent_shared_store.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/ext/ext_apc.h" #include "hphp/util/logger.h" #include "hphp/util/timer.h" diff --git a/hphp/runtime/base/file_stream_wrapper.cpp b/hphp/runtime/base/file-stream-wrapper.cpp similarity index 83% rename from hphp/runtime/base/file_stream_wrapper.cpp rename to hphp/runtime/base/file-stream-wrapper.cpp index 367871595cf..81098ce8b81 100644 --- a/hphp/runtime/base/file_stream_wrapper.cpp +++ b/hphp/runtime/base/file-stream-wrapper.cpp @@ -3,19 +3,18 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/file_stream_wrapper.h" +#include "hphp/runtime/base/file-stream-wrapper.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/plain_file.h" #include "hphp/runtime/server/static_content_cache.h" diff --git a/hphp/runtime/base/file_stream_wrapper.h b/hphp/runtime/base/file-stream-wrapper.h similarity index 80% rename from hphp/runtime/base/file_stream_wrapper.h rename to hphp/runtime/base/file-stream-wrapper.h index 9081ad30cd7..57e73f89794 100644 --- a/hphp/runtime/base/file_stream_wrapper.h +++ b/hphp/runtime/base/file-stream-wrapper.h @@ -3,15 +3,14 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ @@ -21,7 +20,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/file.h" #include "hphp/runtime/base/mem_file.h" -#include "hphp/runtime/base/stream_wrapper.h" +#include "hphp/runtime/base/stream-wrapper.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/file.cpp b/hphp/runtime/base/file.cpp index 36a54bfcc04..93b04e4de55 100644 --- a/hphp/runtime/base/file.cpp +++ b/hphp/runtime/base/file.cpp @@ -33,7 +33,7 @@ #include "hphp/runtime/base/exceptions.h" #include #include "hphp/runtime/base/array_iterator.h" -#include "hphp/runtime/base/stream_wrapper_registry.h" +#include "hphp/runtime/base/stream-wrapper-registry.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/file_repository.cpp b/hphp/runtime/base/file_repository.cpp index 6ee2d96ce2a..78d8a5798fd 100644 --- a/hphp/runtime/base/file_repository.cpp +++ b/hphp/runtime/base/file_repository.cpp @@ -21,8 +21,8 @@ #include "hphp/util/process.h" #include "hphp/util/trace.h" #include "hphp/runtime/base/stat_cache.h" -#include "hphp/runtime/base/stream_wrapper_registry.h" -#include "hphp/runtime/base/file_stream_wrapper.h" +#include "hphp/runtime/base/stream-wrapper-registry.h" +#include "hphp/runtime/base/file-stream-wrapper.h" #include "hphp/runtime/server/source_root_info.h" #include "hphp/runtime/vm/jit/target-cache.h" diff --git a/hphp/runtime/base/hphp_array.cpp b/hphp/runtime/base/hphp_array.cpp index 78bdb0048e8..d9607d1b39a 100644 --- a/hphp/runtime/base/hphp_array.cpp +++ b/hphp/runtime/base/hphp_array.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/runtime_error.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/shared_map.h" #include "hphp/util/hash.h" #include "hphp/util/lock.h" diff --git a/hphp/runtime/base/http_stream_wrapper.cpp b/hphp/runtime/base/http-stream-wrapper.cpp similarity index 89% rename from hphp/runtime/base/http_stream_wrapper.cpp rename to hphp/runtime/base/http-stream-wrapper.cpp index ce3cc0a27b0..32d40d35e17 100644 --- a/hphp/runtime/base/http_stream_wrapper.cpp +++ b/hphp/runtime/base/http-stream-wrapper.cpp @@ -3,19 +3,18 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/http_stream_wrapper.h" +#include "hphp/runtime/base/http-stream-wrapper.h" #include "hphp/runtime/base/string_util.h" #include "hphp/runtime/base/url_file.h" #include "hphp/runtime/base/runtime_option.h" diff --git a/hphp/runtime/base/http_stream_wrapper.h b/hphp/runtime/base/http-stream-wrapper.h similarity index 73% rename from hphp/runtime/base/http_stream_wrapper.h rename to hphp/runtime/base/http-stream-wrapper.h index a55c58c5bde..d49c6196ebc 100644 --- a/hphp/runtime/base/http_stream_wrapper.h +++ b/hphp/runtime/base/http-stream-wrapper.h @@ -3,15 +3,14 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ @@ -20,8 +19,8 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/file.h" -#include "hphp/runtime/base/stream_wrapper.h" -#include "hphp/runtime/base/stream_wrapper_registry.h" +#include "hphp/runtime/base/stream-wrapper.h" +#include "hphp/runtime/base/stream-wrapper-registry.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/object_data.cpp b/hphp/runtime/base/object_data.cpp index cf116a4482e..89aaed7d433 100644 --- a/hphp/runtime/base/object_data.cpp +++ b/hphp/runtime/base/object_data.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/externals.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/memory_profile.h" diff --git a/hphp/runtime/base/php_stream_wrapper.cpp b/hphp/runtime/base/php-stream-wrapper.cpp similarity index 88% rename from hphp/runtime/base/php_stream_wrapper.cpp rename to hphp/runtime/base/php-stream-wrapper.cpp index 0d98bc701b2..47e25306687 100644 --- a/hphp/runtime/base/php_stream_wrapper.cpp +++ b/hphp/runtime/base/php-stream-wrapper.cpp @@ -3,19 +3,18 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/php_stream_wrapper.h" +#include "hphp/runtime/base/php-stream-wrapper.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/plain_file.h" #include "hphp/runtime/base/temp_file.h" diff --git a/hphp/runtime/base/php_stream_wrapper.h b/hphp/runtime/base/php-stream-wrapper.h similarity index 76% rename from hphp/runtime/base/php_stream_wrapper.h rename to hphp/runtime/base/php-stream-wrapper.h index b97c8e26ffb..fa556e1c48e 100644 --- a/hphp/runtime/base/php_stream_wrapper.h +++ b/hphp/runtime/base/php-stream-wrapper.h @@ -3,15 +3,14 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ #ifndef HPHP_PHP_STREAM_WRAPPER_H @@ -19,7 +18,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/file.h" -#include "hphp/runtime/base/stream_wrapper.h" +#include "hphp/runtime/base/stream-wrapper.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/program_functions.cpp b/hphp/runtime/base/program_functions.cpp index e2683a3a0f4..8f68b22baa2 100644 --- a/hphp/runtime/base/program_functions.cpp +++ b/hphp/runtime/base/program_functions.cpp @@ -53,7 +53,7 @@ #include "hphp/runtime/debugger/debugger_client.h" #include "hphp/runtime/base/simple_counter.h" #include "hphp/runtime/base/extended_logger.h" -#include "hphp/runtime/base/stream_wrapper_registry.h" +#include "hphp/runtime/base/stream-wrapper-registry.h" #include #include diff --git a/hphp/runtime/base/ref_data.cpp b/hphp/runtime/base/ref_data.cpp index d6aba80c6e4..2077979916a 100644 --- a/hphp/runtime/base/ref_data.cpp +++ b/hphp/runtime/base/ref_data.cpp @@ -15,7 +15,7 @@ +----------------------------------------------------------------------+ */ #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" namespace HPHP { diff --git a/hphp/runtime/base/resource_data.cpp b/hphp/runtime/base/resource_data.cpp index 0d0aa0a4ca7..f469e9834c9 100644 --- a/hphp/runtime/base/resource_data.cpp +++ b/hphp/runtime/base/resource_data.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/builtin_functions.h" diff --git a/hphp/runtime/base/stream_wrapper_registry.cpp b/hphp/runtime/base/stream-wrapper-registry.cpp similarity index 91% rename from hphp/runtime/base/stream_wrapper_registry.cpp rename to hphp/runtime/base/stream-wrapper-registry.cpp index 460669249dc..d7c5351a8b6 100644 --- a/hphp/runtime/base/stream_wrapper_registry.cpp +++ b/hphp/runtime/base/stream-wrapper-registry.cpp @@ -3,24 +3,23 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/stream_wrapper_registry.h" +#include "hphp/runtime/base/stream-wrapper-registry.h" #include "hphp/runtime/base/file.h" #include "hphp/runtime/base/string_util.h" -#include "hphp/runtime/base/file_stream_wrapper.h" -#include "hphp/runtime/base/php_stream_wrapper.h" -#include "hphp/runtime/base/http_stream_wrapper.h" +#include "hphp/runtime/base/file-stream-wrapper.h" +#include "hphp/runtime/base/php-stream-wrapper.h" +#include "hphp/runtime/base/http-stream-wrapper.h" #include "hphp/runtime/base/request_local.h" #include #include diff --git a/hphp/runtime/base/stream_wrapper_registry.h b/hphp/runtime/base/stream-wrapper-registry.h similarity index 79% rename from hphp/runtime/base/stream_wrapper_registry.h rename to hphp/runtime/base/stream-wrapper-registry.h index 5b8257e4c3f..e475bcaf2d1 100644 --- a/hphp/runtime/base/stream_wrapper_registry.h +++ b/hphp/runtime/base/stream-wrapper-registry.h @@ -3,15 +3,14 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ @@ -23,7 +22,7 @@ #include #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/file.h" -#include "hphp/runtime/base/stream_wrapper.h" +#include "hphp/runtime/base/stream-wrapper.h" namespace HPHP { namespace Stream { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/stream_wrapper.cpp b/hphp/runtime/base/stream-wrapper.cpp similarity index 68% rename from hphp/runtime/base/stream_wrapper.cpp rename to hphp/runtime/base/stream-wrapper.cpp index 809753e9ed7..bee71d08a1f 100644 --- a/hphp/runtime/base/stream_wrapper.cpp +++ b/hphp/runtime/base/stream-wrapper.cpp @@ -3,20 +3,19 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/stream_wrapper.h" -#include "hphp/runtime/base/stream_wrapper_registry.h" +#include "hphp/runtime/base/stream-wrapper.h" +#include "hphp/runtime/base/stream-wrapper-registry.h" namespace HPHP { namespace Stream { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/stream_wrapper.h b/hphp/runtime/base/stream-wrapper.h similarity index 82% rename from hphp/runtime/base/stream_wrapper.h rename to hphp/runtime/base/stream-wrapper.h index f36c9e8dfc6..9c97383d395 100644 --- a/hphp/runtime/base/stream_wrapper.h +++ b/hphp/runtime/base/stream-wrapper.h @@ -3,15 +3,14 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ diff --git a/hphp/runtime/base/string_buffer.cpp b/hphp/runtime/base/string_buffer.cpp index 51ae850e9dc..be1be975311 100644 --- a/hphp/runtime/base/string_buffer.cpp +++ b/hphp/runtime/base/string_buffer.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/string_buffer.h" #include "hphp/runtime/base/file.h" #include "hphp/runtime/base/zend-functions.h" -#include "hphp/runtime/base/utf8_decode.h" +#include "hphp/runtime/base/utf8-decode.h" #include "hphp/runtime/ext/ext_json.h" #include "hphp/runtime/ext/JSON_parser.h" diff --git a/hphp/runtime/base/thrift_buffer.cpp b/hphp/runtime/base/thrift_buffer.cpp index fb66d08b14e..7939bea3e2a 100644 --- a/hphp/runtime/base/thrift_buffer.cpp +++ b/hphp/runtime/base/thrift_buffer.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/thrift_buffer.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/variable_unserializer.h" +#include "hphp/runtime/base/variable-unserializer.h" #include "hphp/util/logger.h" #define INVALID_DATA 1 diff --git a/hphp/runtime/base/thrift_buffer.h b/hphp/runtime/base/thrift_buffer.h index 89f0888a599..7bcd0360a3f 100644 --- a/hphp/runtime/base/thrift_buffer.h +++ b/hphp/runtime/base/thrift_buffer.h @@ -20,7 +20,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "arpa/inet.h" #if defined(__FreeBSD__) diff --git a/hphp/runtime/base/type_array.cpp b/hphp/runtime/base/type_array.cpp index cb69a1601dd..dfe85345f0a 100644 --- a/hphp/runtime/base/type_array.cpp +++ b/hphp/runtime/base/type_array.cpp @@ -20,8 +20,8 @@ #include "hphp/runtime/base/comparisons.h" #include "hphp/util/exception.h" #include "hphp/runtime/base/shared_map.h" -#include "hphp/runtime/base/variable_serializer.h" -#include "hphp/runtime/base/variable_unserializer.h" +#include "hphp/runtime/base/variable-serializer.h" +#include "hphp/runtime/base/variable-unserializer.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/zend-string.h" #include "hphp/runtime/base/zend-qsort.h" diff --git a/hphp/runtime/base/type_object.cpp b/hphp/runtime/base/type_object.cpp index 22203414f3f..4858d0719da 100644 --- a/hphp/runtime/base/type_object.cpp +++ b/hphp/runtime/base/type_object.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/strings.h" #include "hphp/runtime/ext/ext_collections.h" diff --git a/hphp/runtime/base/type_resource.cpp b/hphp/runtime/base/type_resource.cpp index f778e103b68..f58c625c5cf 100644 --- a/hphp/runtime/base/type_resource.cpp +++ b/hphp/runtime/base/type_resource.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/builtin_functions.h" diff --git a/hphp/runtime/base/type_string.cpp b/hphp/runtime/base/type_string.cpp index cb4eff38972..360f97b000a 100644 --- a/hphp/runtime/base/type_string.cpp +++ b/hphp/runtime/base/type_string.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/comparisons.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/zend-functions.h" #include "hphp/runtime/base/zend-string.h" #include "hphp/runtime/base/zend-printf.h" diff --git a/hphp/runtime/base/type_variant.cpp b/hphp/runtime/base/type_variant.cpp index 3ea26e548e9..3900cbf8a5f 100644 --- a/hphp/runtime/base/type_variant.cpp +++ b/hphp/runtime/base/type_variant.cpp @@ -17,8 +17,8 @@ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/zend-functions.h" -#include "hphp/runtime/base/variable_serializer.h" -#include "hphp/runtime/base/variable_unserializer.h" +#include "hphp/runtime/base/variable-serializer.h" +#include "hphp/runtime/base/variable-unserializer.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/strings.h" #include "hphp/runtime/ext/ext_variable.h" diff --git a/hphp/runtime/base/user_stream_wrapper.cpp b/hphp/runtime/base/user-stream-wrapper.cpp similarity index 79% rename from hphp/runtime/base/user_stream_wrapper.cpp rename to hphp/runtime/base/user-stream-wrapper.cpp index 53212da4a55..cd3c8db60a2 100644 --- a/hphp/runtime/base/user_stream_wrapper.cpp +++ b/hphp/runtime/base/user-stream-wrapper.cpp @@ -3,19 +3,18 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/user_stream_wrapper.h" +#include "hphp/runtime/base/user-stream-wrapper.h" #include "hphp/runtime/base/user_file.h" namespace HPHP { diff --git a/hphp/runtime/base/user_stream_wrapper.h b/hphp/runtime/base/user-stream-wrapper.h similarity index 76% rename from hphp/runtime/base/user_stream_wrapper.h rename to hphp/runtime/base/user-stream-wrapper.h index d6d228008c5..a2657112b6d 100644 --- a/hphp/runtime/base/user_stream_wrapper.h +++ b/hphp/runtime/base/user-stream-wrapper.h @@ -3,15 +3,14 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ #ifndef HPHP_USER_STREAM_WRAPPER_H @@ -19,7 +18,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/file.h" -#include "hphp/runtime/base/stream_wrapper.h" +#include "hphp/runtime/base/stream-wrapper.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/utf8_decode.cpp b/hphp/runtime/base/utf8-decode.cpp similarity index 99% rename from hphp/runtime/base/utf8_decode.cpp rename to hphp/runtime/base/utf8-decode.cpp index 6ebc284b9da..b5f70f5f71e 100644 --- a/hphp/runtime/base/utf8_decode.cpp +++ b/hphp/runtime/base/utf8-decode.cpp @@ -26,7 +26,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "hphp/runtime/base/utf8_decode.h" +#include "hphp/runtime/base/utf8-decode.h" /* Very Strict UTF-8 Decoder diff --git a/hphp/runtime/base/utf8_decode.h b/hphp/runtime/base/utf8-decode.h similarity index 100% rename from hphp/runtime/base/utf8_decode.h rename to hphp/runtime/base/utf8-decode.h diff --git a/hphp/runtime/base/variable_serializer.cpp b/hphp/runtime/base/variable-serializer.cpp similarity index 98% rename from hphp/runtime/base/variable_serializer.cpp rename to hphp/runtime/base/variable-serializer.cpp index fc5692f8eb4..25fa2922fd2 100644 --- a/hphp/runtime/base/variable_serializer.cpp +++ b/hphp/runtime/base/variable-serializer.cpp @@ -3,19 +3,18 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/util/exception.h" diff --git a/hphp/runtime/base/variable_serializer.h b/hphp/runtime/base/variable-serializer.h similarity index 93% rename from hphp/runtime/base/variable_serializer.h rename to hphp/runtime/base/variable-serializer.h index 575a5c3f143..c0c5d2913f2 100644 --- a/hphp/runtime/base/variable_serializer.h +++ b/hphp/runtime/base/variable-serializer.h @@ -3,15 +3,14 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ diff --git a/hphp/runtime/base/variable_unserializer.cpp b/hphp/runtime/base/variable-unserializer.cpp similarity index 86% rename from hphp/runtime/base/variable_unserializer.cpp rename to hphp/runtime/base/variable-unserializer.cpp index fcbec5fc910..8e150a50498 100644 --- a/hphp/runtime/base/variable_unserializer.cpp +++ b/hphp/runtime/base/variable-unserializer.cpp @@ -3,19 +3,18 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/variable_unserializer.h" +#include "hphp/runtime/base/variable-unserializer.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/zend-strtod.h" #include "hphp/runtime/base/array_iterator.h" diff --git a/hphp/runtime/base/variable_unserializer.h b/hphp/runtime/base/variable-unserializer.h similarity index 93% rename from hphp/runtime/base/variable_unserializer.h rename to hphp/runtime/base/variable-unserializer.h index ff9b0c75605..626b0040839 100644 --- a/hphp/runtime/base/variable_unserializer.h +++ b/hphp/runtime/base/variable-unserializer.h @@ -3,15 +3,14 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ diff --git a/hphp/runtime/base/zip_file.cpp b/hphp/runtime/base/zip-file.cpp similarity index 88% rename from hphp/runtime/base/zip_file.cpp rename to hphp/runtime/base/zip-file.cpp index cef52722040..ce491aa73bc 100644 --- a/hphp/runtime/base/zip_file.cpp +++ b/hphp/runtime/base/zip-file.cpp @@ -3,19 +3,18 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/zip_file.h" +#include "hphp/runtime/base/zip-file.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/runtime_error.h" diff --git a/hphp/runtime/base/zip_file.h b/hphp/runtime/base/zip-file.h similarity index 83% rename from hphp/runtime/base/zip_file.h rename to hphp/runtime/base/zip-file.h index b22cbe1b683..9e0220d8020 100644 --- a/hphp/runtime/base/zip_file.h +++ b/hphp/runtime/base/zip-file.h @@ -3,15 +3,14 @@ | HipHop for PHP | +----------------------------------------------------------------------+ | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ diff --git a/hphp/runtime/debugger/debugger_client.cpp b/hphp/runtime/debugger/debugger_client.cpp index 6f75fd85c81..d6eeaac6d05 100644 --- a/hphp/runtime/debugger/debugger_client.cpp +++ b/hphp/runtime/debugger/debugger_client.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/debugger/debugger_command.h" #include "hphp/runtime/debugger/cmd/all.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/string_util.h" #include "hphp/runtime/base/preg.h" #include "hphp/runtime/ext/ext_json.h" diff --git a/hphp/runtime/debugger/debugger_thrift_buffer.cpp b/hphp/runtime/debugger/debugger_thrift_buffer.cpp index adf8a047098..75dadc80522 100644 --- a/hphp/runtime/debugger/debugger_thrift_buffer.cpp +++ b/hphp/runtime/debugger/debugger_thrift_buffer.cpp @@ -15,8 +15,8 @@ */ #include "hphp/runtime/debugger/debugger_thrift_buffer.h" -#include "hphp/runtime/base/variable_serializer.h" -#include "hphp/runtime/base/variable_unserializer.h" +#include "hphp/runtime/base/variable-serializer.h" +#include "hphp/runtime/base/variable-unserializer.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/debugger/debugger_thrift_buffer.h b/hphp/runtime/debugger/debugger_thrift_buffer.h index 50ad76f5bbd..0f1fff6b496 100644 --- a/hphp/runtime/debugger/debugger_thrift_buffer.h +++ b/hphp/runtime/debugger/debugger_thrift_buffer.h @@ -19,7 +19,7 @@ #include "hphp/runtime/base/thrift_buffer.h" #include "hphp/runtime/base/socket.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/JSON_parser.cpp b/hphp/runtime/ext/JSON_parser.cpp index 845735cc4d7..cacd6c8669c 100644 --- a/hphp/runtime/ext/JSON_parser.cpp +++ b/hphp/runtime/ext/JSON_parser.cpp @@ -31,7 +31,7 @@ SOFTWARE. #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/utf8_decode.h" +#include "hphp/runtime/base/utf8-decode.h" #include "hphp/system/systemlib.h" #include "hphp/runtime/base/thread_init_fini.h" diff --git a/hphp/runtime/ext/ext_apc.cpp b/hphp/runtime/ext/ext_apc.cpp index 53699aba0ef..3dff50640a2 100644 --- a/hphp/runtime/ext/ext_apc.cpp +++ b/hphp/runtime/ext/ext_apc.cpp @@ -24,7 +24,7 @@ #include #include "hphp/runtime/base/program_functions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/util/alloc.h" #include "hphp/util/hdf.h" #include "hphp/runtime/base/ini_setting.h" diff --git a/hphp/runtime/ext/ext_collections.cpp b/hphp/runtime/ext/ext_collections.cpp index a1e9eaab0f0..04c99990d6f 100644 --- a/hphp/runtime/ext/ext_collections.cpp +++ b/hphp/runtime/ext/ext_collections.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/ext/ext_collections.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/sort_helpers.h" #include "hphp/runtime/ext/ext_array.h" #include "hphp/runtime/ext/ext_math.h" diff --git a/hphp/runtime/ext/ext_file.cpp b/hphp/runtime/ext/ext_file.cpp index 36c7615c668..fea383f7b24 100644 --- a/hphp/runtime/ext/ext_file.cpp +++ b/hphp/runtime/ext/ext_file.cpp @@ -29,8 +29,8 @@ #include "hphp/runtime/server/static_content_cache.h" #include "hphp/runtime/base/zend-scanf.h" #include "hphp/runtime/base/pipe.h" -#include "hphp/runtime/base/stream_wrapper_registry.h" -#include "hphp/runtime/base/file_stream_wrapper.h" +#include "hphp/runtime/base/stream-wrapper-registry.h" +#include "hphp/runtime/base/file-stream-wrapper.h" #include "hphp/system/systemlib.h" #include "hphp/util/logger.h" #include "hphp/util/util.h" diff --git a/hphp/runtime/ext/ext_ipc.cpp b/hphp/runtime/ext/ext_ipc.cpp index 0bf02e9a4b7..49e9c3caa7c 100644 --- a/hphp/runtime/ext/ext_ipc.cpp +++ b/hphp/runtime/ext/ext_ipc.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_ipc.h" #include "hphp/runtime/ext/ext_variable.h" -#include "hphp/runtime/base/variable_unserializer.h" +#include "hphp/runtime/base/variable-unserializer.h" #include "hphp/util/lock.h" #include "hphp/util/alloc.h" diff --git a/hphp/runtime/ext/ext_json.cpp b/hphp/runtime/ext/ext_json.cpp index a5b7220a6c9..03c712948d2 100644 --- a/hphp/runtime/ext/ext_json.cpp +++ b/hphp/runtime/ext/ext_json.cpp @@ -17,8 +17,8 @@ #include "hphp/runtime/ext/ext_json.h" #include "hphp/runtime/ext/JSON_parser.h" -#include "hphp/runtime/base/utf8_decode.h" -#include "hphp/runtime/base/variable_serializer.h" +#include "hphp/runtime/base/utf8-decode.h" +#include "hphp/runtime/base/variable-serializer.h" namespace HPHP { IMPLEMENT_DEFAULT_EXTENSION(json); diff --git a/hphp/runtime/ext/ext_phar.cpp b/hphp/runtime/ext/ext_phar.cpp index bf5e48695ae..55abf464693 100644 --- a/hphp/runtime/ext/ext_phar.cpp +++ b/hphp/runtime/ext/ext_phar.cpp @@ -16,8 +16,8 @@ */ #include "hphp/runtime/ext/ext_phar.h" -#include "hphp/runtime/base/stream_wrapper.h" -#include "hphp/runtime/base/stream_wrapper_registry.h" +#include "hphp/runtime/base/stream-wrapper.h" +#include "hphp/runtime/base/stream-wrapper-registry.h" #include "hphp/runtime/base/mem_file.h" namespace HPHP { diff --git a/hphp/runtime/ext/ext_session.cpp b/hphp/runtime/ext/ext_session.cpp index 98a42e5c1c3..4c5856ea3dd 100644 --- a/hphp/runtime/ext/ext_session.cpp +++ b/hphp/runtime/ext/ext_session.cpp @@ -25,7 +25,7 @@ #include "hphp/runtime/base/request_local.h" #include "hphp/runtime/base/ini_setting.h" #include "hphp/runtime/base/datetime.h" -#include "hphp/runtime/base/variable_unserializer.h" +#include "hphp/runtime/base/variable-unserializer.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/util/lock.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/ext/ext_stream.cpp b/hphp/runtime/ext/ext_stream.cpp index 3d3fd80e03d..337836e2a42 100644 --- a/hphp/runtime/ext/ext_stream.cpp +++ b/hphp/runtime/ext/ext_stream.cpp @@ -23,9 +23,9 @@ #include "hphp/runtime/base/string_buffer.h" #include "hphp/runtime/base/zend-printf.h" #include "hphp/runtime/server/server_stats.h" -#include "hphp/runtime/base/stream_wrapper.h" -#include "hphp/runtime/base/stream_wrapper_registry.h" -#include "hphp/runtime/base/user_stream_wrapper.h" +#include "hphp/runtime/base/stream-wrapper.h" +#include "hphp/runtime/base/stream-wrapper-registry.h" +#include "hphp/runtime/base/user-stream-wrapper.h" #include #include #include diff --git a/hphp/runtime/ext/ext_variable.cpp b/hphp/runtime/ext/ext_variable.cpp index 011f1311199..48626b73744 100644 --- a/hphp/runtime/ext/ext_variable.cpp +++ b/hphp/runtime/ext/ext_variable.cpp @@ -16,8 +16,8 @@ */ #include "hphp/runtime/ext/ext_variable.h" -#include "hphp/runtime/base/variable_serializer.h" -#include "hphp/runtime/base/variable_unserializer.h" +#include "hphp/runtime/base/variable-serializer.h" +#include "hphp/runtime/base/variable-unserializer.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/ext/ext_zlib.cpp b/hphp/runtime/ext/ext_zlib.cpp index c2dab1f5cc1..243537dcea4 100644 --- a/hphp/runtime/ext/ext_zlib.cpp +++ b/hphp/runtime/ext/ext_zlib.cpp @@ -18,10 +18,10 @@ #include "hphp/runtime/ext/ext_zlib.h" #include "hphp/runtime/base/file.h" #include "hphp/runtime/base/mem_file.h" -#include "hphp/runtime/base/zip_file.h" -#include "hphp/runtime/base/stream_wrapper.h" -#include "hphp/runtime/base/stream_wrapper_registry.h" -#include "hphp/runtime/base/file_stream_wrapper.h" +#include "hphp/runtime/base/zip-file.h" +#include "hphp/runtime/base/stream-wrapper.h" +#include "hphp/runtime/base/stream-wrapper-registry.h" +#include "hphp/runtime/base/file-stream-wrapper.h" #include "hphp/util/compression.h" #include "hphp/util/logger.h" #ifdef HAVE_SNAPPY diff --git a/hphp/tools/license.php b/hphp/tools/license.php index 1296aa871c9..d4460f69d18 100644 --- a/hphp/tools/license.php +++ b/hphp/tools/license.php @@ -25,8 +25,8 @@ $excluded = array( // non-PHP licenses 'compiler/parser/hphp.tab.cpp', - 'runtime/base/utf8_decode.c', - 'runtime/base/utf8_to_utf16.c', + 'runtime/base/utf8-decode.c', + 'runtime/base/utf8-to-utf16.c', 'runtime/base/zend-strtod.cpp', 'runtime/ext/JSON_parser.cpp', 'runtime/ext/php_unicode.h', -- 2.11.4.GIT