From 898dde36d91d5fce0d70c5ea24e98cb448415676 Mon Sep 17 00:00:00 2001 From: Ben Schwartz Date: Mon, 14 May 2018 05:12:15 -0400 Subject: [PATCH] include /common/ in travis checks --- .travis.yml | 4 ++-- common/env.example.php | 2 -- common/manage_socket/activate_hh.php | 2 +- common/manage_socket/check_servers.php | 2 +- common/manage_socket/restart_server.php | 2 +- common/manage_socket/socket_manage_fns.php | 2 +- common/multi_queries.php | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 81d6551a9..760b961bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,5 @@ php: - '7.1' before_script: composer install script: - - ./vendor/bin/phpmd http_server,multiplayer_server,policy_server text unusedcode - - ./vendor/bin/phpcs --standard=PSR2 http_server multiplayer_server policy_server + - ./vendor/bin/phpmd common,http_server,multiplayer_server,policy_server text unusedcode + - ./vendor/bin/phpcs --standard=PSR2 common http_server multiplayer_server policy_server diff --git a/common/env.example.php b/common/env.example.php index af4d67cb8..b174ebe37 100644 --- a/common/env.example.php +++ b/common/env.example.php @@ -38,5 +38,3 @@ $GUEST_PASS = 'this is the universal password for all guest accounts'; $BLS_IP_PREFIX = 'no ddos plz'; - -?> \ No newline at end of file diff --git a/common/manage_socket/activate_hh.php b/common/manage_socket/activate_hh.php index 888d51d65..0a55072a8 100644 --- a/common/manage_socket/activate_hh.php +++ b/common/manage_socket/activate_hh.php @@ -22,4 +22,4 @@ output($e->getMessage()); } finally { die(); -} \ No newline at end of file +} diff --git a/common/manage_socket/check_servers.php b/common/manage_socket/check_servers.php index 480f4a2f6..673337491 100644 --- a/common/manage_socket/check_servers.php +++ b/common/manage_socket/check_servers.php @@ -15,4 +15,4 @@ // log end output('Server checks complete.'); -die(); \ No newline at end of file +die(); diff --git a/common/manage_socket/restart_server.php b/common/manage_socket/restart_server.php index 73d9d939c..7a1ff9e16 100644 --- a/common/manage_socket/restart_server.php +++ b/common/manage_socket/restart_server.php @@ -16,4 +16,4 @@ $server = server_select($pdo, $server_id); // restart it -restart_server(PR2_ROOT . '/pr2.php', $server->address, $server->port, $server->salt, $server->server_id); \ No newline at end of file +restart_server(PR2_ROOT . '/pr2.php', $server->address, $server->port, $server->salt, $server->server_id); diff --git a/common/manage_socket/socket_manage_fns.php b/common/manage_socket/socket_manage_fns.php index 30c10da31..063ef95a5 100644 --- a/common/manage_socket/socket_manage_fns.php +++ b/common/manage_socket/socket_manage_fns.php @@ -209,7 +209,7 @@ function talk_to_server($address, $port, $salt, $process_function, $receive = tr $local_hash = md5($str_to_hash); $sub_hash = substr($local_hash, 0, 3); - // throw it together + // throw it together $to_process = $sub_hash . '`' . $send_num . '`' . $intro_function . '`' . $data . $end; $command = $process_function . $end; $send_str = $to_process . $command; diff --git a/common/multi_queries.php b/common/multi_queries.php index f2bbd643f..9c971040e 100644 --- a/common/multi_queries.php +++ b/common/multi_queries.php @@ -30,4 +30,4 @@ require_once QUERIES_DIR . '/bans/ban_select_active_by_user_id.php'; require_once QUERIES_DIR . '/bans/ban_select_active_by_ip.php'; require_once QUERIES_DIR . '/bans/bans_select_by_user_id.php'; -require_once QUERIES_DIR . '/bans/bans_select_by_ip.php'; \ No newline at end of file +require_once QUERIES_DIR . '/bans/bans_select_by_ip.php';