diff --git a/lib/SimpleSAML/Auth/LDAP.php b/lib/SimpleSAML/Auth/LDAP.php
index 24e0a2828986e1b34313a4a728779e33371ab1ac..66f2788bba75738d8c7889d8e1d57373e8cb02df 100644
--- a/lib/SimpleSAML/Auth/LDAP.php
+++ b/lib/SimpleSAML/Auth/LDAP.php
@@ -586,7 +586,7 @@ class SimpleSAML_Auth_LDAP {
 			$dn = $this->searchfordn($config['searchbase'], $config['searchattributes'], $username);
 		}
 
-		if ($password != null) { /* checking users credentials ... assuming below that she may read her own attributes ... */
+		if ($password !== null) { /* checking users credentials ... assuming below that she may read her own attributes ... */
 			if (!$this->bind($dn, $password)) {
 				SimpleSAML_Logger::info('Library - LDAP validate(): Failed to authenticate \''. $username . '\' using DN \'' . $dn . '\'');
 				return FALSE;
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index 0b63720843d9bbb697ec8b6b48d01653e7b0a177..052c07d010fa8d262664b029bdee1c19bd2658d2 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -509,7 +509,7 @@ class SimpleSAML_Utilities {
 	 * @deprecated This method will be removed in version 2.0. Use SimpleSAML_Utils_Net::ipCIDRcheck() instead.
 	 */
 	static function ipCIDRcheck($cidr, $ip = null) {
-		if ($ip == null) $ip = $_SERVER['REMOTE_ADDR'];
+		if ($ip === null) $ip = $_SERVER['REMOTE_ADDR'];
 		list ($net, $mask) = explode('/', $cidr);
 
 		if (strstr($ip, ':') || strstr($net, ':')) {
diff --git a/lib/SimpleSAML/Utils/Net.php b/lib/SimpleSAML/Utils/Net.php
index f1511091acedf7d9a6a7a3401c0500c43ba962ed..1ab1c1ad3999ac4bb5798d9c410b3b2d77808198 100644
--- a/lib/SimpleSAML/Utils/Net.php
+++ b/lib/SimpleSAML/Utils/Net.php
@@ -25,10 +25,10 @@ class SimpleSAML_Utils_Net
      */
     static function ipCIDRcheck($cidr, $ip = null)
     {
-        if ($ip == null) {
+        if ($ip === null) {
             $ip = $_SERVER['REMOTE_ADDR'];
         }
-        if (strpos($cidr, '/') == false) {
+        if (strpos($cidr, '/') === false) {
             return false;
         }
 
diff --git a/modules/consent/lib/Auth/Process/Consent.php b/modules/consent/lib/Auth/Process/Consent.php
index ac0a4bdfacf2af12ebf1cf95c19cb796ee86b6c1..9f77505c0f84ae9f9bf00a9b411a99924b809e61 100644
--- a/modules/consent/lib/Auth/Process/Consent.php
+++ b/modules/consent/lib/Auth/Process/Consent.php
@@ -267,7 +267,7 @@ class sspmod_consent_Auth_Process_Consent extends SimpleSAML_Auth_ProcessingFilt
         $state['consent:showNoConsentAboutService'] = $this->_showNoConsentAboutService;
 
         // User interaction nessesary. Throw exception on isPassive request	
-        if (isset($state['isPassive']) && $state['isPassive'] == true) {
+        if (isset($state['isPassive']) && $state['isPassive'] === true) {
             SimpleSAML_Stats::log('consent:nopassive', $statsData);
             throw new SimpleSAML_Error_NoPassive(
                 'Unable to give consent on passive request.'
diff --git a/modules/consentAdmin/www/consentAdmin.php b/modules/consentAdmin/www/consentAdmin.php
index efc2c19688850636dc1fb9e4ff2f858e1bb3679e..c1c77cdf8f37eb77957053db0edc3363e9791da4 100644
--- a/modules/consentAdmin/www/consentAdmin.php
+++ b/modules/consentAdmin/www/consentAdmin.php
@@ -151,7 +151,7 @@ $consent_storage = sspmod_consent_Store::parseStoreConfig($cA_config->getValue('
 $hashed_user_id = sspmod_consent_Auth_Process_Consent::getHashedUserID($userid, $source);
 
 // If a checkbox have been clicked
-if ($action != null && $sp_entityid != null) {
+if ($action !== null && $sp_entityid !== null) {
 	// Get SP metadata
 	$sp_metadata = $metadata->getMetaData($sp_entityid, 'saml20-sp-remote');
 
diff --git a/modules/consentSimpleAdmin/www/consentAdmin.php b/modules/consentSimpleAdmin/www/consentAdmin.php
index f1c1d081628f63499fbbefc5fcdb942562dc1527..cb7aa80f36d295bff7049c2a075dfde87019a6d1 100644
--- a/modules/consentSimpleAdmin/www/consentAdmin.php
+++ b/modules/consentSimpleAdmin/www/consentAdmin.php
@@ -39,7 +39,7 @@ $metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
 /*
  * Get IdP id and metadata
  */
-if($as->getAuthData('saml:sp:IdP') != null) {
+if($as->getAuthData('saml:sp:IdP') !== null) {
 	// From a remote idp (as bridge)
 	$idp_entityid = $as->getAuthData('saml:sp:IdP');
 	$idp_metadata = $metadata->getMetaData($idp_entityid, 'saml20-idp-remote');
diff --git a/modules/logpeek/lib/File/reverseRead.php b/modules/logpeek/lib/File/reverseRead.php
index 26a1ac1cec43e1700ae267b6d6d41b771b2ca38e..164629baef042b25172c456bf17cdb738751ef7c 100644
--- a/modules/logpeek/lib/File/reverseRead.php
+++ b/modules/logpeek/lib/File/reverseRead.php
@@ -153,7 +153,7 @@ class sspmod_logpeek_File_reverseRead{
 			$pos++;
 			$cnt++;
 		}   
-		return $pos == false? false: substr($haystack, $pos, strlen($haystack));
+		return ($pos === false) ? false : substr($haystack, $pos, strlen($haystack));
 	}
 	
 	
diff --git a/modules/oauth/www/accessToken.php b/modules/oauth/www/accessToken.php
index 31c81325e05f9201a43aa053e9cc6df63c53ca8d..af09b11a93f4e8a195b7642685d05816a3179366 100644
--- a/modules/oauth/www/accessToken.php
+++ b/modules/oauth/www/accessToken.php
@@ -20,7 +20,7 @@ try {
 
 
 	$requestToken = $req->get_parameter('oauth_token');
-	$verifier = $req->get_parameter("oauth_verifier"); if ($verifier == null) $verifier = '';
+	$verifier = $req->get_parameter("oauth_verifier"); if ($verifier === null) $verifier = '';
 
 	if (!$store->isAuthorized($requestToken, $verifier)) {
 		throw new Exception('Your request was not authorized. Request token [' . $requestToken . '] not found.');
diff --git a/modules/saml/lib/IdP/SAML2.php b/modules/saml/lib/IdP/SAML2.php
index dbd6512a34f2ce277e3cd1995cafce61fcf47f69..e6337fc6f19b2238bcc2e3561dcfdde5dea3f37e 100644
--- a/modules/saml/lib/IdP/SAML2.php
+++ b/modules/saml/lib/IdP/SAML2.php
@@ -347,7 +347,7 @@ class sspmod_saml_IdP_SAML2 {
 		$acsEndpoint = self::getAssertionConsumerService($supportedBindings, $spMetadata, $consumerURL, $protocolBinding, $consumerIndex);
 
 		$IDPList = array_unique(array_merge($IDPList, $spMetadata->getArrayizeString('IDPList', array())));
-		if ($ProxyCount == null) $ProxyCount = $spMetadata->getInteger('ProxyCount', null);
+		if ($ProxyCount === null) $ProxyCount = $spMetadata->getInteger('ProxyCount', null);
 
 		if (!$forceAuthn) {
 			$forceAuthn = $spMetadata->getBoolean('ForceAuthn', FALSE);